diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index d7fa51b450..31c53e131d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -1,4 +1,4 @@
-<div id="members">
+<div id="wrapper" style="background-color:#FFF;"><div id="members">
   <!-- TMPL_IF NAME="opacuserlogin" -->
 	<ul><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></a></span></li><li><a class="logout" id="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">Log in to Your Account</a></li><!-- /TMPL_IF -->
 	</ul>	
@@ -112,6 +112,7 @@
 	  </div>
 </div>
 <!-- /TMPL_IF -->
+</div>
 </div>
 	<div id="breadcrumbs" class="yui-g">
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 4cc358a1a6..85b989a94f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -11,7 +11,7 @@
 	<div class="yui-gc">
 <div class="yui-u first">
     <!-- TMPL_IF NAME="if_expanded_options_actually_worked" -->
-        <!-- TMPL_IF NAME="outer_servers_loop" -->
+       <div id="databases" class="container"> <!-- TMPL_IF NAME="outer_servers_loop" -->
             <!-- DATABASES -->
             
             <fieldset>
@@ -41,11 +41,11 @@
                             <!-- /TMPL_LOOP -->
                 </fieldset>
             <!-- /REMOTE DATABASES -->
-        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF --></div>
     <!-- /TMPL_IF -->
 
     <!-- BOOLEAN SEARCH OPTIONS -->
-    <fieldset>
+    <div id="booleansearch" class="container"><fieldset>
     <legend>Search for:</legend>
     <!-- TMPL_LOOP NAME="search_boxes_loop" -->
         <p>
@@ -188,9 +188,9 @@
         </p>
     <!-- /TMPL_LOOP -->
 
-    </fieldset>
+    </fieldset></div>
 <!-- /BOOLEAN SEARCH OPTIONS -->
-    <div id="advsearch-itemtype">
+    <div id="advsearch-itemtype" class="container">
     <h3>Itemtype limit to any of the following:</h3>
     <table>
         <tr>
@@ -229,7 +229,7 @@
         <!-- /BASIC LIMITS -->
 
         <!-- SUBTYPE LIMITS -->
-            <fieldset>
+            <div id="subtypes" class="container"><fieldset>
             <legend>Subtype limits</legend><select name="limit" class="subtype">
                 <option value="" selected="selected" class="menuheader">Any Audience</option>
                     <option value="aud:a">Easy</option>
@@ -288,20 +288,20 @@
                     <option value="ctype:z">Treaties </option>
                 </select>
     
-    </fieldset>
+    </fieldset></div>
     <!--/TMPL_IF -->
     <!--TMPL_IF Name="UNIMARC" -->
-        <!-- SUBTYPE LIMITS -->
-    <!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" -->
+        <div id="subtypes_unimarc" class="container"><!-- SUBTYPE LIMITS -->
+    <!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" --></div>
     <!--/TMPL_IF-->
 <!--/TMPL_IF-->
 </div>
         <div class="yui-u">
 <!-- AVAILABILITY LIMITS -->
-    <fieldset><legend>Location and availability: </legend>
+    <div id="location" class="container"><fieldset><legend>Location and availability: </legend>
         
         <select name="limit" id="branchloop" style="width: 20em;">
-        <option value="">All branches</option>
+        <option value="">All libraries</option>
         <!-- TMPL_LOOP NAME="branchloop" -->
         <!--TMPL_IF Name="selected"-->
         <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
@@ -313,14 +313,14 @@
         
         
         <div style="margin-top:.4em"><label for="available-items"><input type="checkbox" id="available-items" name="limit" value="available" /> Only items currently available</label></div>
-    </fieldset>
+    </fieldset></div>
 <!-- /AVAILABILITY LIMITS -->
 
 <!-- RANK LIMITS -->
-    <fieldset><legend>Sort by: </legend>
+    <div id="sortby" class="container"><fieldset><legend>Sort by: </legend>
         <select id="sort_by" name="sort_by" style="width:20em;">
 <!--TMPL_INCLUDE NAME="resort_form.inc" -->
-</select></fieldset>
+</select></fieldset></div>
 <!-- RANK LIMITS -->
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
index ef454392ac..a1a9db87c1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
@@ -12,7 +12,7 @@
 <div id="doc" class="yui-t7">
    <div id="bd">
 	<div id="yui-g">
-
+<div id="auth" class="container">
 <!--CONTENT-->
 <!-- TMPL_IF NAME="opacuserlogin" -->
 <!-- TMPL_IF NAME="loginprompt" -->
@@ -63,7 +63,7 @@
           <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
   <li>Use top menu bar to navigate to another part of Koha.</li>
 </ul>
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --></div>
 </div>
 </div>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index e42ff80194..d28603b9ff 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -38,7 +38,7 @@
 <!-- TMPL_IF NAME="print_basket" --><body id="basket" onload="print();history.back();"><!-- TMPL_ELSE --><body id="basket"><!-- /TMPL_IF -->
 
 <div id="doc" class="yui-t7">
-
+<div class="container">
 <!-- TMPL_UNLESS NAME="print_basket" -->
 <h1>Your Cart</h1>
 
@@ -242,6 +242,7 @@
 </form>
 <!-- /TMPL_IF -->
 
+</div>
 </div>
 </body>
 </html>
\ No newline at end of file
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 bf8373e12a..889867836e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
@@ -11,7 +11,7 @@
 	<div class="yui-b"><div class="yui-ge">
     <div class="yui-u first">
 	<!-- TMPL_IF name="koha_news_count" -->
-<div id="news">
+<div id="news" class="container">
     <table>
     <!-- TMPL_LOOP name="koha_news" -->
     <tr><th><!-- TMPL_VAR name="title" --></th></tr>
@@ -80,8 +80,8 @@
     <div class="yui-u">
 	
 	<!-- TMPL_IF NAME="opacuserlogin" -->
-<div id="login">
     <!-- TMPL_UNLESS NAME="loggedinusername" -->
+<div id="login" class="container">
 	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
 	<fieldset class="brief">
 		<legend>Log in to Your Account:</legend>
@@ -93,8 +93,8 @@
 	 </fieldset></fieldset>
 
 	 </form>
-    <!-- /TMPL_UNLESS -->
 </div>
+    <!-- /TMPL_UNLESS -->
 <!-- /TMPL_IF -->
 	    </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index ea62e2457b..f4eabd5f3b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -7,7 +7,7 @@
 <div id="doc" class="yui-t7">
    <div id="bd">
 	<div id="yui-g">
-
+<div id="holds" class="container">
 <!-- TMPL_IF NAME="message" -->
     <!-- TMPL_IF NAME="GNA" -->
     <div class="dialog alert">
@@ -220,6 +220,6 @@
 </form>
 
 <!-- /TMPL_IF -->
-</div>
+</div></div>
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 164728ce3b..f26ca14627 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -8,6 +8,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" --> Search RSS Feed" href="http://<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->&amp;format=rss2" />
 
+
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -143,7 +144,7 @@ $(document).ready(function(){
     </form>
 <!-- TMPL_ELSE -->
 
-    <div class="searchresults">
+    <div class="searchresults container">
 	<form action="/cgi-bin/koha/opac-search.pl" method="get" name="bookbag_form" id="bookbag_form">
 		<!-- TMPL_IF NAME="searchdesc" -->
 		<!-- TMPL_LOOP NAME="QUERY_INPUTS"-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
index 6ce3c9edd0..1f90ea97ed 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
@@ -9,7 +9,7 @@
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
 
-    <h1>Subject cloud</h1>
+   <div id="subjectcloud" class="container"> <h1>Subject cloud</h1>
     <p>This "cloud" show you the most used topics in our catalog. Click on any
 subject below to see the items in our collection.</p>
         <fieldset>
@@ -21,7 +21,7 @@ subject below to see the items in our collection.</p>
 
         <!-- TMPL_LOOP name="LOOP" -->
             <a href="/cgi-bin/koha/opac-search.pl?q=su:<!-- TMPL_VAR name="entry" ESCAPE="HTML" -->" style="font-size:<!-- TMPL_VAR name="weight" -->px;"><!-- TMPL_VAR name="entry" --></a>
-        <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP --></div>
 
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
index 895418159d..27ce389083 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
@@ -33,6 +33,7 @@ function Dopop(link) {
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
+	<div id="topissues" class="container">
     <!-- TMPL_IF NAME="results_loop" -->
     
         <table id="topissuest">
@@ -118,7 +119,7 @@ function Dopop(link) {
         <input type="submit" value="Submit" /></fieldset>
     </form>
    <!-- /TMPL_IF -->
-
+	</div>
 </div>
 </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 cc64ee6a7b..a2e5bb3604 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -54,7 +54,7 @@ $.tablesorter.addParser({
    <div id="bd">
     <div id="yui-main">
     <div class="yui-b"><div class="yui-g">
-
+	<div id="userdetails" class="container">
     <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
         <h2>Hello, <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> <span class="hint">(<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</span></h2>
         
@@ -339,7 +339,7 @@ No renewals left
     </div>
     <!-- /TMPL_IF -->
     </div><!-- /opac-user views -->
-    
+    </div><!-- /userdetails -->
 </div>
 </div>
 </div>