diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index ec70762e..fa1b9d8b 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -117,7 +117,7 @@ module TodosHelper
       "<span class=\"tag\">" + 
         link_to(t.name, {:action => "tag", :controller => "todos", :id => t.name+".m"}) + 
       "</span>"}.join('')
-    "<span class=\"tags\">#{tag_list}</span>"
+    if not tag_list.empty? then "<span class=\"tags\">#{tag_list}</span>" end
   end
   
   def deferred_due_date
diff --git a/app/views/contexts/_mobile_context.rhtml b/app/views/contexts/_mobile_context.rhtml
index 6510aeb4..71c3945d 100644
--- a/app/views/contexts/_mobile_context.rhtml
+++ b/app/views/contexts/_mobile_context.rhtml
@@ -6,9 +6,9 @@ if not @not_done.empty?
   # only show a context when there are actions in it
   -%>
 <h2><%=mobile_context.name%></h2>
-<table cellpadding="0" cellspacing="0" border="0">
+<table cellpadding="0" cellspacing="0" border="0" class="c">
 <%= render :partial => "todos/mobile_todo", 
            :collection => @not_done, 
            :locals => { :parent_container_type => "context" }-%>
 </table>
-<% end -%>
\ No newline at end of file
+<% end -%>
diff --git a/app/views/todos/_mobile_todo.rhtml b/app/views/todos/_mobile_todo.rhtml
index fafdd164..8537d98d 100644
--- a/app/views/todos/_mobile_todo.rhtml
+++ b/app/views/todos/_mobile_todo.rhtml
@@ -4,8 +4,7 @@ if mobile_todo.starred?
 else
   bullet = "<span class=r>&raquo;&nbsp;</span>"
 end -%>
-<div class="t" id="<%= dom_id(mobile_todo) %>">
-<tr valign="top"><td><%= bullet %></td><td><% 
+<tr class="t" id="<%= dom_id(mobile_todo) %>" valign="top"><td><%= bullet %></td><td><% 
     if mobile_todo.completed?  
 -%><span class="m_t_d">
 <%  else 
@@ -23,4 +22,4 @@ end -%>
        ")</span>" -%>
 <%  end -%>
  <%= tag_list_mobile -%>
-</span></td></tr></div>
\ No newline at end of file
+</span></td></tr>
diff --git a/public/stylesheets/mobile.css b/public/stylesheets/mobile.css
index dc7a74f0..f51b46db 100644
--- a/public/stylesheets/mobile.css
+++ b/public/stylesheets/mobile.css
@@ -60,10 +60,6 @@ h4.notice {
   color: #007E00;
 }
 
-div.t {
-    padding-left:5px;
-}
-
 span.tag {
   font-size: XX-small;
   background-color: #CCE7FF;
@@ -125,4 +121,8 @@ span.prj, span.ctx{
 
 .errors {
       background: #FFC2C2;
-}
\ No newline at end of file
+}
+
+table.c {
+      margin-left: 5px;
+}