diff --git a/tracks/app/views/todos/_edit_mobile.rhtml b/tracks/app/views/todos/_edit_mobile.rhtml
index 7a2db546..b2c423e6 100644
--- a/tracks/app/views/todos/_edit_mobile.rhtml
+++ b/tracks/app/views/todos/_edit_mobile.rhtml
@@ -1,3 +1,5 @@
+<% @tag_list_text = "" 
+   @tag_list_text = tag_list_text if @todo -%>
 <span class="errors">
 <%= error_messages_for("todo") %>
 </span>
@@ -14,6 +16,8 @@ if parent_container_type == 'show_mobile' -%>
 <h2><label for="todo_project_id">Project</label></h2>
 <%= collection_select( "todo", "project_id", @projects, "id", "name",
                           {:include_blank => true}, {"tabindex" => 5} ) %>
+<h2><label for="tag_list">Tags (separate with commas)</label></h2>
+<%= text_field_tag "tag_list", @tag_list_text, :size => 30, :tabindex => 6 %> 
 <h2><label for="todo_due">Due</label></h2>
 <%= date_select("todo", "due", :order => [:day, :month, :year],
                     :start_year => this_year, :include_blank => true) %>
diff --git a/tracks/app/views/todos/new.m.erb b/tracks/app/views/todos/new.m.erb
index 9ce1090a..17144323 100644
--- a/tracks/app/views/todos/new.m.erb
+++ b/tracks/app/views/todos/new.m.erb
@@ -2,4 +2,4 @@
   <%= render :partial => 'edit_mobile' %>
   <p><input type="submit" value="Create" tabindex="6" /></p>
 <% end -%>
-<%= link_to "Back", formatted_todos_path(:m) %>
\ No newline at end of file
+<%= link_to "Back", @return_path %>
\ No newline at end of file
diff --git a/tracks/app/views/todos/show.m.erb b/tracks/app/views/todos/show.m.erb
index f452e773..c09ac503 100644
--- a/tracks/app/views/todos/show.m.erb
+++ b/tracks/app/views/todos/show.m.erb
@@ -2,4 +2,4 @@
   <%= render :partial => 'edit_mobile', :locals => { :parent_container_type => "show_mobile" } %>
   <p><input type="submit" value="Update" tabindex="6" /></p>
 <% end -%>
-<% #= link_to "Back", formatted_todos_path(:m) %>
+<%= link_to "Cancel", @return_path %>