diff --git a/app/views/contracts/_form.html.erb b/app/views/contracts/_form.html.erb
index 48ffd78..dc5d0e0 100644
--- a/app/views/contracts/_form.html.erb
+++ b/app/views/contracts/_form.html.erb
@@ -1,4 +1,4 @@
-<% form.inputs do %>
+<% form.inputs :name => l(:text_general_legend) do %>
   <%= form.input :name, :required => true %>
   <%= form.input :account_executive, :required => true, :collection => @project.users.sort %>
   <li class="boolean optional">
@@ -7,17 +7,24 @@
   </li>
   <%= form.input :start_date, :required => true, :as => :string, :input_html => {:size => 10}, :hint => calendar_for('contract_start_date') %>
   <%= form.input :end_date, :required => true, :as => :string, :input_html => {:size => 10}, :hint => calendar_for('contract_end_date') %>
+  <%= form.input :details, :input_html => {:class => 'wiki-edit'} %>
+<% end %>
+
+<% form.inputs :name => l(:text_budget_legend) do %>
   <%= form.input :billable_rate, :input_html => {:size => 20}, :hint => l(:field_billable_rate_hint) %>
   <%= form.input :discount, :input_html => {:size => 20}, :hint => l(:field_discount_hint) %>
   <%= form.input :discount_note, :input_html => {:class => 'wiki-edit', :rows => '5'} %>
+<% end %>
+
+<% form.inputs :name => l(:text_account_legend) do %>
   <%= form.input :payment_terms, :as => :select, :collection => resource.payment_terms_for_select %>
-  <%= form.input :client_ap_contact_information, :input_html => {:class => 'wiki-edit', :rows => '5'} %>
   <%= form.input :po_number %>
+  <%= form.input :client_ap_contact_information, :input_html => {:class => 'wiki-edit', :rows => '5'} %>
   <%= form.input :client_point_of_contact, :input_html => {:class => 'wiki-edit', :rows => '5'} %>
-  <%= form.input :details, :input_html => {:class => 'wiki-edit'} %>
 <% end %>
 <% form.buttons do %>
   <%= form.commit_button %>
+  <%# TODO: needs to be on one line. %>
   <%= link_to(l(:button_cancel), cancel_path) %>
 <% end %>
 
diff --git a/app/views/contracts/edit.html.erb b/app/views/contracts/edit.html.erb
index b487618..33e83b9 100644
--- a/app/views/contracts/edit.html.erb
+++ b/app/views/contracts/edit.html.erb
@@ -6,6 +6,8 @@
 
 <%= content_tag(:h2, h(l(:text_edit_contract_name, :name => resource.name))) %>
 
+<div class="box tabular">
 <% semantic_form_for resource, :url => contract_path(@project, resource), :html => {:class => 'tabular'} do |form| %>
 <%= render :partial => 'form', :object => form, :locals => {:cancel_path => contract_path(@project, resource)} %>
 <% end %>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fb422a4..2dbbba2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -55,3 +55,6 @@ en:
   field_deliverable: "Deliverable"
   field_deliverable_plural: "Deliverables"
   text_terms_and_financial_overview: "Contract Terms and Financial Overview"
+  text_general_legend: "General"
+  text_budget_legend: "Budget"
+  text_account_legend: "Account Management"