diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 6e7ccb26bd..0edd75f570 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1,4 +1,4 @@
-@import url("/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css");  
+@import url("/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css");
 
 a {
 	font-weight : bold;
@@ -189,7 +189,6 @@ table {
 	margin : 1em 0;
 	border-right : 1px solid #dddddd;
 	border-top : 1px solid #dddddd;
-	width : 100%;
 }
 
 td,th {
@@ -445,6 +444,7 @@ a .term {
 
 #opac-main-search form {
 	display : inline;
+	padding-right : 1em;
 }
 
 #opac-main-search label {
@@ -599,6 +599,11 @@ fieldset.brief {
 	border : 1px solid #E8E8E8;
 }
 
+fieldset.brief legend {
+	font-weight : bold;
+	font-size : 100%;
+}
+
 fieldset.brief label {
 	display : block;
 	font-weight : bold;
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index e8a77e0342..3bd8f9c893 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -10,8 +10,6 @@
 <!-- TMPL_ELSE -->
     <!-- TMPL_IF name="opaccolorstylesheet" -->
         <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
-    <!-- TMPL_ELSE -->
-        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/opac.css" />
     <!-- /TMPL_IF -->
     <style type="text/css">
         @import url(<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index a043e269d5..cf9ace365c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -13,7 +13,7 @@
                 </a>
             </li>
             <!-- /TMPL_IF -->          
-	<!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></span></li><li><a class="logout" href="/cgi-bin/koha/opac-logout.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF -->
+	<!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></span></li><li><a class="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF -->
 	</ul>	
 </div>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index db3a0a4f7b..6a287edbed 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -4,15 +4,6 @@
             <!-- TMPL_VAR NAME="OpacNav" -->
             <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
             <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
-			 
-            <!-- TMPL_IF NAME="loggedinusername" -->
-                <!-- TMPL_IF name="virtualshelves" -->
-                    <li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
-                <!-- /TMPL_IF -->
-                <!-- TMPL_IF name="suggestion" -->
-                    <li><a href="opac-suggestions.pl">Suggestions</a></li>
-                <!-- /TMPL_IF -->
-            <!-- /TMPL_IF -->
             <li>Browse catalogue: <ul> <!-- TMPL_IF name="OpacBrowser" -->
                 <li><a href="/cgi-bin/koha/opac-browser.pl">by hierarchy</a></li>
             <!-- /TMPL_IF -->
@@ -25,6 +16,8 @@
             <!-- TMPL_IF name="OpacCloud" -->
                 <li><a href="/cgi-bin/koha/opac-tags_subject.pl">by cloud</a></li>
             <!-- /TMPL_IF --></ul></li>
+			<!-- TMPL_IF name="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">lists</a></li><!-- /TMPL_IF -->
+        		<!-- TMPL_IF name="suggestion" --><!-- TMPL_IF NAME="AnonSuggestions" --><li><a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
             </ul>
             
  </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
index b65560b868..9bebcd7979 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -1,6 +1,6 @@
-</div>
-<!-- TMPL_IF NAME="opaccredits" -->
 
+<!-- TMPL_IF NAME="opaccredits" -->
+	<div class="ft">
         <!-- TMPL_VAR NAME="opaccredits" -->
     </div>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index ada3fd0c7b..10a106653f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -1,11 +1,10 @@
-<div id="usermenu">
+<!-- TMPL_IF NAME="loggedinusername" --><div id="usermenu">
         	<ul>
         		<li><a href="/cgi-bin/koha/opac-user.pl">my summary</a></li>
         		<li><a href="/cgi-bin/koha/opac-account.pl">my fines</a></li>
         		<li><a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a></li>
-        		<li><!-- TMPL_IF NAME="OpacPasswordChange" --><a href="/cgi-bin/koha/opac-passwd.pl">change my password</a><!-- /TMPL_IF --></li>
-        		<li><!-- TMPL_IF NAME="opacreadinghistory" --><a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF --></li>
-        		<li><!-- TMPL_IF name="virtualshelves" --><a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a><!-- /TMPL_IF --></li>
-        		<li><!-- TMPL_IF name="suggestion" --><a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li>
+        		<!-- TMPL_IF NAME="OpacPasswordChange" --><li><a href="/cgi-bin/koha/opac-passwd.pl">change my password</a></li><!-- /TMPL_IF -->
+        		<!-- TMPL_IF NAME="opacreadinghistory" --><li><a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a></li><!-- /TMPL_IF -->
+        		<!-- TMPL_IF name="suggestion" --><!-- TMPL_UNLESS NAME="AnonSuggestions" --><li><a href="/cgi-bin/koha/opac-suggestions.pl">my purchase suggestions</a></li><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
         	</ul>
-</div>
+</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
index 58ba21dbfd..0e04d3e19f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
@@ -10,7 +10,6 @@
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-ge">
     <div class="yui-u first">
-	<!-- YOUR DATA GOES HERE -->
 	<!-- TMPL_IF name="koha_news_count" -->
 <div id="news">
     <table>
@@ -95,26 +94,22 @@
 
 	    </div>
     <div class="yui-u">
-	<!-- YOUR DATA GOES HERE -->
-	Right column.
 	
 	<!-- TMPL_IF NAME="opacuserlogin" -->
 <div id="login">
-    <!-- TMPL_IF NAME="loggedinusername" -->
-        <a href="/cgi-bin/koha/opac-user.pl"><b>User Info</b></a>
-        <p>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></p>
-        <p><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Log Out</a></p>
-    <!-- TMPL_ELSE -->
-        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
-            <p>Login:</p>
-            <input type="text" id="userid" size="10" name="userid" />
-            <p>Pass:</p>
-            <input type="password" id="password" size="10" name="password" />
-            <p>
-                <input type="submit" value="Log In" class="submit" />
-            </p>
-       </form>
-    <!-- /TMPL_IF -->
+    <!-- TMPL_UNLESS NAME="loggedinusername" -->
+	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
+	<fieldset class="brief">
+		<legend>Log in to Your Account:</legend>
+		<ol>
+		<li><label for="userid">Login:</label><input type="text" id="userid" size="10" name="userid" /></li>
+		<li><label for="password">Password:</label><input type="password" id="password" size="10" name="password" /></li>
+		</ol></fieldset>
+	 <fieldset class="action">
+	 <input type="submit" value="Log In" class="submit" />
+	 </fieldset>
+	 </form>
+    <!-- /TMPL_UNLESS -->
 </div>
 <!-- /TMPL_IF -->
 	    </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index ff7ed49a48..4706801c26 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -17,14 +17,14 @@
     <p>Fill this form to suggest the library a new acquisition. You will be emailed when the library processes your purchase suggestion</p>
     <p>No fields are mandatory. Enter whatever information you have. The "Notes" field can be used to provide any additional information.</p>
     <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
-    <table>
-    <tr><th scope="row"><label for="">Summary</label></th><td><input type="text" id="title" name="title" size="50" maxlentgh="80" /></td></tr>
-    <tr><th scope="row"><label for="">Author</label></th><td><input type="text" id="author" name="author" size="50" maxlength="80" /></td></tr>
-    <tr><th scope="row"><label for="">Copyright date</label></th><td><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></td></tr>
-    <tr><th scope="row"><label for="">Publisher</label></th><td><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></td></tr>
-    <tr><th scope="row"><label for="">Notes</label></th><td><textarea name="note" id="note" rows="5" cols="40"></textarea></td></tr>
-    </table>
-        <p><input type="hidden" name="op" value="add_confirm" /><input type="submit" value="Submit Your Suggestion" /></p>
+   <fieldset class="rows"> <ol>
+    <li><label for="title">Summary:</label><input type="text" id="title" name="title" size="50" maxlentgh="80" /></li>
+    <li><label for="author">Author:</label><input type="text" id="author" name="author" size="50" maxlength="80" /></li>
+    <li><label for="copyrightdate">Copyright date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></li>
+    <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></li>
+    <li><label for="note">Notes:</label><textarea name="note" id="note" rows="5" cols="40"></textarea></li>
+    </ol></fieldset>
+        <fieldset class="action"><input type="hidden" name="op" value="add_confirm" /><input type="submit" value="Submit Your Suggestion" /> <a class="action" href="/cgi-bin/koha/opac-suggestions.pl">Cancel</a></fieldset>
     </form>
 
 <!-- /TMPL_IF -->
@@ -32,8 +32,34 @@
 <!-- TMPL_IF name="op_else" -->
     <h1>Purchase Suggestions</h1>
     <!-- TMPL_IF NAME="suggestions_loop" -->
+            <form action="/cgi-bin/koha/opac-suggestions.pl" method="get">
     <table>
         <tr>
+                <th>
+                    Search for:
+                </th>
+                <td>
+                    <input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" />
+                </td>
+                <th>
+                Suggested by:
+                </th>
+                <td>
+                    <select name="suggestedbyme">
+                        <option value="0">Anyone</option>
+                        <option value="1">Me</option>
+                    </select>
+                </td>
+                <th>
+                    <input type="submit" value="Set Filter" />
+                </th>
+        </tr>
+		</table>
+            </form>
+        <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
+            <input type="hidden" name="op" value="delete_confirm" />
+			<table>
+			<tr>
             <th>&nbsp;</th>
             <th>Summary</th>
             <th>Status</th>
@@ -41,33 +67,6 @@
             <th>Managed by</th>
             <th>Note</th>
         </tr>
-        <tr>
-            <form action="/cgi-bin/koha/opac-suggestions.pl" method="get">
-                <th>
-                    Filter by:
-                </th>
-                <td>
-                    <input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" />
-                </td>
-                <td>
-                &nbsp;
-                </td>
-                <td>
-                    <select name="suggestedbyme">
-                        <option value="0">Anyone</option>
-                        <option value="1">Me</option>
-                    </select>
-                </td>
-                <td>
-                    &nbsp;
-                </td>
-                <td>
-                    <input type="submit" value="Set Filter" />
-                </td>
-            </form>
-        </tr>
-        <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
-            <input type="hidden" name="op" value="delete_confirm" />
         <!-- TMPL_LOOP NAME="suggestions_loop" -->
             <!-- TMPL_IF name="even" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
                 <td>
@@ -104,13 +103,11 @@
                 <input type="submit" value="Delete Checked Items" />
             </td>
         </tr>
-        </form>
     </table>
-    <!-- TMPL_ELSE --><div class="content-block">There are no pending purchase suggestions</div><!-- /TMPL_IF -->
-    <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
-        <input type="hidden" name="op" value="add" />
-        <input type="submit" value="Enter a new purchase suggestion" />
-    </form>
+        </form>
+    <!-- TMPL_ELSE --><p>There are no pending purchase suggestions.</p><!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="loggedinusername" --><a href="/cgi-bin/koha/opac-suggestions.pl?op=add">Add a purchase suggestion</a><!-- TMPL_ELSE --><!-- TMPL_IF NAME="AnonSuggestions" --><a href="/cgi-bin/koha/opac-suggestions.pl?op=add">Add a purchase suggestion</a><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 </div>