diff --git a/app/views/contracts/_form.html.erb b/app/views/contracts/_form.html.erb
index dc5d0e0..224b40c 100644
--- a/app/views/contracts/_form.html.erb
+++ b/app/views/contracts/_form.html.erb
@@ -1,3 +1,4 @@
+<div class="box tabular">
 <% form.inputs :name => l(:text_general_legend) do %>
   <%= form.input :name, :required => true %>
   <%= form.input :account_executive, :required => true, :collection => @project.users.sort %>
@@ -22,10 +23,15 @@
   <%= 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'} %>
 <% end %>
+</div>
+
 <% form.buttons do %>
-  <%= form.commit_button %>
-  <%# TODO: needs to be on one line. %>
-  <%= link_to(l(:button_cancel), cancel_path) %>
+  <ol>
+    <li class="commit">
+      <%= submit_tag(l(:text_save_contract)) %>
+      <%= link_to(l(:button_cancel), cancel_path) %>  
+    </li>
+  </ol>
 <% end %>
 
 <%= wikitoolbar_for 'contract_discount_note' %>
diff --git a/app/views/contracts/edit.html.erb b/app/views/contracts/edit.html.erb
index 33e83b9..eb1236b 100644
--- a/app/views/contracts/edit.html.erb
+++ b/app/views/contracts/edit.html.erb
@@ -6,8 +6,7 @@
 
 <%= 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/assets/stylesheets/redmine_contracts.css b/assets/stylesheets/redmine_contracts.css
index e7b1ca9..a79dde8 100644
--- a/assets/stylesheets/redmine_contracts.css
+++ b/assets/stylesheets/redmine_contracts.css
@@ -43,6 +43,10 @@ span.contract-details-label { font-weight: bold; }
 padding-left: 120px; /*width of left column containing the label elements*/
 }
 
+.tabular li.commit {
+padding-left: 0px; /* Don't pad submit buttons */
+}
+
 #content .error_msg{
 	background: #ffd5d5;
 	color: #a40000;
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2dbbba2..4f86183 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -58,3 +58,5 @@ en:
   text_general_legend: "General"
   text_budget_legend: "Budget"
   text_account_legend: "Account Management"
+  text_save_contract: "Save Contract"
+