diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css b/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css
index 69f90f755f..c3d4b3951d 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css
+++ b/koha-tmpl/opac-tmpl/ccsr/en/css/colors.css
@@ -60,7 +60,6 @@ a:hover {
     background: none;
     border: none;
     display: table;
-    margin: 40px 0 0 !important;
     padding: 0.7em 0 0 0.5em;
     width: 100%;
 }
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
index 9f9979ccad..5c01112562 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
@@ -1,6 +1,10 @@
 @import url("../../../lib/yui/reset-fonts-grids.css");
 @import url("../../../lib/yui/skin.css");
 
+#doc3 {
+    padding-top: 35px;
+}
+
 a {
       font-weight : bold;
 }
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
index 0069f748d9..4eb56c83b9 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
@@ -1,79 +1,5 @@
 <div id="header-wrapper">
 
-<div id="top-bar">
-<ul id="menu-left">
-    <!-- [% IF ( opacbookbag ) %] -->
-        <li>
-            <span id="cmspan"></span>
-            <div id="cartDetails">Your cart is empty.</div>
-        </li>
-    <!-- [% END %] -->
-
-    [% IF ( virtualshelves ) %]
-
-    <li id="listsmenulink">
-        <a href="/cgi-bin/koha/opac-shelves.pl"  class="">
-            <span>Lists</span>
-        </a>
-    <div id="listsmenu" class="yuimenu" style="display: none">
-        <h4>Public lists</h4>
-            [% IF ( pubshelves ) %]
-                <ul class="first-of-type">
-                [% FOREACH pubshelvesloo IN pubshelvesloop %]
-                <li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% pubshelvesloo.shelfnumber %]&amp;sortfield=[% pubshelvesloo.sortfield %]">[% pubshelvesloo.shelfname |html %]</a></li>
-                [% END %]
-                <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">[View All]</a></li>
-            </ul>
-            [% ELSE %]
-            No public lists
-            [% END %]
-      [% IF ( opacuserlogin ) %]
-        <h4>Your lists</h4>
-        [% IF ( loggedinusername ) %]
-            [% IF ( barshelves ) %]
-                <ul class="first-of-type">
-                [% FOREACH barshelvesloo IN barshelvesloop %]
-                <li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% barshelvesloo.shelfnumber %]&amp;sortfield=[% barshelvesloo.sortfield %]">[% barshelvesloo.shelfname |html %]</a></li>
-                [% END %]
-            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[View all]</a></li>
-            </ul>
-            [% ELSE %]
-                <ul class="first-of-type">
-            <li>No private lists</li>
-            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[New list]</a></li></ul>
-            [% END %]
-        [% ELSE %]
-            <ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to create your own lists</a></li></ul>
-        [% END %]
-      [% END %]
-    </div><!-- /listmenu /virtualshelves -->
-[% END %]
-<div id="listsDetails"></div>
-
-</li>
-</ul>
-
-    <div id="members">
-      [% IF ( opacuserlogin ) %]
-        <ul>
-    [% UNLESS ( loggedinusername ) %]
-                   <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>[% END %]
-                [% IF ( loggedinusername ) %]
-                    <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></span></li>
-
-                [% END %]
-                [% IF ( ShowOpacRecentSearchLink ) %]
-                    <li><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a></li>
-                [% END %]
- [% IF ( loggedinusername ) %]<li>[% IF persona %]<a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'>[% ELSE %]<a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">[% END %]Log Out</a></li>[% END %]
-        </ul>
-      [% END %]
-    </div>
-
-    <div class="clear"></div>
-
-</div>
-
 <div id="opac-custom-header">
 [% IF ( opacheader ) %]
     [% opacheader %]
@@ -211,7 +137,6 @@
 
 
     <input type="submit" value="Go" id="searchsubmit" class="left" />
-[% IF ( opacbookbag ) %]<span id="cmspan"></span>[% END %]
 
     <div class="clear"></div>
 
@@ -259,7 +184,6 @@
 
 
     <input type="submit" value="Go" id="searchsubmit" class="left transparent" disabled="disabled" />
-[% IF ( opacbookbag ) %]<span id="cmspan"></span>[% END %]
 
     <div class="clear"></div>
 
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
index a0eb3f4164..4b4e456f7f 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
@@ -13,6 +13,13 @@
 </div>
 </div>
 
+[%# Sticking the div for the top bar here; since the
+    top bar is positioned absolutely in this theme, it
+    it makes the positioning of the rest of the elements
+    easier to keep it out of the doc3 div.
+%]
+[% INCLUDE 'top-bar.inc' %]
+
 <div id="main_footer">
     <div class="colleft">
     </div>
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
new file mode 100644
index 0000000000..42d9576b39
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
@@ -0,0 +1,73 @@
+<div id="top-bar">
+<ul id="menu-left">
+    <!-- [% IF ( opacbookbag ) %] -->
+        <li>
+            <span id="cmspan"></span>
+            <div id="cartDetails">Your cart is empty.</div>
+        </li>
+    <!-- [% END %] -->
+
+    [% IF ( virtualshelves ) %]
+
+    <li id="listsmenulink">
+        <a href="/cgi-bin/koha/opac-shelves.pl"  class="">
+            <span>Lists</span>
+        </a>
+    <div id="listsmenu" class="yuimenu" style="display: none">
+        <h4>Public lists</h4>
+            [% IF ( pubshelves ) %]
+                <ul class="first-of-type">
+                [% FOREACH pubshelvesloo IN pubshelvesloop %]
+                <li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% pubshelvesloo.shelfnumber %]&amp;sortfield=[% pubshelvesloo.sortfield %]">[% pubshelvesloo.shelfname |html %]</a></li>
+                [% END %]
+                <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">[View All]</a></li>
+            </ul>
+            [% ELSE %]
+            No public lists
+            [% END %]
+      [% IF ( opacuserlogin ) %]
+        <h4>Your lists</h4>
+        [% IF ( loggedinusername ) %]
+            [% IF ( barshelves ) %]
+                <ul class="first-of-type">
+                [% FOREACH barshelvesloo IN barshelvesloop %]
+                <li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% barshelvesloo.shelfnumber %]&amp;sortfield=[% barshelvesloo.sortfield %]">[% barshelvesloo.shelfname |html %]</a></li>
+                [% END %]
+            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[View all]</a></li>
+            </ul>
+            [% ELSE %]
+                <ul class="first-of-type">
+            <li>No private lists</li>
+            <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[New list]</a></li></ul>
+            [% END %]
+        [% ELSE %]
+            <ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to create your own lists</a></li></ul>
+        [% END %]
+      [% END %]
+    </div><!-- /listmenu /virtualshelves -->
+[% END %]
+<div id="listsDetails"></div>
+
+</li>
+</ul>
+
+    <div id="members">
+      [% IF ( opacuserlogin ) %]
+        <ul>
+    [% UNLESS ( loggedinusername ) %]
+                   <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>[% END %]
+                [% IF ( loggedinusername ) %]
+                    <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></span></li>
+
+                [% END %]
+                [% IF ( ShowOpacRecentSearchLink ) %]
+                    <li><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a></li>
+                [% END %]
+ [% IF ( loggedinusername ) %]<li>[% IF persona %]<a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'>[% ELSE %]<a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">[% END %]Log Out</a></li>[% END %]
+        </ul>
+      [% END %]
+    </div>
+
+    <div class="clear"></div>
+
+</div>