diff --git a/tracks/app/views/layouts/standard.html.erb b/tracks/app/views/layouts/standard.html.erb
index b1535484..92e7bd1a 100644
--- a/tracks/app/views/layouts/standard.html.erb
+++ b/tracks/app/views/layouts/standard.html.erb
@@ -35,12 +35,18 @@ window.onload=function(){
   <%= user_time.strftime(@prefs.title_date_format) %>
   </h1>
 </div>
-<div id="minilinks">
-	<%= link_to_function("Toggle notes", nil, {:accesskey => "S", :title => "Toggle all notes", :id => "toggle-notes-nav"}) do |page|
+<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 "Logout (#{current_user.display_name}) »", logout_path %>
+    <%= link_to "Logout (#{current_user.display_name}) »", logout_path %><br/><% 
+    form_tag({:controller => :search, :action => :results}, {:class => "inline-form"}) do %>
+    <br/><%= text_field_tag(:search, params[:search]) %>
+    <button type="submit" class="search_submit"><%=
+    image_tag("system-search.png", :alt => "Search") -%>
+    </button>
+    <% end %>
 </div>
 
 <div id="navcontainer">
@@ -59,7 +65,6 @@ window.onload=function(){
   <li><%= navigation_link(image_tag("feed-icon.png", :size => "16X16", :border => 0), {:controller => "feedlist", :action => "index"}, :title => "See a list of available feeds" ) %></li>
   <li><%= navigation_link(image_tag("menustar.gif", :size => "16X16", :border => 0), tag_path("starred"), :title => "See your starred actions" ) %></li>
   <li><%= navigation_link(image_tag("stats.gif", :size => "16X16", :border => 0), {:controller => "stats", :action => "index"}, :title => "See your statistics" ) %></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/tracks/public/stylesheets/standard.css b/tracks/public/stylesheets/standard.css
index 54105f79..38ad2c69 100644
--- a/tracks/public/stylesheets/standard.css
+++ b/tracks/public/stylesheets/standard.css
@@ -1004,7 +1004,7 @@ table.export_table {
 
 /* STANDARD */
 
-button:hover, .widgets a:hover{
+.widgets a:hover{
     background-color:#dff4ff;
     border:1px solid #c2e1ef;
     color:#336699;