anchor.diff:          </p>
         <% end %>
         <p id="bzip" class="field">
  -        <label for="<%= t("zip") %>"><%= t("zip") %></label><br />
  +        <%= bill_form.label :zipcode, t(:zip) %><br />
           <%= bill_form.text_field :zipcode, :class => 'required' -%><span class="req">*</span>
         </p>    
         <p id="bcountry" class="field">
  -        <label for="<%= t("country") %>"><%= t("country") %></label><br />
  +        <%= bill_form.label :country_id, t(:country) %><br />
           <span id="bcountry"><%= bill_form.collection_select :country_id, @countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
         </p>
         <p id="bphone" class="field">
  -        <label for="<%= t("phone") %>"><%= t("phone") %></label><br />
  +        <%= bill_form.label :phone %><br />
           <%= bill_form.text_field :phone, :class => 'required' -%><span class="req">*</span>
             </p>
             <% if Spree::Config[:alternative_billing_phone] %>
               <p id="baltphone">
  -              <label for=""><%= t("alternative_phone") %></label><br />
  +              <%= bill_form.label :alternative_phone %><br />
                 <%= bill_form.text_field :alternative_phone -%>
               </p>
             <% end %>
  
positive.code:     <div class="inner">
        <p class="field">&nbsp;</p>
        <p id="bfname" class="field">
          <label for="<%= t("first_name") %>"><%= t("first_name") %></label><br />
          <%= bill_form.text_field :firstname, :class => 'required' -%><span class="req">*</span>
        </p>
        <p id="blname" class="field">
          <label for="<%= t("last_name") %>"><%= t("last_name") %></label><br />
          <%= bill_form.text_field :lastname, :class => 'required' -%><span class="req">*</span>
        </p>
        <p id="baddress" class="field">
          <label for="<%= t("street_address") %>"><%= t("street_address") %></label><br />
          <%= bill_form.text_field :address1, :class => 'required' -%><span class="req">*</span>
        </p>
        <p id="baddress2" class="field">
          <label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label><br />
          <%= bill_form.text_field :address2 %>
        </p>
        <p id="bcity" class="field">
          <label for="<%= t("city") %>"><%= t("city") %></label><br />
          <%= bill_form.text_field :city, :class => 'required' -%><span class="req">*</span>
        </p>                        
        <% if Spree::Config[:address_requires_state] %>
          <p class="field">
            <label for="<%= t("state") %>"><%= t("state") %></label><br />
            <span id="bstate">
              <% if @checkout.bill_address.country.states.empty? %>
                <%= bill_form.text_field :state_name, :class => 'required' -%>
              <% else %>
                <%= bill_form.collection_select( 
                                      :state_id, 
                                      @states, 
  
negative.code:   <% checkout_form.fields_for :shipment do |shipment| %>     
      <% shipment.fields_for :address do |address| %>
        <legend><%= t("shipping_address")%></legend>
        <p class="field">
          <%= label_tag 'checkout[use_billing]', t("use_billing_address"), :id => "use_billing" %>
          <%= check_box_tag 'checkout[use_billing]', '1', @checkout.use_billing %>
        </p> 
        <div class="inner">
          <p id="sfname" class="field">
            <%= address.label :firstname, t(:first_name) %><br />
            <%= address.text_field :firstname, :class => 'required' -%><span class="req">*</span>
          </p>
          <p id="slname" class="field">
            <%= address.label :lastname, t(:last_name) %><br />
            <%= address.text_field :lastname, :class => 'required' -%><span class="req">*</span>
          </p>
          <p id="saddress" class="field">
            <%= address.label :address1, t(:street_address) %><br />
            <%= address.text_field :address1, :class => 'required' -%><span class="req">*</span>
          </p>
          <p id="saddress2" class="field">
            <%= address.label :address2, t(:street_address_2) %><br />
            <%= address.text_field :address2 %>
          </p>
          <p id="scity" class="field">
            <%= address.label :city %><br />
            <%= address.text_field :city, :class => 'required' -%><span class="req">*</span>
          </p>                        
          <% if Spree::Config[:address_requires_state] %>
            <p class="field">
              <span id="sstate">
                <% if @checkout.shipment.address.country.states.empty? %>
                  <%= address.label :state_name, t(:state) %><br />
                  <%= address.text_field :state_name, :class => 'required' -%>
                <% else %>
                  <%= address.label :state_id, t(:state) %><br />
                  <%= address.collection_select(:state_id, 
                                        @states, 
                                        :id, 
                                        :name, 
                                        {:include_blank => true}, 
                                        {:style=> 'width:150px;'}) %>
                <% end %>
              </span>
              <span class="req">*</span>
            </p>
          <% end %>
          <p id="szip" class="field">
            <%= address.label :zipcode, t(:zip) %><br />
            <%= address.text_field :zipcode, :class => 'required' -%><span class="req">*</span>
          </p>    
          <p id="scountry" class="field">
            <%= address.label :country_id, t(:country) %><br />
            <span id="scountry"><%= address.collection_select :country_id, @shipping_countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
          </p>
          <p id="sphone" class="field">
            <%= address.label :phone %><br />
            <%= address.text_field :phone, :class => 'required' -%><span class="req">*</span>
              </p>
              <% if Spree::Config[:alternative_shipping_phone] %>
                <p id="saltphone">
                  <%= address.label :alternative_phone %><br />
                  <%= address.text_field :alternative_phone -%>
                </p>
              <% end %>
          </p>
        </div>
      <% end %>
    <% end %>
  