diff --git a/app/views/admin/create_system.rhtml b/app/views/admin/create_system.rhtml
index 77f8a316..2f1cfbdf 100644
--- a/app/views/admin/create_system.rhtml
+++ b/app/views/admin/create_system.rhtml
@@ -31,9 +31,9 @@
   <li>
     <h2 style="margin-bottom: 3px">Password for creating and changing webs</h2>
     <div class="help">
-      Administrative access allows you to make new webs and change existing ones.<br/>
-      Everyone with this password will be able to do this, so pick it carefully.
+      Administrative access allows you to make new webs and change existing ones.
     </div>
+    <div class="help"><em>Everyone with this password will be able to do this, so pick it carefully!</em></div>
     <div class="inputBox">
       Password: <input type="password" id="password" name="password" />
       &nbsp;&nbsp;
diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index 58734136..e4f99019 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -11,16 +11,16 @@
     Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>.
   </div>
 
-  <div class="inputBox, disableAutoComplete">
-    Name: <input type="text" id="name" name="name" value="<%= @web.name %>" 
+  <div class="inputBox">
+    Name: <input type="text" id="name" name="name" class="disableAutoComplete" value="<%= @web.name %>" 
                  onChange="proposeAddress();" /> &nbsp;&nbsp;
-    Address: <input type="text" id="address" name="address" value="<%= @web.address %>" 
+    Address: <input type="text" class="disableAutoComplete" id="address" name="address" value="<%= @web.address %>" 
                     onChange="cleanAddress();" />
-    <i>(Letters and digits only)</i>
+    <small><em>(Letters and digits only)</em></small>
   </div>
 
   <h2 style="margin-bottom: 3px">Specialize</h2>
-  <div class="inputBox, disableAutoComplete">
+  <div class="inputBox">
     Markup:
     <select name="markup">
       <%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Mixed' => :mixed, 
@@ -37,21 +37,21 @@
     <br/>
     <p>
     <small>
-      <input type="checkbox" name="safe_mode" <%= 'checked="on"' if @web.safe_mode %> /> 
+      <input type="checkbox" class="disableAutoComplete" name="safe_mode" <%= 'checked="on"' if @web.safe_mode %> /> 
       Safe mode
       <em>- strip HTML tags and stylesheet options from the content of all pages</em>
       <br/>
-      <input type="checkbox" name="brackets_only" <%= 'checked="on"' if @web.brackets_only %> /> 
+      <input type="checkbox" class="disableAutoComplete" name="brackets_only" <%= 'checked="on"' if @web.brackets_only %> /> 
       Brackets only 
       <em>- require all wiki words to be as [[wiki word]], WikiWord links won't be created</em>
       <br/>
-      <input type="checkbox" name="count_pages" <%= 'checked="on"' if @web.count_pages %> /> 
+      <input type="checkbox" class="disableAutoComplete" name="count_pages" <%= 'checked="on"' if @web.count_pages %> /> 
       Count pages
       <br/>
 
-      <input type="checkbox" name="allow_uploads" <%= 'checked="on"' if @web.allow_uploads %> /> 
+      <input type="checkbox" class="disableAutoComplete" name="allow_uploads" <%= 'checked="on"' if @web.allow_uploads %> /> 
       Allow uploads of no more than 
-      <input type="text" name="max_upload_size" value="<%= @web.max_upload_size %>" 
+      <input type="text" class="disableAutoComplete" name="max_upload_size" value="<%= @web.max_upload_size %>" 
              width="20" /> 
       kbytes
       <em>- 
@@ -69,7 +69,7 @@
     instiki.css. Hint: View HTML source of a page you want to style to find ID names on individual 
     tags.</em></small>
     <br/>
-    <textarea id="additionalStyle" 
+    <textarea id="additionalStyle" class="disableAutoComplete"
       style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px" 
       name="additional_style"><%= @web.additional_style %>
     </textarea>
@@ -95,7 +95,7 @@
     The published version is accessible through URLs like /wiki/published/HomePage.
   </div>
   <div class="inputBox">
-    <input type="checkbox" name="published" <%= 'checked="on"' if @web.published %> /> 
+    <input type="checkbox" name="published" class="disableAutoComplete" <%= 'checked="on"' if @web.published %> /> 
     Publish this web
   </div>
 
@@ -124,7 +124,7 @@
   <p align="right">
     <small>
       Clean up by entering system password
-      <input type="password" id="system_password_orphaned" name="system_password_orphaned" />
+      <input type="password" id="system_password_orphaned" class="disableAutoComplete" name="system_password_orphaned" />
       and
       <input type="submit" value="Delete Orphan Pages" />
     </small>
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index d43208fa..bd357488 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -20,10 +20,6 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { 
       color: #<%= @web ? @web.color : "393" %>; 
     }
-
-    #Container, #Content {
-      width: <%= @content_width || "600" %>px;
-    }
     <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
   </style>
 
@@ -55,12 +51,12 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     <% end %>
   </h1>
 
-<% if @flash[:info] %> <div id="info">
-    <hr/><p><%= escape_preserving_linefeeds @flash[:info] %></p><hr/></div>
-<% end %>
-
 <%= render 'navigation' unless @web.nil? || @hide_navigation %>
 
+<% if @flash[:info] %>
+  <div class="info"><%= escape_preserving_linefeeds @flash[:info] %></div>
+<% end %>
+
 <% if @error or @flash[:error] %> 
     <div class="errorExplanation"><%= escape_preserving_linefeeds(@error || @flash[:error]) %></div>
 <% end %>
@@ -69,9 +65,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 
 <% if @show_footer %>
     <div id="footer">
-    <p>This site is running on <a href="http://instiki.org/">Instiki</a></p>
-    <br/>
-    <p>Powered by <a href="http://rubyonrails.com/">Ruby on Rails</a></p>
+    <div>This site is running on <a href="http://instiki.org/">Instiki</a></div>
+    <div>Powered by <a href="http://rubyonrails.com/">Ruby on Rails</a></div>
     </div>
 <% end %>
 
diff --git a/app/views/navigation.rhtml b/app/views/navigation.rhtml
index 3568f866..45bd413b 100644
--- a/app/views/navigation.rhtml
+++ b/app/views/navigation.rhtml
@@ -8,25 +8,21 @@ def list_item(text, link_options, description, accesskey = nil)
 end
 %>
 
-<%= form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
-             {'id' => 'navigationForm', 'class' => 'navigation', 'method' => 'get'})
-%>
-
+<div class="navigation">
   <% if @action_name != 'published' then %>
     <%= list_item 'Home Page', {:action => 'show', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
     <%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %> | 
-    <%= list_item 'Recently Revised', {:action =>'recently_revised'}, 
-                  'Pages sorted by when they were last changed', 'U' 
-    %> |
+    <%= list_item 'Recently Revised', {:action =>'recently_revised'}, 'Pages sorted by when they were last changed', 'U' %> |
     <%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %> | 
     <%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %> | 
-    <%= list_item 'Export', {:action => 'export'}, 
-                  'Download a zip with all the pages in this wiki', 'X' 
-    %> |
-    <input type="text" id="searchField" name="query" style="font-size: 10px" value="Search" 
-           onfocus="if (this.value == 'Search' ) this.value = '' " />
+    <%= 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'}) %>
+      <input type="text" id="searchField" name="query" value="Search"
+             onfocus="this.value == 'Search' ? this.value = '' : true"
+             onblur="this.value == '' ? this.value = 'Search' : true" />
+    <%= end_form_tag %>
   <% else %>
   	<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> | 
   <% end%>
-
-<%= end_form_tag %>
+</div>
\ No newline at end of file
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 0da5eb6f..0c5bb596 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -4,7 +4,7 @@
   @hide_navigation = true
 %>
 
-<div id="MarkupHelp" style="float: right; width: 250px; margin-top: 5px">
+<div id="MarkupHelp">
   <%= render("#{@web.markup}_help") %>
   <%= render 'wiki_words_help' %>
 </div>
@@ -14,7 +14,7 @@
 %>
 
 <p>
-    <textarea name="content" id="content" style="width: 450px; height: 500px"><%= h(@flash[:content] || @page.content) %></textarea>
+    <textarea name="content" id="content" style="width: 70%; height: 500px"><%= h(@flash[:content] || @page.content) %></textarea>
 </p>
 <p>
     <input type="submit" value="Submit" accesskey="s"/> as