diff --git a/tracks/app/views/todo/edit_action.rhtml b/tracks/app/views/todo/edit_action.rhtml
index 3eceda08..c7a71b27 100644
--- a/tracks/app/views/todo/edit_action.rhtml
+++ b/tracks/app/views/todo/edit_action.rhtml
@@ -54,11 +54,11 @@
       <input type="hidden" name="on_project_page" value="true" />
     <% end -%>
   <tr>
-    <td><input type="submit" value="Update" tabindex="6" />
+    <td colspan="2"><input type="submit" value="Update" tabindex="6" />
         <a href="javascript:void(0);" onclick="Element.toggle('item-<%= @item.id %>','action-<%= @item.id %>-edit-form');Form.reset('form-action-<%= @item.id %>');">Cancel</a></td>
   </tr>
 </table>
 <%= calendar_setup( "due_#{@item.id}" ) %>
 <% if @item.class == Deferred -%>
   <%= calendar_setup( "show_from_#{@item.id}" ) %>
-<% end -%>
\ No newline at end of file
+<% end -%>
diff --git a/tracks/public/stylesheets/standard.css b/tracks/public/stylesheets/standard.css
index 15d29d52..86cfa2c1 100644
--- a/tracks/public/stylesheets/standard.css
+++ b/tracks/public/stylesheets/standard.css
@@ -532,6 +532,22 @@ form {
     _width: 40%;
     }
 
+.inline-form table {
+    padding-right: 3px;
+    }
+
+/* expand form contents to fill the whole form */
+.inline-form table,
+.inline-form textarea#item_notes, 
+.inline-form input#item_description {
+    width: 100%;
+    }
+
+/* shrink the label/left column as small as necessary */
+.inline-form table td.label {
+    width: 13ex;
+    }
+
 form.button-to {
 	border: none;
 	padding: 0px;