diff --git a/koha-tmpl/opac-tmpl/prog/en/css/print.css b/koha-tmpl/opac-tmpl/prog/en/css/print.css
index cae7ac833f..87c83b758a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/print.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/print.css
@@ -137,46 +137,10 @@ th:last-child {
 	padding : 5px 5px 5px 5px;
 }
 
-td.input, div.form td, div.details td {
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 0px;
-	border-right : 0px;
-	color : #000000;
-	line-height : 1.5em;
-	padding : 4px;
-	text-align : left;
-}
-
-td.label, div.form th, div.details th {
-	background-color : #FFF;
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 1px solid #CCCCCC;
-	border-right : 0px;
-	border-top : 0px;
-	color : #000088;
-	font-weight : bold;
-	line-height : 1.5em;
-	padding : 4px;
-	text-align : right;
-	vertical-align : top;
-}
-
 tr.highlight {
 	background-color: #CCCCCC;
 }
 
-.class {
-	font-weight : bold;
-}
-
-.cancel {
-	background-color : #993300;
-	color : #FFFFCC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 2px;
-}
-
 .error {
 	font-weight: bold;
 }
@@ -192,20 +156,20 @@ tr.highlight {
 	display : none;
 }
 
-.submit {
-	background-color : #669999;
-	color : #FFFFCC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 2px;
+#bookcover {
+	float:left;
+	margin:0pt;
+	padding:0pt;
 }
 
-#main {
-	background-color : #FFF;
-	border-left : 0px solid #CCCC99;
-	margin-left : 2%;
-	margin-right : 2%;
-	margin-top : 1%;
-	padding : 5px;
-	position : relative;
+#members,#opac-main-search,#opac-user-views .ui-tabs-nav,input,div.yui-b,h2 span.hint,td.resultscontrol,.pages,.suggestion,.views,#action,#export,#bibliodescriptions .ui-tabs-nav,#addshelf,fieldset.action {
+	display : none;
+}
+div#yui-main div.yui-b {
+	display : block;
+}
+
+div#userupdate input,div#userupdate textarea {
+	display : inline;
+	border : 0;
 }
\ No newline at end of file
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 f45c2d94ad..6c2f9a616e 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
@@ -16,6 +16,7 @@
 <!-- TMPL_IF name="opacstylesheet" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="opacstylesheet" -->" /><!-- TMPL_ELSE -->
 <!-- TMPL_IF name="opaccolorstylesheet" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" /><!-- /TMPL_IF -->
 <!-- TMPL_IF name="opaclayoutstylesheet" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->" /><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/opac.css" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR NAME="themelang" -->/css/print.css" />
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/jquery/plugins/ui.tabs.css" />
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/jquery.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/ui.tabs.js"></script>
@@ -32,8 +33,8 @@
     var MSG_NRECORDS_IN_BASKET = _("already in your cart");
     var MSG_NO_RECORD_SELECTED = _("No item was selected");
     var MSG_NO_RECORD_ADDED = _("No item was added to your cart");
-    var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty your cart?"
-    var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove the selected items?";<!-- /TMPL_IF -->
+    var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
+    var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="AmazonContent" -->$(window).load(function() {
 		 	verify_images();
 		 });<!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 2b8f04f5a7..4f961368eb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -218,24 +218,21 @@
     <!-- /TMPL_UNLESS --><!-- /viewshelf -->
 
     <!-- TMPL_IF NAME="showadd" -->
-		<div style="padding: 1.5em 0em;"><hr /></div>
-        <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
+        <div id="addshelf"><form method="post" action="/cgi-bin/koha/opac-shelves.pl">
+		<fieldset class="rows">
+		<legend>Create a New List</legend>
             <input type="hidden" name="shelves" value="1" />
-            <div class="form">
-            <table>
-            <caption>Create a New List</caption>
-            <tr><th><label for="addshelf">List Name:</label> </th><td> 
+            <ol><li><label for="addshelf">List Name:</label>
 				<!-- TMPL_IF NAME="already" -->
 				<input id="addshelf" type="text" name="addshelf" value="<!-- TMPL_VAR NAME="already" -->" size="60" />
 				<!-- TMPL_ELSE -->
 				<input id="addshelf" type="text" name="addshelf" size="60" />
 				<!-- /TMPL_IF -->
-				<input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" />
-			</td></tr>
-            </table>
-			</div>
-            <p><input type="hidden" name="category" value="1" /><input type="submit" value="Add New Shelf" class="icon add" /></p>
-        </form>    
+				<input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /></li>
+</ol>
+		</fieldset>
+            <fieldset class="action"><input type="hidden" name="category" value="1" /><input type="submit" value="Add New Shelf" class="submit" /></fieldset>
+        </form>    </div>
 	<!-- /TMPL_IF --><!-- /showadd -->
     </div>
    </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index afa1a0d6b0..4bf9c5e8c9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -127,7 +127,7 @@
 
     <div id="opac-user-checkouts"><!-- TMPL_IF NAME="issues_count" -->
         <table>
-        <caption><!-- TMPL_VAR NAME="issues_count" --> Items</caption>
+        <caption><!-- TMPL_VAR NAME="issues_count" --> Items Checked Out</caption>
         <!-- ISSUES TABLE ROWS --><tr>
 		<!-- TMPL_IF NAME="AmazonContent" --><th>&nbsp;</th><!-- /TMPL_IF -->
         <th>Title</th>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index a59c8c11f9..5983543a32 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -6,7 +6,7 @@
 <div id="doc3" class="yui-t1">
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b"><div class="yui-g" id="userupdate">
 
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
 
@@ -70,8 +70,8 @@
 	<li><label for="dateexpiry">Expires: </label><input type="text" id="dateexpiry" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="dateexpiry" -->" /></li>
 </ol>
 </fieldset>
-<p>Please make any necessary changes to your record.  Submitting the form will notify a library staff member, who will make the changes permanent.</p>
 <fieldset class="action">
+<p>Please make any necessary changes to your record.  Submitting the form will notify a library staff member, who will make the changes permanent.</p>
 <input type="submit" value="Submit Changes" /> <a class="cancel" href="/cgi-bin/koha/opac-user.pl">Cancel</a></fieldset>
 
 </div>