diff --git a/app/views/contracts/_title.html.erb b/app/views/contracts/_title.html.erb
index 1a735ac..575398b 100644
--- a/app/views/contracts/_title.html.erb
+++ b/app/views/contracts/_title.html.erb
@@ -2,15 +2,15 @@
   <%= content_tag(:h2, h(contract.name)) %>
   
   <div class="title-bar-actions">
-    <span><a href="#TODO" class="">Log time</a></span>
+    <span><a href="#TODO-release-4" class="">Log time (Release 4)</a></span>
 
     <span class="meta-sep"> | </span>
     
-    <span id="watcher"><a class="icon icon-fav-off" href="#TODO" onclick="">Watch</a></span>
+    <span id="watcher"><a class="icon icon-fav-off" href="#TODO-release-3" onclick="">Watch (Release 3)</a></span>
 
     <span class="meta-sep"> | </span>
     
-    <span><a href="#TODO">Copy</a></span>
+    <span><a href="#TODO">Copy (Release ?)</a></span>
     <span class="meta-sep"> | </span>
     
     <div class="update button-large">
@@ -18,7 +18,7 @@
     </div>
   </div>
 </div>
-<%# TODO: contract messages
+<%# TODO: release 3/4, contract messages
     <div class="error_msg">
              <p>There is $243 worth of time clocked to issues that are not assigned to any deliverables.  <span>Please update the orphaned issues.</span> </p>
              </div>
diff --git a/app/views/contracts/index.html.erb b/app/views/contracts/index.html.erb
index 406e124..465720d 100644
--- a/app/views/contracts/index.html.erb
+++ b/app/views/contracts/index.html.erb
@@ -19,8 +19,8 @@
       <thead>
         <th><%= l(:field_id) %></th>
         <th><%= l(:field_name) %></th>
-        <%# TODO: Status %>
-        <%# TODO: Type %>
+        <%# TODO: Release 5, Status %>
+        <%# TODO: Release 5, Type %>
         <th><%= l(:field_account_executive_short) %></th>
         <th><%= l(:field_total_budget) %></th>
         <th><%= l(:field_end_date) %></th>
@@ -45,5 +45,6 @@
 
   <%# TODO: split contracts by active and inactive %>
   <p class="nodata"><%= l(:label_no_data) %></p>
+  <p>TODO: Release 5 (Contract Status)</p>
 
 </div>
diff --git a/app/views/contracts/show.html.erb b/app/views/contracts/show.html.erb
index a9306fb..1481c9f 100644
--- a/app/views/contracts/show.html.erb
+++ b/app/views/contracts/show.html.erb
@@ -70,8 +70,8 @@
     <%= content_tag(:h3, l(:field_deliverable_plural)) %>
 
     <div class="actions">
-      <a href="#">CSV</a>
-      <a href="#">View All (9)</a>
+      <a href="#TODO-release-2">CSV (Release 2)</a>
+      <a href="#TODO-release?">View All (9) (Release ?)</a>
       <%= link_to(l(:button_add_new), new_contract_deliverable_path(@project, resource), :id => 'new-deliverable') %>
     </div>
 
@@ -100,11 +100,11 @@
               <td width="10%" class="arrow end-date"><span><%= h format_date(deliverable.end_date) %></span></td>
               <td width="2%" class="type"><%= h deliverable.short_type %></td>
               <td width="25%" class="title"><%= h deliverable.title %></td>
-              <td width="15%">TODO</td>
+              <td width="15%">TODO: Release 5</td>
               <td width="15%" class="manager"><%= h deliverable.manager.try(:name) %></td>
               <%= format_budget_for_deliverable(deliverable, deliverable.labor_budget_spent, deliverable.labor_budget_total) %>
               <%= format_budget_for_deliverable(deliverable, deliverable.overhead_spent, deliverable.overhead_budget_total) %>
-              <%= format_budget_for_deliverable(deliverable, 0, 0) %><%# TODO: Fixed %>
+              <%= format_budget_for_deliverable(deliverable, 0, 0) %><%# TODO: Release 2, Fixed Budgets %>
             <% end %>
 
             <tr class="ign">
@@ -126,7 +126,7 @@
 
                   </div>
 
-                  <%# TODO: skinning port %>
+                  <%# TODO: Release 2, skinning port %>
                   <div class="finance">
                     <table>
                       <thead>
@@ -150,16 +150,16 @@
                           <td class="l"><a href="#"><strong>Labor</strong></a></td>
                           <td><%= h(deliverable.labor_budget_spent) %></td>
                           <td><%= h(deliverable.labor_budget_total) %></td>
-                          <td> TODO / TODO hrs </td>
+                          <td> TODO: Release 2 / TODO hrs </td>
                         </tr>
                         <tr>
                           <td class="l"><a href="#"><strong>Overhead</strong></a></td>
                           <td><%= h(deliverable.overhead_spent) %></td>
                           <td><%= h(deliverable.overhead_budget_total) %></td>
-                          <td> TODO / TODO hrs </td>
+                          <td> TODO: Release 2 / TODO hrs </td>
                         </tr>
-                        <%# TODO: Fixed %>
-                        <%# TODO: Markup %>
+                        <%# TODO: Release 2, Fixed %>
+                        <%# TODO: Release 2, Markup %>
                         <tr>
                           <td class="l">Profit</td>
                           <td><%= h(deliverable.profit_left) %></td>
@@ -170,7 +170,7 @@
                           <td class="l"><strong>Total:</strong></td>
                           <td><strong><%= h(deliverable.total_spent) %></strong></td>
                           <td><strong><%= h(deliverable.total) %></strong></td>
-                          <td><strong>TODO</strong></td>
+                          <td><strong>TODO: Release 2</strong></td>
                         </tr>
                       </tbody>
                     </table>
@@ -183,7 +183,7 @@
                           <th colspan="2"><%= l(:label_issue_status_plural) %></th>
                         </tr>
                       </thead>
-                      <%# TODO: Issue status counters
+                      <%# TODO: Release 2 Issue status counters
                           <tr>
                             <td>Proposed</td>
                       <td class="number">1</td>
@@ -216,7 +216,8 @@
   </div>
   
 <% end %> <%# div_for(resource) %>
-<!-- TODO
+<p>TODO: Release 4, Milestones</p>
+<!--
      <div id="milestones">
        
        <h3>Milestones</h3>
@@ -290,4 +291,4 @@
      </div>
      -->
 
-<%# TODO: history %>
+<p>TODO: Release 2+, history</p>
diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb
index daa4705..d20f4a8 100644
--- a/app/views/deliverables/_form.html.erb
+++ b/app/views/deliverables/_form.html.erb
@@ -32,6 +32,9 @@
       <% form.fields_for :labor_budgets do |labor_budget| %>
       <tr>
         <%# TODO: Select field for the Time Entry Activity in a td %>
+        <td>
+          <select><option>TODO: Release 3</option></select>
+        </td>
         <td>
           <p class="inline-hints"><%= l(:text_short_hours) %></p>
           <%= labor_budget.text_field(:hours, :size => 10) %>
@@ -41,6 +44,9 @@
           <%= labor_budget.text_field(:budget, :size => 10) %>
         </td>
         <%# TODO: Green Add button for multiple records %>
+        <td>
+          Todo: Add button (Release 3)
+        </td>
       </tr>
       <% end %>
     </table>
@@ -53,6 +59,9 @@
       <% form.fields_for :overhead_budgets do |overhead_budget| %>
       <tr>
         <%# TODO: Select field for the Time Entry Activity in a td %>
+        <td>
+          <select><option>TODO: Release 3</option></select>
+        </td>
         <td>
           <p class="inline-hints"><%= l(:text_short_hours) %></p>
           <%= overhead_budget.text_field(:hours, :size => 10) %>
@@ -62,6 +71,9 @@
           <%= overhead_budget.text_field(:budget, :size => 10) %>
         </td>
         <%# TODO: Green Add button for multiple records %>
+        <td>
+          Todo: Add button (Release 3)
+        </td>
       </tr>
       <% end %>
     </table>
diff --git a/assets/stylesheets/redmine_contracts.css b/assets/stylesheets/redmine_contracts.css
index 05a187c..6a88205 100644
--- a/assets/stylesheets/redmine_contracts.css
+++ b/assets/stylesheets/redmine_contracts.css
@@ -104,7 +104,7 @@ padding-left: 0px; /* Don't pad submit buttons */
 }
 
 #content table.deliverable_finance_table{
-	width: 400px;
+	width: 600px;
 }
 
 	#content table.deliverable_finance_table select{