diff --git a/app/helpers/deliverables_helper.rb b/app/helpers/deliverables_helper.rb
index dd6b02e..57fad5f 100644
--- a/app/helpers/deliverables_helper.rb
+++ b/app/helpers/deliverables_helper.rb
@@ -3,14 +3,16 @@ module DeliverablesHelper
   # Helper to generate a form used to calculate the total budget while editing
   # a Deliverable
   def field_with_budget_observer_and_totals(form, field)
-    content_tag(:p,
-                form.text_field(field, :size => 7) +
-                content_tag(:span,
-                            0,
-                            :class => "budget-calculation",
-                            :id => field.to_s + '_subtotal'
-                            )
-                ) + observe_field('deliverable_' + field.to_s, :function => "new Budget.updateAmounts();")
+    content_tag(:tr,
+                content_tag(:td, "<label for='deliverable_#{field}'>TODO</label>") +
+                content_tag(:td, text_field(:deliverable, field, :size => 7)) +
+                content_tag(:td,
+                            content_tag(:span,
+                                        0,
+                                        :class => "budget-calculation",
+                                        :id => field.to_s + '_subtotal'
+                                        ) + observe_field('deliverable_' + field.to_s, :function => "new Budget.updateAmounts();")))
+                            
   end
   
   # Helper to generate a consistant HTML format for displaying basic data
diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb
index 6a39fe3..e0faa8e 100644
--- a/app/views/deliverables/_form.html.erb
+++ b/app/views/deliverables/_form.html.erb
@@ -14,36 +14,70 @@
       </div>
 
       <div class="splitcontentright">
-        <p>
-          <label for="deliverable_type">Fixed Cost</label>
-          <%= check_box(:deliverable, :type, {}, FixedDeliverable.name, HourlyDeliverable.name) %>
-        </p>
-        <%= observe_field('deliverable_type', :function => "new Budget.changeType();") %>
+        <table>
 
-        <p class="budget-hourly"><%= f.text_field :cost_per_hour, :size => 7 %></p>
-        <%= observe_field('deliverable_cost_per_hour', :function => "new Budget.updateAmounts();") %>
+          <tr>
+            <td>
+              <label for="deliverable_type">Fixed Cost</label>
+            </td>
+            <td>
+              <%= check_box(:deliverable, :type, {}, FixedDeliverable.name, HourlyDeliverable.name) %>
+              <%= observe_field('deliverable_type', :function => "new Budget.changeType();") %>
+            </td>
+            <td>
+            </td>
+          </tr>
 
-        <p class="budget-hourly">
-          <%= f.text_field :total_hours, :size => 7 %>
-          <%= content_tag(:span, 0, :class => "budget-calculation", :id => 'variableCost') %>
-        </p>
-        <%= observe_field('deliverable_total_hours', :function => "new Budget.updateAmounts();") %>
+          <tr class="budget-hourly">
+            <td>
+              <label for="deliverable_cost_per_hour">Cost per hour</label>
+            </td>
+            <td>
+              <%= text_field :deliverable, :cost_per_hour, :size => 7 %>
+              <%= observe_field('deliverable_cost_per_hour', :function => "new Budget.updateAmounts();") %>
+            </td>
+            <td>
+            </td>
+          </tr>
 
-        <p class="budget-fixed" style="display:none;">
-          <%= f.text_field :fixed_cost, :size => 7 %>
-          <%= content_tag(:span, 0, :class => "budget-calculation", :id => 'fixedCost') %>
-        </p>
-        <%= observe_field('deliverable_fixed_cost', :function => "new Budget.updateAmounts();") %>
+          <tr class="budget-hourly">
+            <td>
+              <label for="deliverable_total_hours">Total Hours</label>
+            </td>
+            <td>
+              <%= text_field :deliverable, :total_hours, :size => 7 %>
+              <%= observe_field('deliverable_total_hours', :function => "new Budget.updateAmounts();") %>
+            </td>
+            <td>
+              <%= content_tag(:span, 0, :class => "budget-calculation", :id => 'variableCost') %>
+            </td>
+          </tr>
 
-        <%= field_with_budget_observer_and_totals(f, :overhead) %>
-        <%= field_with_budget_observer_and_totals(f, :materials) %>
-        <%= field_with_budget_observer_and_totals(f, :profit) %>
+          <tr class="budget-fixed" style="display:none;">
+            <td>
+              <label for="deliverable_fixed_cost">Fixed Bid</label>
+            </td>
+            <td>
+              <%= text_field :deliverable, :fixed_cost, :size => 7 %>
+              <%= observe_field('deliverable_fixed_cost', :function => "new Budget.updateAmounts();") %>
+            </td>
+            <td>
+              <%= content_tag(:span, 0, :class => "budget-calculation", :id => 'fixedCost') %>
+            </td>
+          </tr>
 
-        <%= content_tag(:p,"Total Budget:" + content_tag(:span, 0, :id => 'total-budget-calculation', :class => "budget-calculation"),
-                        :class => "total-budget") %>
+          <%= field_with_budget_observer_and_totals(f, :overhead) %>
+          <%= field_with_budget_observer_and_totals(f, :materials) %>
+          <%= field_with_budget_observer_and_totals(f, :profit) %>
 
-        <p><%= f.hidden_field :budget %></p>
-        
+          <tr class="total-budget">
+            <td><label>Total Budget:</label></td>
+            <td></td>
+            <td><%= content_tag(:span, 0, :id => 'total-budget-calculation', :class => "budget-calculation") %></td>
+          </tr>
+          
+        </table>
+        <%= f.hidden_field :budget %>
       </div>
       <script type="text/javascript">new Budget.changeType();</script>
       <script type="text/javascript">new Budget.updateAmounts();</script>
diff --git a/assets/stylesheets/budget.css b/assets/stylesheets/budget.css
index 5fe95f2..93f3a9b 100644
--- a/assets/stylesheets/budget.css
+++ b/assets/stylesheets/budget.css
@@ -37,4 +37,6 @@ span.budget-calculation { color:#999999; font-weight:bold; display:block; text-a
 p.total-budget { font-weight: bold; }
 p.total-budget #total-budget-calculation {  }
 
-.jstElements button { padding: 0; margin-right: 0px;}
\ No newline at end of file
+/* Rest some defaults */
+.jstElements button { padding: 0; margin-right: 0px;}
+.tabular label { margin-left: 0; float: none;}
\ No newline at end of file