diff --git a/tracks/app/views/contexts/_mobile_context_listing.rhtml b/tracks/app/views/contexts/_mobile_context_listing.rhtml
index 6d792961..4f770186 100644
--- a/tracks/app/views/contexts/_mobile_context_listing.rhtml
+++ b/tracks/app/views/contexts/_mobile_context_listing.rhtml
@@ -1,2 +1,2 @@
-<%  context = mobile_context_listing %>
-<div id="ctx"><%= link_to context.name, formatted_context_path(context, :m) %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %></div>
+<% context = mobile_context_listing -%>
+<div id="ctx"><%= link_to context.name, formatted_context_path(context, :m) %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %></div>
\ No newline at end of file
diff --git a/tracks/app/views/contexts/index_mobile.rhtml b/tracks/app/views/contexts/index_mobile.rhtml
index 35a1de9a..1edd16ed 100644
--- a/tracks/app/views/contexts/index_mobile.rhtml
+++ b/tracks/app/views/contexts/index_mobile.rhtml
@@ -1,6 +1,2 @@
-<h2>Visible Contexts</h2>
-<%= render :partial => 'mobile_context_listing', :collection => @active_contexts%>
-
-<h2>Hidden Contexts</h2>
-<%= render :partial => 'mobile_context_listing', :collection => @hidden_contexts %>
-
+<h2>Visible Contexts</h2><%= render :partial => 'mobile_context_listing', :collection => @active_contexts %>
+<h2>Hidden Contexts</h2><%= render :partial => 'mobile_context_listing', :collection => @hidden_contexts %>
\ No newline at end of file
diff --git a/tracks/app/views/feedlist/mobile_index.rhtml b/tracks/app/views/feedlist/mobile_index.rhtml
index a8511e75..b8c64398 100644
--- a/tracks/app/views/feedlist/mobile_index.rhtml
+++ b/tracks/app/views/feedlist/mobile_index.rhtml
@@ -1,50 +1,32 @@
 <ul>
-  <li>
-    <%= rss_formatted_link({ :controller => 'todos', :action => 'index', :limit => 15 }) %>
-    <%= text_formatted_link({ :controller => 'todos', :action => 'index', :limit => 15 }) %>
-    <%= ical_formatted_link({ :controller => 'todos', :action => 'index', :limit => 15 }) %>
-    Last 15 actions
-  </li>
-  <li>
-    <%= rss_formatted_link( { :controller => 'todos', :action => 'index' } ) %>
-    <%= text_formatted_link( { :controller => 'todos', :action => 'index' } ) %>
-    <%= ical_formatted_link( { :controller => 'todos', :action => 'index' } ) %>
-    All actions
-  </li>
-  <li>
-    <%= rss_formatted_link({ :controller => 'todos', :action => 'index', :due => 0 }) %>
-    <%= text_formatted_link({ :controller => 'todos', :action => 'index', :due => 0 }) %>
-    <%= ical_formatted_link({ :controller => 'todos', :action => 'index', :due => 0 }) %>
-    Actions due today or earlier
-  </li>
-  <li>
-    <%= rss_formatted_link({ :controller => 'todos', :action => 'index', :due => 6 }) %>
-    <%= text_formatted_link({ :controller => 'todos', :action => 'index', :due => 6 }) %>
-    <%= ical_formatted_link({ :controller => 'todos', :action => 'index', :due => 6 }) %>
-    Actions due in 7 days or earlier
-  </li>
-  <li>
-    <%= rss_formatted_link({ :controller => 'todos', :action => 'index', :done => 7 }) %>
-    <%= text_formatted_link({ :controller => 'todos', :action => 'index', :done => 7 }) %>
-    Actions completed in the last 7 days
-  </li>
-  <li>
-    <%= rss_formatted_link({:controller => 'contexts', :action => 'index'}) %>
-    <%= text_formatted_link({:controller => 'contexts', :action => 'index'}) %>
-    All Contexts
-  </li>
-  <li>
-    <%= rss_formatted_link({:controller => 'projects', :action => 'index'}) %>
-    <%= text_formatted_link({:controller => 'projects', :action => 'index'}) %>
-    All Projects
-  </li>
-  <li>
-    <%= rss_formatted_link({:controller => 'projects', :action => 'index', :only_active_with_no_next_actions => true}) %>
-    <%= text_formatted_link({:controller => 'projects', :action => 'index', :only_active_with_no_next_actions => true}) %>
-    Active projects with no next actions
-  </li>
-  <li>
-    <%= text_formatted_link({:controller => 'projects', :action => 'index', :projects_and_actions => true}) %>
-    Active projects with their actions                    
-  </li>
-</ul>
+<li><%= rss_formatted_link({ :controller => 'todos', :action => 'index', :limit => 15 }) -%>
+ <%= text_formatted_link({ :controller => 'todos', :action => 'index', :limit => 15 }) -%>
+ <%= ical_formatted_link({ :controller => 'todos', :action => 'index', :limit => 15 }) -%>
+ Last 15 actions</li>
+<li><%= rss_formatted_link( { :controller => 'todos', :action => 'index' } ) -%>
+ <%= text_formatted_link( { :controller => 'todos', :action => 'index' } ) -%>
+ <%= ical_formatted_link( { :controller => 'todos', :action => 'index' } ) -%>
+ All actions</li>
+<li><%= rss_formatted_link({ :controller => 'todos', :action => 'index', :due => 0 }) -%>
+ <%= text_formatted_link({ :controller => 'todos', :action => 'index', :due => 0 }) -%>
+ <%= ical_formatted_link({ :controller => 'todos', :action => 'index', :due => 0 }) -%>
+ Actions due today or earlier</li>
+<li><%= rss_formatted_link({ :controller => 'todos', :action => 'index', :due => 6 }) -%>
+ <%= text_formatted_link({ :controller => 'todos', :action => 'index', :due => 6 }) -%>
+ <%= ical_formatted_link({ :controller => 'todos', :action => 'index', :due => 6 }) -%>
+ Actions due in 7 days or earlier</li>
+<li><%= rss_formatted_link({ :controller => 'todos', :action => 'index', :done => 7 }) -%>
+ <%= text_formatted_link({ :controller => 'todos', :action => 'index', :done => 7 }) -%>
+ Actions completed in the last 7 days</li>
+<li><%= rss_formatted_link({:controller => 'contexts', :action => 'index'}) -%>
+ <%= text_formatted_link({:controller => 'contexts', :action => 'index'}) -%>
+ All Contexts</li>
+<li><%= rss_formatted_link({:controller => 'projects', :action => 'index'}) -%>
+ <%= text_formatted_link({:controller => 'projects', :action => 'index'}) -%>
+ All Projects</li>
+<li><%= rss_formatted_link({:controller => 'projects', :action => 'index', :only_active_with_no_next_actions => true}) %>
+ <%= text_formatted_link({:controller => 'projects', :action => 'index', :only_active_with_no_next_actions => true}) %>
+ Active projects with no next actions</li>
+<li><%= text_formatted_link({:controller => 'projects', :action => 'index', :projects_and_actions => true}) %>
+ Active projects with their actions                    
+</li></ul>
\ No newline at end of file
diff --git a/tracks/app/views/projects/_mobile_project_listing.rhtml b/tracks/app/views/projects/_mobile_project_listing.rhtml
index 4ea67a2c..803d2d8c 100644
--- a/tracks/app/views/projects/_mobile_project_listing.rhtml
+++ b/tracks/app/views/projects/_mobile_project_listing.rhtml
@@ -1,2 +1,4 @@
-<%  project = mobile_project_listing %>
-<div id="pjr"><%= link_to project.name, formatted_project_path(project) %><%= " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %></div>
+<% project = mobile_project_listing -%>
+<div id="pjr"><%= 
+    link_to project.name, formatted_project_path(project) +
+    " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %></div>
\ No newline at end of file
diff --git a/tracks/app/views/projects/index_mobile.rhtml b/tracks/app/views/projects/index_mobile.rhtml
index 3d7578cd..a33dce05 100644
--- a/tracks/app/views/projects/index_mobile.rhtml
+++ b/tracks/app/views/projects/index_mobile.rhtml
@@ -1,8 +1,6 @@
-<h2>Active projects</h2>
-<%= render :partial => 'mobile_project_listing', :collection => @active_projects%>
-
-<h2>Hidden projects</h2>
-<%= render :partial => 'mobile_project_listing', :collection => @hidden_projects %>
-
-<h2>Completed projects</h2>
-<%= render :partial => 'mobile_project_listing', :collection => @completed_projects %>
+<h2>Active projects</h2><%= 
+  render :partial => 'mobile_project_listing', :collection => @active_projects%>
+<h2>Hidden projects</h2><%= 
+  render :partial => 'mobile_project_listing', :collection => @hidden_projects %>
+<h2>Completed projects</h2><%= 
+  render :partial => 'mobile_project_listing', :collection => @completed_projects %>
\ No newline at end of file
diff --git a/tracks/app/views/todos/_mobile_todo.rhtml b/tracks/app/views/todos/_mobile_todo.rhtml
index 6b8ebcaa..fafdd164 100644
--- a/tracks/app/views/todos/_mobile_todo.rhtml
+++ b/tracks/app/views/todos/_mobile_todo.rhtml
@@ -11,7 +11,7 @@ end -%>
 <%  else 
 -%><span class="m_t">
 <%  end -%>
-<%= date_span -%><%= link_to mobile_todo.description, formatted_todo_path(mobile_todo, :m) -%>
+<%= date_span -%> <%= link_to mobile_todo.description, formatted_todo_path(mobile_todo, :m) -%>
 <%  if parent_container_type == 'context' or parent_container_type == 'tag' -%>
 <%=    "<span class=prj> (" + 
        link_to(mobile_todo.project.name, formatted_project_path(mobile_todo.project, :m)) + 
diff --git a/tracks/app/views/todos/mobile_list_deferred.rhtml b/tracks/app/views/todos/mobile_list_deferred.rhtml
index ebfcb4a9..4c04a2e3 100644
--- a/tracks/app/views/todos/mobile_list_deferred.rhtml
+++ b/tracks/app/views/todos/mobile_list_deferred.rhtml
@@ -1,6 +1,5 @@
 <% if @count == 0 -%>
 <div class="message"><p>Currently there are no deferred actions.</p></div>
 <% end -%>
-
 <%= render :partial => "contexts/mobile_context", :collection => @contexts, 
-            :locals => { :collapsible => true } %>
+            :locals => { :collapsible => true } -%>
\ No newline at end of file
diff --git a/tracks/app/views/todos/mobile_tag.rhtml b/tracks/app/views/todos/mobile_tag.rhtml
index 20dfe67c..0fb66f82 100644
--- a/tracks/app/views/todos/mobile_tag.rhtml
+++ b/tracks/app/views/todos/mobile_tag.rhtml
@@ -1,28 +1,25 @@
 <div id="display_box">
-  <div class="container context" <%= "style=\"display:none\"" unless @not_done_todos.empty? %>>
-       <h2>
-      No actions found
-    </h2>
-    <div class="message"><p>Currently there are no incomplete actions with the tag '<%= @tag_name %>'</p></div>
-  </div>
-  
-  <%= render :partial => "contexts/mobile_context", :collection => @contexts_to_show %>
-  
-  <h2>Deferred actions with the tag <%= @tag_name %></h2>
-  <% unless (@deferred.nil? or @deferred.size == 0)  -%>
-  <table cellpadding="0" cellspacing="0" border="0">
-    <%= render :partial => "todos/mobile_todo", :collection => @deferred, :locals => { :parent_container_type => "tag" } %>
-  </table>  
-<% else %>
-  No deferred actions with the tag <%= @tag_name %>
+<% if @not_done_todos.empty? -%>
+<div class="container context">
+<h2>No actions found</h2>
+<div class="message">Currently there are no incomplete actions with the tag '<%= @tag_name %>'</div>
+</div>
 <% end -%>
-  
-  <h2>Completed actions with the tag <%= @tag_name %></h2>
+<%= render :partial => "contexts/mobile_context", :collection => @contexts_to_show -%>
+<h2>Deferred actions with the tag <%= @tag_name %></h2>
+<% unless (@deferred.nil? or @deferred.size == 0)  -%>
+<table cellpadding="0" cellspacing="0" border="0">
+<%= render :partial => "todos/mobile_todo", :collection => @deferred, :locals => { :parent_container_type => "tag" } -%>
+</table>  
+<% else -%>
+No deferred actions with the tag <%= @tag_name %>
+<% end -%>
+<h2>Completed actions with the tag <%= @tag_name %></h2>
 <% unless (@done.nil? or @done.size == 0) -%>
-  <table cellpadding="0" cellspacing="0" border="0">
-    <%= render :partial => "todos/mobile_todo", :collection => @done, :locals => { :parent_container_type => "tag" } %>
-  </table>
-<% else %>
-  No completed actions with the tag <%= @tag_name %>
+<table cellpadding="0" cellspacing="0" border="0">
+<%= render :partial => "todos/mobile_todo", :collection => @done, :locals => { :parent_container_type => "tag" } %>
+</table>
+<% else -%>
+No completed actions with the tag <%= @tag_name %>
 <% end -%>
-</div><!-- End of display_box -->
+</div>
\ No newline at end of file