diff --git a/app/views/admin/create_system.rhtml b/app/views/admin/create_system.rhtml
index 4d318e63..77f8a316 100644
--- a/app/views/admin/create_system.rhtml
+++ b/app/views/admin/create_system.rhtml
@@ -6,7 +6,9 @@
   you'll need to do a brief one-time setup.
 </p>
 
-<form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">
+<%= form_tag({ :controller => 'admin', :action => 'create_system'},
+             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'return validateSetup()'})
+%>
 <ol class="setup">
   <li>
 
@@ -43,7 +45,7 @@
 <p align="right">
     <input type="submit" value="Setup" style="margin-left: 40px" />
 </p>
-</form>
+<%= end_form_tag %>
 
 <script>
 function proposeAddress() {
diff --git a/app/views/admin/create_web.rhtml b/app/views/admin/create_web.rhtml
index d37ffcee..e1e72b1d 100644
--- a/app/views/admin/create_web.rhtml
+++ b/app/views/admin/create_web.rhtml
@@ -5,8 +5,9 @@
   so different subjects or projects can write about different <i>MuppetShows</i>.
 </p>
 
-<form action="../create_web" id="setup" method="post" onSubmit="cleanAddress(); 
-      return validateSetup()">
+<%= form_tag({ :controller => 'admin', :action => 'create_web'},
+             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})
+%>
 
 <ol class="setup">
   <li>
@@ -35,7 +36,7 @@
   </small>
 </p>
 
-</form>
+<%= end_form_tag %>
 
 <script>
 function proposeAddress() {
diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index d50bde43..1affc010 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -1,7 +1,9 @@
 <% @title = "Edit Web" %>
 
-<form action="edit_web" id="setup" method="post" 
-      onSubmit="cleanAddress(); return validateEditWebForm()">
+<%= form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },
+             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})
+%>
+
   <h2 style="margin-bottom: 3px">Name and address</h2>
   <div class="help">
     The name of the web is included in the title on all pages. 
@@ -113,7 +115,7 @@ TODO Enable these input elements again after release 0.10
   </small>
 </p>
 
-</form>
+<%= end_form_tag %>
 
 <br/>
 <h1>Other administrative tasks</h1>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 8d0b48bc..2e09c88e 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -12,7 +12,7 @@
 </div>
 
 <%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name},
-             {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})
+             {'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()'})
 %>
 
 <p>
diff --git a/app/views/wiki/search.rhtml b/app/views/wiki/search.rhtml
index 675f12b8..2cab451d 100644
--- a/app/views/wiki/search.rhtml
+++ b/app/views/wiki/search.rhtml
@@ -24,7 +24,7 @@
 <% end %>
 
 <% if (@results + @title_results).empty? %>
-  <h2>No pages contains "<%= @params["query"] %>" </h2>
+  <h2>No pages contain "<%= @params["query"] %>" </h2>
   <p>
     Perhaps you should try expanding your query. Remember that Instiki searches for entire 
     phrases, so if you search for "all that jazz" it will not match pages that contain these