diff --git a/config/routes.rb b/config/routes.rb
index c1b0180f..e0a91a43 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,7 +43,7 @@ ActionController::Routing::Routes.draw do |map|
     # so /todos/tag/version1.5.xml will result in :name => 'version1.5.xml'
     # UPDATE: added support for mobile view. All tags ending on .m will be
     # routed to mobile view of tags.
-    todos.tag 'todos/tag/:name', :action => "tag", :format => 'm', :name => /.*\.m/
+    todos.tag 'todos/tag/:name.m', :action => "tag", :format => 'm'
     todos.tag 'todos/tag/:name', :action => "tag", :name => /.*/
     
     todos.mobile 'mobile', :action => "index", :format => 'm'
diff --git a/test/selenium/home/create_new_todo_in_context_and_hide_context.rsel b/test/selenium/home/create_new_todo_in_context_and_hide_context.rsel
index 64ff3ed9..4b8adbe7 100644
--- a/test/selenium/home/create_new_todo_in_context_and_hide_context.rsel
+++ b/test/selenium/home/create_new_todo_in_context_and_hide_context.rsel
@@ -9,7 +9,7 @@ assert_element_present "todo_9"
 
 # add new action to existing context
 type "todo_description", "a new action"
-type "todo_context_name", "Agenda"
+type "todo_context_name", "agenda"
 click "css=#todo-form-new-action .submit_box button"
 wait_for_visible "flash"
 
diff --git a/test/selenium/home/mark_todo_complete_1.rsel b/test/selenium/home/mark_todo_complete_1.rsel
index 35194bde..06ce62b5 100644
--- a/test/selenium/home/mark_todo_complete_1.rsel
+++ b/test/selenium/home/mark_todo_complete_1.rsel
@@ -2,4 +2,4 @@ setup :fixtures => :all
 login :as => 'admin'
 open '/'
 click "xpath=//div[@id='c1'] //div[@id='todo_9'] //input[@class='item-checkbox']"
-wait_for_element_present "xpath=//div[@id='completed'] //div[@id='todo_9']"
+wait_for_element_present "xpath=//div[@id='completed_container'] //div[@id='todo_9']"
diff --git a/test/selenium/home/mark_todo_complete_2.rsel b/test/selenium/home/mark_todo_complete_2.rsel
index dcb66769..b6cf4de9 100644
--- a/test/selenium/home/mark_todo_complete_2.rsel
+++ b/test/selenium/home/mark_todo_complete_2.rsel
@@ -2,5 +2,5 @@ setup :fixtures => :all
 login :as => 'admin'
 open '/'
 click "xpath=//div[@id='c5'] //div[@id='todo_5'] //input[@class='item-checkbox']"
-wait_for_element_present "xpath=//div[@id='completed'] //div[@id='todo_5']"
+wait_for_element_present "xpath=//div[@id='completed_container'] //div[@id='todo_5']"
 wait_for_not_visible 'c5'
diff --git a/test/selenium/home/mark_todo_incomplete.rsel b/test/selenium/home/mark_todo_incomplete.rsel
index d0a159ac..86c31088 100644
--- a/test/selenium/home/mark_todo_incomplete.rsel
+++ b/test/selenium/home/mark_todo_incomplete.rsel
@@ -1,6 +1,6 @@
 setup :fixtures => :all
 login :as => 'admin'
 open '/'
-click "xpath=//div[@id='completed'] //div[@id='todo_3'] //input[@class='item-checkbox']"
+click "xpath=//div[@id='completed_container'] //div[@id='todo_3'] //input[@class='item-checkbox']"
 wait_for_element_present "xpath=//div[@id='c4'] //div[@id='todo_3']"
 assert_not_visible "c4empty-nd"
diff --git a/test/selenium/mobile/create_new_action.rsel b/test/selenium/mobile/create_new_action.rsel
index d475a799..a8501da1 100644
--- a/test/selenium/mobile/create_new_action.rsel
+++ b/test/selenium/mobile/create_new_action.rsel
@@ -4,7 +4,7 @@ login :as => 'admin'
 open '/m'
 wait_for_text 'css=h1 span.count', '10'
 
-click_and_wait "link=Add new action"
+click_and_wait "link=0-Add new action"
 
 type "todo_notes", "test notes"
 type "todo_description", "test name"
diff --git a/test/selenium/mobile/navigation.rsel b/test/selenium/mobile/navigation.rsel
index bf459466..44bde92c 100644
--- a/test/selenium/mobile/navigation.rsel
+++ b/test/selenium/mobile/navigation.rsel
@@ -7,7 +7,7 @@ wait_for_title "All actions"
 wait_for_text 'css=h1 span.count', '10'
 
 # open context page
-click_and_wait "link=Contexts"
+click_and_wait "link=2-Contexts"
 # verify_title "All actions in context agenda"
 # choose agenda context
 click_and_wait "link=agenda"
@@ -18,7 +18,7 @@ click_and_wait "link=foo"
 verify_title "TRACKS::Tagged with 'foo'"
 wait_for_text 'css=h1 span.count', '2'
 
-click_and_wait "link=Projects"
+click_and_wait "link=3-Projects"
 wait_for_text 'css=h1 span.count', '3'
 click_and_wait "link=Build a working time machine"
 wait_for_text 'css=h1 span.count', '3'
diff --git a/test/selenium/project_detail/mark_deferred_todo_complete.rsel b/test/selenium/project_detail/mark_deferred_todo_complete.rsel
index 893192f8..0b07d445 100644
--- a/test/selenium/project_detail/mark_deferred_todo_complete.rsel
+++ b/test/selenium/project_detail/mark_deferred_todo_complete.rsel
@@ -3,5 +3,5 @@ login :as => 'admin'
 open "/projects/1"
 include_partial 'project_detail/add_deferred_todo'
 click "xpath=//div[@id='tickler'] //div[@id='todo_15'] //input[@class='item-checkbox']"
-wait_for_element_present "xpath=//div[@id='completed'] //div[@id='todo_15']"
+wait_for_element_present "xpath=//div[@id='completed_container'] //div[@id='todo_15']"
 assert_not_visible "tickler-empty-nd"
\ No newline at end of file
diff --git a/test/selenium/tags/badge_count.rsel b/test/selenium/tags/badge_count.rsel
index 56cd9f84..4359059d 100644
--- a/test/selenium/tags/badge_count.rsel
+++ b/test/selenium/tags/badge_count.rsel
@@ -11,6 +11,6 @@ assert_text 'badge_count', '1'
 
 # mark one complete
 click "xpath=//div[@id='c1'] //div[@id='todo_1'] //input[@class='item-checkbox']"
-wait_for_element_present "xpath=//div[@id='completed'] //div[@id='todo_1']"
+wait_for_element_present "xpath=//div[@id='completed_container'] //div[@id='todo_1']"
 
 assert_text 'badge_count', '0'