diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 0ee34aa6..ecf6a034 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -21,33 +21,6 @@
     <link rel="shortcut icon" href="<%= url_for(:controller => 'favicon.ico') %>" />
     <%= auto_discovery_link_tag(:rss, {:controller => "todos", :action => "index", :format => 'rss', :token => "#{current_user.token}"}, {:title => "RSS feed of next actions"}) %>
     <link rel="search" type="application/opensearchdescription+xml" title="Tracks" href="<%= search_plugin_path %>" />
-
-    <script type="text/javascript">
-      jQuery(document).ready(function() { /* main menu */
-        jQuery('ul.sf-menu').superfish({
-          delay: 250,
-          animation:   {opacity:'show',height:'show'},
-          autoArrows: false,
-          dropShadows: false,
-          speed: 'fast'
-        });
-        jQuery('ul.sf-item-menu').superfish({ /* context menu */
-          delay: 100,
-          animation:   {opacity:'show',height:'show'},
-          autoArrows: false,
-          dropShadows: false,
-          speed: 'fast',
-          onBeforeShow: function() { /* highlight todo */
-            $(this.parent().parent().parent()).addClass("sf-item-selected");
-          },
-          onHide: function() { /* remove hightlight from todo */
-            $(this.parent().parent().parent()).removeClass("sf-item-selected");
-          }
-        });
-        Nifty("div#todo_new_action_container","normal");
-        if ($('flash').visible()) { new Effect.Fade("flash",{duration:5.0}); }
-      });
-    </script>
     <title><%= @page_title %></title>
   </head>
 
@@ -62,10 +35,8 @@
         </h1>
       </div>
       <div id="minilinks">
-        <%= link_to_function("Toggle notes", nil, {:accesskey => "S", :title => "Toggle all notes", :id => "toggle-notes-nav"}) do |page|
-          page.select('body .todo_notes').each { |e| e.toggle }
-        end
-        -%>&nbsp;|&nbsp;
+        <%= link_to("Toggle notes", "#", {:accesskey => "S", :title => "Toggle all notes", :id => "toggle-notes-nav"}) %>
+        &nbsp;|&nbsp;
         <%= link_to "Logout (#{current_user.display_name}) »", logout_path %>
       </div>
       <div id="navcontainer">
@@ -118,5 +89,36 @@
     </div>
 
     <%= render :partial => "shared/footer" %>
+
+    <script type="text/javascript">
+      jQuery(document).ready(function() { /* main menu */
+        jQuery('ul.sf-menu').superfish({
+          delay: 250,
+          animation:   {opacity:'show',height:'show'},
+          autoArrows: false,
+          dropShadows: false,
+          speed: 'fast'
+        });
+        jQuery('ul.sf-item-menu').superfish({ /* context menu */
+          delay: 100,
+          animation:   {opacity:'show',height:'show'},
+          autoArrows: false,
+          dropShadows: false,
+          speed: 'fast',
+          onBeforeShow: function() { /* highlight todo */
+            $(this.parent().parent().parent()).addClass("sf-item-selected");
+          },
+          onHide: function() { /* remove hightlight from todo */
+            $(this.parent().parent().parent()).removeClass("sf-item-selected");
+          }
+        });
+        /* for toggle notes link in mininav */
+        jQuery("#toggle-notes-nav").click(function () { jQuery(".todo_notes").toggle(); });
+        /* show the notes of a todo */
+        jQuery(".show_notes").click(function () { jQuery(this).next().toggle("fast"); return false; });
+        Nifty("div#todo_new_action_container","normal");
+        if ($('flash').visible()) { new Effect.Fade("flash",{duration:5.0}); }
+      });
+    </script>
   </body>
 </html>
diff --git a/app/views/todos/_toggle_notes.rhtml b/app/views/todos/_toggle_notes.rhtml
index 52f279a1..61cfca64 100644
--- a/app/views/todos/_toggle_notes.rhtml
+++ b/app/views/todos/_toggle_notes.rhtml
@@ -1,7 +1,5 @@
 <%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_notes', :title => 'Show notes'}) %>
-<% apply_behavior 'a.show_notes:click', :prevent_default => true do |page, element|
-  element.next('.todo_notes').toggle
-end -%>
+
 <div class="todo_notes" id="<%= dom_id(item, 'notes') %>" style="display:none">
   <%= sanitize(markdown( auto_link(item.notes)) ) %>
 </div>
\ No newline at end of file