diff --git a/tracks/app/views/context/_not_done.rhtml b/tracks/app/views/context/_not_done.rhtml
new file mode 100644
index 00000000..a0a88ed8
--- /dev/null
+++ b/tracks/app/views/context/_not_done.rhtml
@@ -0,0 +1,16 @@
+<% @item = not_done %>
+<tr>
+	<td valign="top"><%= check_box( "item", "done", "onclick" => "document.location.href='/todo/toggle_check/#{@item.id}'" ) %></td>
+	<td valign="top" width="30"><%= link_to( $edit_img, { :action => "edit", :id => @item.id }, :title => "Edit item" ) + " " + link_to($delete_img, { :action => "destroy", :id => @item.id }, :title => "Delete item", :confirm => "Are you sure you want to delete this entry: #{@item.description}" ) + " " %></td>
+	<td valign="top"><%= due_date( @item.due ) %> 
+	<%= @item.description %>
+	<% if @item.project_id %>
+	  <%= link_to( "[P]", { :controller => "project", :action => "show", :id => @item.project_id }, :title => "View project: #{@item.project['name']}" ) %>
+	<% end %>
+	<% if @item.notes? %>
+	  <%= "<a href=\"javascript:toggle('" + @item.id.to_s + "')\" title=\"Show notes\">" + $notes_img + "</a>" %>
+	  <% 	m_notes = markdown( @item.notes ) %>
+		<%= "<div class=\"notes\" id=\"" + @item.id.to_s + "\">" + m_notes + "</div>" %>
+	<% end %>
+	</td>
+</tr>
\ No newline at end of file
diff --git a/tracks/app/views/context/show.rhtml b/tracks/app/views/context/show.rhtml
index 9b2c4ea7..f681f248 100644
--- a/tracks/app/views/context/show.rhtml
+++ b/tracks/app/views/context/show.rhtml
@@ -2,34 +2,9 @@
 
 <div class="contexts">
 <h2><%= @context.name.capitalize %></h2>
-<ul>
-<% for @item in @not_done %>
-  <li>
-  <div class="box">
-  <%= check_box( "item", "done", "onclick" => "document.location.href='/todo/toggle_check/#{@item.id}'" ) %>
-  </div>
-  
-  <div class="description">
-  <%= due_date(@item.due) %> 
-  <%= @item.description %>
-  <% if @item.project_id %>
-	  <%= link_to( "[P]", { :controller => "project", :action => "show", :id => @item.project_id }, :title => "View project: #{@item.project['name']}" ) %>
-	<% end %>
-	</div>
-	
-	<div class="tools">
-	<%= link_to($edit_img, { :controller => "todo", :action => "edit", :id => @item.id }, :title => "Edit item") + " " + link_to($delete_img, { :controller => "todo", :action => "destroy", :id => @item.id }, :title => "Delete item", :confirm => "Are you sure you want to delete this entry: #{@item.description}") + " " %>
-				
-  <% if @item.notes? %>
-    <%= "<a href=\"javascript:toggle('" + @item.id.to_s + "')\" title=\"Show notes\">" + $notes_img + "</a>" %></div>
-    <% 	m_notes = markdown(@item.notes) %>
-    <%= "<div class=\"notes\" id=\"" + @item.id.to_s + "\">" + m_notes + "</div>" %>
-  <% else %>
-    </div>
-  <% end %>
-  </li>
-<% end %>
-</ul>
+<table class="next_actions" cellspacing="2" cellpadding="0" border="0">
+  <%= render_collection_of_partials "not_done", @not_done %>
+</table>
 </div>
 </div><!- End of display_box -->
 
diff --git a/tracks/app/views/todo/_done.rhtml b/tracks/app/views/todo/_done.rhtml
index 9c4ef424..9cf3cae9 100644
--- a/tracks/app/views/todo/_done.rhtml
+++ b/tracks/app/views/todo/_done.rhtml
@@ -1,13 +1,9 @@
 <% @item = done %>
-<li>
+<tr>
 <% if @item.completed %>
-  <div class="box">
-    <%= $done_img %>
-  </div>
-  
-  <div class="description">
-  <span class="grey"><%= format_date( @item.completed ) %></span>
-  <%= " " + @item.description + " "%>
+  <td valign="top"><%= $done_img %></td>
+  <td valign="top"><span class="grey"><%= format_date( @item.completed ) %></span></td>
+  <td valign="top"><%= " " + @item.description + " "%>
   
   <% if @item.project_id %>
     <%= "(" + @item.context['name'].capitalize + ", " + @item.project['name'] + ")" %>
@@ -24,6 +20,6 @@
   	<% 	m_notes = markdown( @item.notes ) %>
   	<%= "<div class=\"notes\" id=\"" + @item.id.to_s + "\">" + m_notes + "</div>" %>
   <% end %>
-  </div>
+  </td>
 <% end %>
-</li>
\ No newline at end of file
+</tr>
\ No newline at end of file
diff --git a/tracks/app/views/todo/_not_done.rhtml b/tracks/app/views/todo/_not_done.rhtml
index 211ecdf6..a0a88ed8 100644
--- a/tracks/app/views/todo/_not_done.rhtml
+++ b/tracks/app/views/todo/_not_done.rhtml
@@ -1,22 +1,16 @@
 <% @item = not_done %>
-<li>
-	<div class="box">
-	<%= check_box( "item", "done", "onclick" => "document.location.href='/todo/toggle_check/#{@item.id}'" ) %>
-	</div>
-	<div class="description">
-	<%= due_date( @item.due ) %> 
+<tr>
+	<td valign="top"><%= check_box( "item", "done", "onclick" => "document.location.href='/todo/toggle_check/#{@item.id}'" ) %></td>
+	<td valign="top" width="30"><%= link_to( $edit_img, { :action => "edit", :id => @item.id }, :title => "Edit item" ) + " " + link_to($delete_img, { :action => "destroy", :id => @item.id }, :title => "Delete item", :confirm => "Are you sure you want to delete this entry: #{@item.description}" ) + " " %></td>
+	<td valign="top"><%= due_date( @item.due ) %> 
 	<%= @item.description %>
 	<% if @item.project_id %>
 	  <%= link_to( "[P]", { :controller => "project", :action => "show", :id => @item.project_id }, :title => "View project: #{@item.project['name']}" ) %>
 	<% end %>
-	</div>
-	<div class="tools">
-		<%= link_to( $edit_img, { :action => "edit", :id => @item.id }, :title => "Edit item" ) + " " + link_to($delete_img, { :action => "destroy", :id => @item.id }, :title => "Delete item", :confirm => "Are you sure you want to delete this entry: #{@item.description}" ) + " " %>
 	<% if @item.notes? %>
-		<%= "<a href=\"javascript:toggle('" + @item.id.to_s + "')\" title=\"Show notes\">" + $notes_img + "</a>" %></div>
-		<% 	m_notes = markdown( @item.notes ) %>
+	  <%= "<a href=\"javascript:toggle('" + @item.id.to_s + "')\" title=\"Show notes\">" + $notes_img + "</a>" %>
+	  <% 	m_notes = markdown( @item.notes ) %>
 		<%= "<div class=\"notes\" id=\"" + @item.id.to_s + "\">" + m_notes + "</div>" %>
-	<% else %>
-	  </div>
 	<% end %>
-</li>
\ No newline at end of file
+	</td>
+</tr>
\ No newline at end of file
diff --git a/tracks/app/views/todo/completed.rhtml b/tracks/app/views/todo/completed.rhtml
index 0a2d4ca1..581ac05e 100644
--- a/tracks/app/views/todo/completed.rhtml
+++ b/tracks/app/views/todo/completed.rhtml
@@ -2,9 +2,9 @@
 
 <div class="contexts">
   <h2>Completed items</h2>
-  <ul>
+  <table class="next_actions" cellspacing="5" cellpadding="0" border="0">
     <%= render_collection_of_partials "done", @done %>
-  </ul>
+  </table>
 </div>
 
 </div><!- End of display_box -->
diff --git a/tracks/app/views/todo/list.rhtml b/tracks/app/views/todo/list.rhtml
index 62cd959e..a89e880f 100644
--- a/tracks/app/views/todo/list.rhtml
+++ b/tracks/app/views/todo/list.rhtml
@@ -2,20 +2,20 @@
 <% for @place in @places %>
   <% @not_done = Todo.find_all( "done=0 AND context_id=#{@place.id}", "created ASC" ) %>
 	<% if !@not_done.empty? %>
-	  <div class="contexts">
-  <h2><%= link_to( "#{@place.name.capitalize}", :controller => "context", :action => "show", :id => @place.id )  %></h2>
-	<ul>
+	<div class="contexts">
+    <h2><%= link_to( "#{@place.name.capitalize}", :controller => "context", :action => "show", :id => @place.id )  %></h2>
+	  <table class="next_actions" cellspacing="2" cellpadding="0" border="0">
 	    <%= render_collection_of_partials "not_done", @not_done %>
-	  </ul>
+	  </table>
 	</div><!-- End contexts -->
 	<% end %>
 <% end %>
 
 <div class="contexts">
 <h2>Last 5 completed actions</h2>
-<ul>
-  <%= render_collection_of_partials "done", @done %>
-  </ul>
+<table class="next_actions" cellspacing="5" cellpadding="0" border="0">
+    <%= render_collection_of_partials "done", @done %>
+</table>
 </div>
 </div><!- End of display_box -->
 
diff --git a/tracks/public/stylesheets/standard.css b/tracks/public/stylesheets/standard.css
index a7f25e1a..52717333 100644
--- a/tracks/public/stylesheets/standard.css
+++ b/tracks/public/stylesheets/standard.css
@@ -20,7 +20,8 @@ a, a:link, a:active, a:visited {
 			}
 			
 a:hover {
-			text-decoration: underline;
+			color: #fff;
+			background-color: #cc3334;
 			}
 			
 /* Structural divs */
@@ -99,6 +100,7 @@ h2 a, h2 a:link, h2 a:active, h2 a:visited {
 			
 h2 a:hover {
       color: #cc3334;
+      background-color: transparent;
       text-decoration: none;
       }
 			
@@ -248,4 +250,10 @@ td    {
 
 .odd_row {
       background: #EDF3FE;
-      }
\ No newline at end of file
+      }
+      
+.next_actions td {
+    border: none;
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
\ No newline at end of file