diff --git a/koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl
index 83c6d58459..4e31feec56 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl
@@ -4,7 +4,7 @@
 <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
 <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
 <h2>Select bookshelf</h2>
-<form>
+<form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="get">
 	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
 <h2>or add to a new bookshelf</h2>
 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
index 2863d680d3..4562afdf49 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
@@ -1,10 +1,10 @@
 <!-- TMPL_INCLUDE NAME="opac-basket-top.inc" -->
 <!-- TMPL_IF NAME="print_basket" -->
-<body onload='print()' style="padding-bottom:20px;">
+<body onload="print();" style="padding-bottom:20px;">
 <!-- TMPL_ELSE -->
 <body style="padding-bottom:20px;">
 <!-- TMPL_INCLUDE NAME="opac-basket-menu.inc" -->
-<form name='myform'><input type='hidden' name='records'></form>
+<form name="myform"><input type="hidden" name="records"></form>
 <!-- /TMPL_IF -->
 <div id="mainbloc" style="margin-top:10px;margin-bottom:20px;padding-top:10px;padding-bottom:10px;">
 <!-- TMPL_IF NAME="verbose" -->
@@ -111,8 +111,8 @@
 			</tr>
 		<!-- /TMPL_IF -->
 				<tr>
-					<th>location</th>
-					<th>barcode</th>
+					<th>Location</th>
+					<th>Barcode</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 					<tr>
@@ -134,7 +134,7 @@
 		<tr align='center'>
 			<!-- TMPL_UNLESS NAME="print_basket" -->
 			<td style="border:0;">
-				<form>&nbsp;<input type='checkbox' value='<!-- TMPL_VAR NAME="biblionumber" -->' onClick='selRecord(value,checked)'>&nbsp;</form>
+				<form><input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" onClick="selRecord(value,checked);"></form>
 			</td>
 			<!-- /TMPL_UNLESS -->
 			<td style="border:0;width:95%;">
@@ -148,10 +148,10 @@
 				<tr valign="top">
 					<td>
 						<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="subtitle" --><b>subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="additional" --><b>Additional authors:</b><!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="publishercode" --><b>published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
 						<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
@@ -168,8 +168,8 @@
 					</td>
 				</tr>
 				<tr>
-					<th>location</th>
-					<th>barcode</th>
+					<th>Location</th>
+					<th>Barcode</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 					<tr>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl
index d446de405e..0c2b2c7eda 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl
@@ -1,24 +1,24 @@
 <!-- TMPL_INCLUDE Name="opac-top.inc" -->
 <div id="mainbloc">
 <!-- TMPL_IF Name="viewshelf" -->
-	<form>
+	<form action="/cgi-bin/koha/opac-shelves.pl" method="get">
 		<h1><!-- TMPL_VAR NAME="shelfname" --></h1>
 
 		<div>
 		<h2>Shelf content</h2>
 			<table class="small">
 				<tr colspan="4">
-					<th>delete</th>
-					<th>barcode</th>
-					<th>title</th>
+					<th><!-- TMPL_IF name="manageshelf" -->Delete<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></th>
+					<th>Barcode</th>
+					<th>Title</th>
 					<th>Author</th>
 				</tr>
 				<!-- TMPL_LOOP Name="itemsloop" -->
 					<tr>
-						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
-						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
-						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
-						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
+						<td><!-- TMPL_IF name="manageshelf" --><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+						<td><!-- TMPL_VAR NAME="barcode" --></td>
+						<td><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+						<td><!-- TMPL_VAR NAME="author" --></td>
 					</tr>
 				<!-- /TMPL_LOOP -->
 			</table>
@@ -34,7 +34,7 @@
 
 	<!-- TMPL_IF name="manageshelf" -->
 	<div class="bloc20">
-		<form>
+		<form action="/cgi-bin/koha/opac-shelves.pl" method="get">
 		<h2>Add a book by barcode</h2>
 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
 			<input type="hidden" name="modifyshelfcontents" value="1">
@@ -59,7 +59,7 @@
 		<!-- /TMPL_LOOP -->
 		<div class="bloc20">
 					<h2>Select Shelves to Delete</h2>
-					<form method="post">
+					<form action="/cgi-bin/koha/opac-shelves.pl" method="post">
 					<input type="hidden" name="shelves" value="1">
 						<!-- TMPL_LOOP Name="shelvesloop" -->
 						<!-- TMPL_IF name="canmanage" -->
@@ -77,7 +77,7 @@
 					</form>
 		</div>
 		<div id="bloc60">
-			<form method="post">
+			<form action="/cgi-bin/koha/opac-shelves.pl" method="post">
 				<input type="hidden" name="shelves" value="1">
 				<h2>Add Shelf</h2>
 				<p><label>Name</label><input type="text" name="addshelf" size="25"></p>
@@ -111,13 +111,13 @@
 					<th>Modify</th>
 				</tr>
 				<!-- TMPL_LOOP Name="shelvesloop" -->
-				<tr>
-					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
+				<!-- TMPL_IF NAME="color" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+					<td>
 						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
 							<!-- TMPL_VAR NAME="shelfname" -->
 						</a>
 					</td>
-					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
+					<td>
 						<!-- TMPL_IF NAME="category1" -->
 							Private
 						<!-- /TMPL_IF -->
@@ -128,15 +128,15 @@
 							Free
 						<!-- /TMPL_IF -->
 					</td>
-					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
+					<td>
 						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
 					</td>
-					<!-- TMPL_IF name="mine" -->
-						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
-							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
-							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
+					
+						<td>
+							<!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
+							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
 						</td>
-					<!-- /TMPL_IF -->
+					
 				</tr>
 				<!-- /TMPL_LOOP -->
 			</table>
@@ -149,7 +149,7 @@
 
 <!-- TMPL_IF name="edit" -->
 	<div class="bloc20">
-		<form method="post">
+		<form action="/cgi-bin/koha/opac-shelves.pl" method="post">
 			<input type="hidden" name="op" value="modifsave">
 			<h2>Modify shelf</h2>
 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl
index fd1c7b5ea3..dec7e1daa4 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl
@@ -4,17 +4,17 @@
 	<h1>Enter a new suggestion</h1>
 	<p>Fill this form to suggest the library a new acquisition. You will be mailed when the library treats you suggestion</p>
 	<p>No fields are mandatory. Fill whatever you know. The "Note" field can be used for whatever you want</p>
-	<form>
+	<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
 		<input type="hidden" name="op" value="add_confirm">
-		<p><label>Title</label><input type="text" name="title" size=60 maxlentgh=80></p>
-		<p><label>Author</label><input type="text" name="author" size=60 maxlength=80></p>
-		<p><label>Copyright date</label><input type="text" name="copyrightdate" size="5" maxlength="4"></p>
-		<p><label>Publisher</label><input type="text" name="publishercode" size="60" maxlength="80"></p>
-		<p><label>Volume</label><input type="text" name="volumedesc" size="60" maxlength="80"></p>
-		<p><label>Publication year</label><input type="text" name="publicationyear" size="5" maxlength="4"></p>
-		<p><label>Publication place</label><input type="text" name="place" size="60" maxlength="80"></p>
-		<p><label>ISBN/ISSN</label><input type="text" name="isbn" size="14" maxlength="10"></p>
-		<p><label>Note</label><textarea name="note" rows="10" cols="60"></textarea></p>
+		<p><label for="stitle">Title</label><input type="text" name="title" id="stitle" size="60" maxlength="80"></p>
+		<p><label for="author">Author</label><input type="text" name="author" id="author" size="60" maxlength="80"></p>
+		<p><label for="copyrightdate">Copyright date</label><input type="text" name="copyrightdate" id="copyrightdate" size="5" maxlength="4"></p>
+		<p><label for="publishercode">Publisher</label><input type="text" name="publishercode" id="publishercode" size="60" maxlength="80"></p>
+		<p><label for="volumedesc">Volume</label><input type="text" name="volumedesc" id="volumedesc" size="60" maxlength="80"></p>
+		<p><label for="publicationyear">Publication year</label><input type="text" name="publicationyear" id="publicationyear" size="5" maxlength="4"></p>
+		<p><label for="place">Publication place</label><input type="text" name="place" id="place" size="60" maxlength="80"></p>
+		<p><label for="isbn">ISBN/ISSN</label><input type="text" name="isbn" id="isbn" size="14" maxlength="10"></p>
+		<p><label for="note">Note</label><textarea name="note" id="note" rows="10" cols="60"></textarea></p>
 		<p><label>&nbsp;</label><input type="submit" value="Send suggestion to the library staff" class="button"></p>
 	</form>
 <!-- /TMPL_IF -->
@@ -34,7 +34,7 @@
 			<th>Note</th>
 		</tr>
 		<tr>
-			<form>
+			<form action="/cgi-bin/koha/opac-suggestions.pl" method="get">
 				<th>
 					Filter on
 				</th>
@@ -82,8 +82,8 @@
 				</th>
 				<th>
 					<select name="suggestedbyme">
-						<option value="1" <!-- TMPL_IF name="suggestedbyme" -->selected<!-- /TMPL_IF -->>Me</option>
-						<option value="0" <!-- TMPL_UNLESS name="suggestedbyme" -->selected<!-- /TMPL_UNLESS -->>Anybody</option>
+						<!-- TMPL_IF NAME="suggestedbyme" --><option value="1" selected="selected"><!-- TMPL_ELSE --><option value="1"><!-- /TMPL_IF -->Me</option>
+						<!-- TMPL_UNLESS name="suggestedbyme" --><option value="0" selected="selected"><!-- TMPL_ELSE --><option value="0"><!-- /TMPL_UNLESS -->Anybody</option>
 					</select>
 				</th>
 				<th>
@@ -94,39 +94,39 @@
 				</th>
 			</form>
 		</tr>
-		<form>
+		<form action="/cgi-bin/koha/opac-suggestions.pl" method="get">
 			<input type="hidden" name="op" value="delete_confirm">
 		<!-- TMPL_LOOP NAME="suggestions_loop" -->
-			<tr>
+			<!-- TMPL_IF NAME="even" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 				<td>
 					<input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionid" -->">
 				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<td>
 					<!-- TMPL_VAR NAME="title" -->
 				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<td>
 					<!-- TMPL_VAR NAME="author" -->
 				</td>
-				<td align="center"<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+				<td align="center">
 					<!-- TMPL_VAR NAME="copyrightdate" -->
 				</td>
-				<td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
+				<td align="center">
 					<!-- TMPL_VAR name="publishercode" -->
 				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<td>
 					<!-- TMPL_IF name="ASKED" -->Asked<!-- /TMPL_IF -->
 					<!-- TMPL_IF name="ACCEPTED" -->Accepted, will be ordered soon<!-- /TMPL_IF -->
 					<!-- TMPL_IF name="ORDERED" -->Ordered by the library<!-- /TMPL_IF -->
 					<!-- TMPL_IF name="REJECTED" -->Suggestion rejected : won't be buy<!-- /TMPL_IF -->
 					<!-- TMPL_IF name="AVAILABLE" -->Received by the library<!-- /TMPL_IF -->
 				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<td>
 					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
 				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<td>
 					<!-- TMPL_VAR name="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
 				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<td>
 					<!-- TMPL_VAR name="note" -->
 				</td>
 			</tr>
@@ -149,7 +149,7 @@
 	<form>
 		<input type="hidden" name="op" value="add">
 		<input type="submit" class="button" value="Enter a new suggestion">
-	<br />
+	</form>
 	<p>Note : if you ask suggestion done by anybody, the result will contain only new suggestions. Suggestions treated by a librarian will not be shown.</p>
 <!-- /TMPL_IF -->
 </div>