diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index bc8626c6..07fac6bb 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -67,14 +67,16 @@
               <li><%= navigation_link( "Contexts", contexts_path, {:accesskey=>"c", :title=>"Contexts"} ) %></li>
               <li><%= navigation_link( "Notes", notes_path, {:accesskey => "o", :title => "Show all notes"} ) %></li>
               <li><%= navigation_link( "Repeating todos", {:controller => "recurring_todos", :action => "index"}, :title => "Manage recurring actions" ) %></li>
-          </ul></li>
+            </ul>
+          </li>
           <li><a href="#">View</a>
-          <ul>
-            <li><%= navigation_link( "Calendar", calendar_path, :title => "Calendar of due actions" ) %></li>
-            <li><%= navigation_link( "Done", done_path, {:accesskey=>"d", :title=>"Completed"} ) %></li>
-            <li><%= navigation_link( "Feeds", {:controller => "feedlist", :action => "index"}, :title => "See a list of available feeds" ) %></li>
-            <li><%= navigation_link( "Statistics", {:controller => "stats", :action => "index"}, :title => "See your statistics" ) %></li>
-          </ul>
+            <ul>
+              <li><%= navigation_link( "Calendar", calendar_path, :title => "Calendar of due actions" ) %></li>
+              <li><%= navigation_link( "Done", done_path, {:accesskey=>"d", :title=>"Completed"} ) %></li>
+              <li><%= navigation_link( "Feeds", {:controller => "feedlist", :action => "index"}, :title => "See a list of available feeds" ) %></li>
+              <li><%= navigation_link( "Statistics", {:controller => "stats", :action => "index"}, :title => "See your statistics" ) %></li>
+            </ul>
+          </li>
           <li><a href="#">Admin</a>
             <ul>
               <li><%= navigation_link( "Preferences", preferences_path, {:accesskey => "u", :title => "Show my preferences"} ) %></li>
@@ -82,12 +84,14 @@
               <% if current_user.is_admin? -%>
                 <li><%= navigation_link("Manage users", users_path, {:accesskey => "a", :title => "Add or delete users"} ) %></li>
               <% end -%>
-          </ul></li>
+            </ul>
+          </li>
           <li><a href="#">?</a>
             <ul>
               <li><%= link_to 'Integrate Tracks', integrations_path %></li>
               <li><%= link_to 'REST API Docs', url_for(:controller => 'integrations', :action => 'rest_api') %></li>
-          </ul></li>
+            </ul>
+          </li>
           <li><%= navigation_link(image_tag("system-search.png", :size => "16X16", :border => 0), {:controller => "search", :action => "index"}, :title => "Search All Items" ) %></li>
         </ul>
       </div>
diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index 4d2ad947..25f8d372 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -11,16 +11,20 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
   <div id="<%= dom_id(todo, 'line') %>" class="item-show">
     <%= remote_star_icon %>
     <%= remote_toggle_checkbox unless source_view_is :deferred %>
-    <ul class="sf-menu sf-item-menu"><li style="z-index:<%=@z_index_counter%>"><%= image_tag "downarrow.png", :alt=> "" %><ul id="ul<%= dom_id(todo) %>">
-        <% unless suppress_edit_button %>
-          <li><%= remote_edit_menu_item(parameters, todo) %></li>
-        <% end %>
-        <li><%= remote_delete_menu_item(parameters, todo) %></li>
-        <% unless todo.completed? || todo.deferred? %>
-          <li><%= remote_defer_menu_item(1, todo) %></li>
-          <li><%= remote_defer_menu_item(7, todo) %></li>
-        <% end %>
-    </ul></ul>
+    <ul class="sf-menu sf-item-menu">
+      <li style="z-index:<%=@z_index_counter%>"><%= image_tag "downarrow.png", :alt=> "" %>
+        <ul id="ul<%= dom_id(todo) %>">
+          <% unless suppress_edit_button %>
+            <li><%= remote_edit_menu_item(parameters, todo) %></li>
+          <% end %>
+          <li><%= remote_delete_menu_item(parameters, todo) %></li>
+          <% unless todo.completed? || todo.deferred? %>
+            <li><%= remote_defer_menu_item(1, todo) %></li>
+            <li><%= remote_defer_menu_item(7, todo) %></li>
+          <% end %>
+        </ul>
+      </li>
+    </ul>
     <div class="description<%= staleness_class( todo ) %>">
       <%= date_span -%>
       <span class="todo.descr"><%= h sanitize(todo.description) %></span>