diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index a5b97f29..3470b6e0 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -24,23 +24,23 @@ module WikiHelper
   def edit_page
     link_text = (@page.name == "HomePage" ? 'Edit Page' : 'Edit')
     link_to(link_text, {:web => @web.address, :action => 'edit', :id => @page.name}, 
-        {:class => 'navlink', :accesskey => 'E', :name => 'edit'})
+        {:class => 'navlink', :accesskey => 'E', :id => 'edit'})
   end
 
   def edit_web
     link_to('Edit Web', {:web => @web.address, :action => 'edit_web'}, 
-        {:class => 'navlink', :accesskey => 'W', :name => 'edit_web'})
+        {:class => 'navlink', :accesskey => 'W', :id => 'edit_web'})
   end
             
   def forward
     if @revision_number < @page.revisions.length - 1
       link_to('Forward in time', 
           {:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number + 1},
-          {:class => 'navlink', :accesskey => 'F', :name => 'to_next_revision'}) + 
+          {:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision'}) + 
           " <small>(#{@revision.page.revisions.length - @revision_number} more)</small> "
     else
         link_to('Forward in time', {:web => @web.address, :action => 'show', :id => @page.name},
-            {:class => 'navlink', :accesskey => 'F', :name => 'to_next_revision'}) +
+            {:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision'}) +
             " <small> (to current)</small>"
     end
   end
@@ -48,7 +48,7 @@ module WikiHelper
   def back_for_revision
     link_to('Back in time',
         {:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number - 1},
-        {:class => 'navlink', :name => 'to_previous_revision'}) + 
+        {:class => 'navlink', :id => 'to_previous_revision'}) + 
         " <small>(#{@revision_number - 1} more)</small>"
   end
 
@@ -56,34 +56,34 @@ module WikiHelper
     link_to('Back in time', 
         {:web => @web.address, :action => 'revision', :id => @page.name, 
         :rev => @page.revisions.length - 1},
-        {:class => 'navlink', :accesskey => 'B', :name => 'to_previous_revision'}) +
+        {:class => 'navlink', :accesskey => 'B', :id => 'to_previous_revision'}) +
         " <small>(#{@page.revisions.length - 1} #{@page.revisions.length - 1 == 1 ? 'revision' : 'revisions'})</small>"
   end
   
   def current_revision
     link_to('See current', {:web => @web.address, :action => 'show', :id => @page.name},
-        {:class => 'navlink', :name => 'to_current_revision'})
+        {:class => 'navlink', :id => 'to_current_revision'})
   end
   
   def see_or_hide_changes_for_revision
     link_to(@show_diff ? 'Hide changes' : 'See changes', 
         {:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number, 
          :mode => (@show_diff ? nil : 'diff') },
-        {:class => 'navlink', :accesskey => 'C', :name => 'see_changes'})
+        {:class => 'navlink', :accesskey => 'C', :id => 'see_changes'})
   end
 
   def see_or_hide_changes_for_page
     link_to(@show_diff ? 'Hide changes' : 'See changes', 
         {:web => @web.address, :action => 'show', :id => @page.name, :mode => (@show_diff ? nil : 'diff') },
-        {:class => 'navlink', :accesskey => 'C', :name => 'see_changes'})
+        {:class => 'navlink', :accesskey => 'C', :id => 'see_changes'})
   end
   
   def rollback
     link_to('Rollback', 
         {:web => @web.address, :action => 'rollback', :id => @page.name, :rev => @revision_number},
-        {:class => 'navlink', :name => 'rollback'})
+        {:class => 'navlink', :id => 'rollback'})
   end
 
   
 
-end
\ No newline at end of file
+end
diff --git a/app/views/navigation.rhtml b/app/views/navigation.rhtml
index 5735b472..afad662c 100644
--- a/app/views/navigation.rhtml
+++ b/app/views/navigation.rhtml
@@ -18,11 +18,11 @@ end
     <%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %> |
     <%= form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
                  {'id' => 'navigationSearchForm', 'method' => 'get', 'accept-charset' => 'utf-8' }) %>
-      <input type="text" id="searchField" name="query" value="Search"
+      <fieldset class="search"><input type="text" id="searchField" name="query" value="Search"
              onfocus="this.value == 'Search' ? this.value = '' : true"
-             onblur="this.value == '' ? this.value = 'Search' : true" />
+             onblur="this.value == '' ? this.value = 'Search' : true" /></fieldset>
     <%= end_form_tag %>
   <% else %>
   	<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
   <% end%>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/wiki/page.rhtml b/app/views/wiki/page.rhtml
index 66fbade3..0f8caeb3 100644
--- a/app/views/wiki/page.rhtml
+++ b/app/views/wiki/page.rhtml
@@ -36,14 +36,14 @@
     | Views: 
     <%= link_to('Print',
             { :web => @web.address, :action => 'print', :id => @page.name },
-            { :accesskey => 'p', :name => 'view_print' }) %>
+            { :accesskey => 'p', :id => 'view_print' }) %>
   <% if defined? RedClothForTex and RedClothForTex.available? and @web.markup == :textile or @web.markup == :markdownMML %>
     | 
     <%= link_to 'TeX', {:web => @web.address, :action => 'tex', :id => @page.name}, 
-            {:name => 'view_tex'} %>
+            {:id => 'view_tex'} %>
     | 
     <%= link_to 'PDF', {:web => @web.address, :action => 'pdf', :id => @page.name},
-            {:name => 'view_pdf'} %>
+            {:id => 'view_pdf'} %>
   <% end %>
   </small>
 
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index 860ffb53..73649fe6 100644
--- a/public/stylesheets/instiki.css
+++ b/public/stylesheets/instiki.css
@@ -170,7 +170,7 @@ padding-top:1px;
 
 .diffdel,del.diffmod, .diffdel *, del.diffmod * {
 background-color:#FAA;
-text-decoration:strike-through;
+text-decoration:line-through;
 }
 
 .diffins,ins.diffmod, .diffins *, ins.diffmod * {
@@ -337,3 +337,4 @@ math[display=block] {overflow:auto;}
 math { white-space: nowrap }
 .maruku-eq-number {float:right}
 .blockquotesource {margin-left:1em;}
+fieldset.search {display:inline; border:none;padding:0;margin:0;top:5px;position:relative;}