diff --git a/lms/static/sass/views/_shoppingcart.scss b/lms/static/sass/views/_shoppingcart.scss
index 12e9ef5365..4dd566a0a3 100644
--- a/lms/static/sass/views/_shoppingcart.scss
+++ b/lms/static/sass/views/_shoppingcart.scss
@@ -643,7 +643,7 @@ $light-border: 1px solid $gray-l5;
       padding: ($baseline/2) 0;
       width: 50%;
 
-      b {
+      .billing-detail-label {
         @include margin-right($baseline);
         @extend %t-copy-sub1;
         display: inline-block;
@@ -651,12 +651,14 @@ $light-border: 1px solid $gray-l5;
         vertical-align: top;
       }
 
-      label {
+      .billing-detail-value {
         @extend %t-copy-sub1;
         display: inline-block;
         margin: 0;
+        cursor: text;
         width: ($baseline*60);
         word-wrap: break-word;
+        color: $gray-d3;
         font-style: normal;
       }
     }
diff --git a/lms/templates/shoppingcart/receipt.html b/lms/templates/shoppingcart/receipt.html
index fce4e140de..cd251234e4 100644
--- a/lms/templates/shoppingcart/receipt.html
+++ b/lms/templates/shoppingcart/receipt.html
@@ -107,74 +107,74 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
             <div class="row">
               <div class="row-inside">
                 <p>
-                  <b>${_('Company Name')}:</b>
-                  <label>
+                  <b class="billing-detail-label">${_('Company Name')}:</b>
+                  <span class="billing-detail-value">
                     % if order.company_name:
                       ${order.company_name}
                     % else:
-                      N/A
+                      ${_('N/A')}
                     % endif
-                  </label>
+                  </span>
                 </p>
               </div>
               <div class="row-inside">
                 <p>
-                  <b>${_('Purchase Order Number')}:</b>
-                  <label>
+                  <b class="billing-detail-label">${_('Purchase Order Number')}:</b>
+                  <span class="billing-detail-value">
                     % if order.customer_reference_number:
                       ${order.customer_reference_number}
                     % else:
-                      N/A
+                      ${_('N/A')}
                     % endif
-                  </label>
+                  </span>
                 </p>
               </div>
               <div class="row-inside">
                 <p>
-                  <b>${_('Company Contact Name')}:</b>
-                  <label>
+                  <b class="billing-detail-label">${_('Company Contact Name')}:</b>
+                  <span class="billing-detail-value">
                     % if order.company_contact_name:
                       ${order.company_contact_name}
                     % else:
-                      N/A
+                      ${_('N/A')}
                     % endif
-                  </label>
+                  </span>
                 </p>
               </div>
               <div class="row-inside">
                 <p>
-                  <b>${_('Company Contact Email')}:</b>
-                  <label>
+                  <b class="billing-detail-label">${_('Company Contact Email')}:</b>
+                  <span class="billing-detail-value">
                     % if order.company_contact_email:
                       ${order.company_contact_email}
                     % else:
-                      N/A
+                      ${_('N/A')}
                     % endif
-                  </label>
+                  </span>
                 </p>
               </div>
               <div class="row-inside">
                 <p>
-                  <b>${_('Recipient Name')}:</b>
-                  <label>
+                  <b class="billing-detail-label">${_('Recipient Name')}:</b>
+                  <span class="billing-detail-value">
                     % if order.recipient_name:
                       ${order.recipient_name}
                     % else:
-                      N/A
+                      ${_('N/A')}
                     % endif
-                  </label>
+                  </span>
                 </p>
               </div>
               <div class="row-inside">
                 <p>
-                  <b>${_('Recipient Email')}:</b>
-                  <label>
+                  <b class="billing-detail-label">${_('Recipient Email')}:</b>
+                  <span class="billing-detail-value">
                     % if order.recipient_email:
                       ${order.recipient_email}
                     % else:
-                      N/A
+                      ${_('N/A')}
                     % endif
-                  </label>
+                  </span>
                 </p>
               </div>
             </div>
@@ -182,98 +182,98 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
           <div class="row">
             <div class="row-inside">
               <p>
-                <b>${_('Card Type')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('Card Type')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_cardtype:
                     ${order.bill_to_cardtype}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
             <div class="row-inside">
               <p>
-                <b>${_('Credit Card Number')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('Credit Card Number')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_ccnum:
                     ${order.bill_to_ccnum}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
             <div class="row-inside">
               <p>
-                <b>${_('Name')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('Name')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_first or order.bill_to_last:
                     ${order.bill_to_first} ${order.bill_to_last}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
             <div class="row-inside">
               <p>
-                <b>${_('Address 1')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('Address 1')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_street1:
                     ${order.bill_to_street1}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
             <div class="row-inside">
               <p>
-                <b>${_('Address 2')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('Address 2')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_street2:
                     ${order.bill_to_street2}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
             <div class="row-inside">
               <p>
-                <b>${_('City')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('City')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_city:
                     ${order.bill_to_city}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
             <div class="row-inside">
               <p>
-                <b>${_('State')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('State')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_state:
                     ${order.bill_to_state}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
             <div class="row-inside">
               <p>
-                <b>${_('Country')}:</b>
-                <label>
+                <b class="billing-detail-label">${_('Country')}:</b>
+                <span class="billing-detail-value">
                   % if order.bill_to_country:
-                    ${order.bill_to_country.upper()}
+                    ${order.bill_to_country}
                   % else:
-                    N/A
+                    ${_('N/A')}
                   % endif
-                </label>
+                </span>
               </p>
             </div>
           </div>
diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html
index 26d3570a93..2d792d1194 100644
--- a/lms/templates/shoppingcart/shopping_cart.html
+++ b/lms/templates/shoppingcart/shopping_cart.html
@@ -137,7 +137,7 @@ from django.utils.translation import ungettext
             % endif
                 <span class="pull-right">${_('TOTAL:')}
                   <b id="total-amount" data-amount="${'{price:0.2f}'.format(price=amount)}">
-                    ## Translators: currency_symbol l is a symbol indicating type of currency, ex "$". currency_abbr is
+                    ## Translators: currency_symbol is a symbol indicating type of currency, ex "$". currency_abbr is
                     ## an abbreviation for the currency, ex "USD". This string would look like this when all variables are in:
                     ## "$500.00 USD"
                     ${_("{currency_symbol}{price} {currency_abbr}").format(currency_symbol=currency_symbol, price="{0:0.2f}".format(amount), currency_abbr=currency.upper())}