diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
index 88b3ff851e..af6e886b42 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/doc-head-close.inc
@@ -27,8 +27,8 @@
 [% IF ( bidi ) %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
 [% END %]
-[% IF ( OPACMobileUserCSS ) %]<style type="text/css" media="screen and (max-width:700px)">[% OPACMobileUserCSS %]</style>[% END %]
-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
+<style id="region-opacmobileusercss" type="text/css" media="screen and (max-width:700px)">[% OPACMobileUserCSS %]</style>
+<style id="region-opacusercss" type="text/css">[% OPACUserCSS %]</style>
 [% IF persona %]
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/persona-buttons.css" />
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
index b85a427852..eba9b78b62 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
@@ -239,11 +239,9 @@
     You did not specify any search criteria.
     [% END %]
 </p>
-[% IF ( OPACNoResultsFound ) %]
 <div id="noresultsfound">
 [% OPACNoResultsFound %]
 </div>
-[% END %]
 
 </div>
 [% END %]</p>[% END %]</div>
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc
index fe56488f53..c3c25e6ac9 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/navigation.inc
@@ -1,5 +1,9 @@
+<div id="region-opacnav">
+[% OpacNav %]
+</div>
 [% IF IsPatronPage %]
 [% INCLUDE usermenu.inc %]
 [% END %]
-[% OpacNav %]
+<div id="region-opacnavbottom">
 [% OpacNavBottom %]
+</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 4b4e456f7f..3f8bf66449 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/opac-bottom.inc
@@ -1,8 +1,6 @@
-[% IF ( opaccredits ) %]
-    <div class="ft">
-        [% opaccredits %]
-    </div>
-[% END %]
+<div class="ft">
+    [% opaccredits %]
+</div>
 </div>
 
 <div class="clear"></div>
@@ -82,8 +80,10 @@
 
 
 <script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jqtransform_select.js"></script>
+<script id="region-opacuserjs" type="text/javascript">
+    [% opacuserjs %]
+</script>
 <script type="text/javascript">
-[% IF ( opacuserjs ) %][% opacuserjs %][% END %]
 $(function() {
     //find all form with class jqtransform and apply the plugin
     $("form#searchform").jqTransform();
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 9311d5a1c5..66666f4cce 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
@@ -23,11 +23,11 @@
 [% IF persona %]
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/persona-buttons.css" />
 [% END %]
-[% IF ( OPACMobileUserCSS ) %]<style type="text/css" media="screen and (max-width:700px)">[% OPACMobileUserCSS %]</style>[% END %]
+<style id="region-opacmobileusercss" type="text/css" media="screen and (max-width:700px)">[% OPACMobileUserCSS %]</style>
 [% IF ( bidi ) %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
 [% END %]
-[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
+<style id="region-opacusercss" type="text/css">[% OPACUserCSS %]</style>
 <!-- yui js --> 
 <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
 <script type="text/javascript" src="[% yuipath %]/container/container-min.js"></script> 
@@ -94,8 +94,12 @@
 	[% IF ( SyndeticsCoverImages ) %]$(window).load(function() {
             verify_images();
          });[% END %]
-	[% IF ( opacuserjs ) %][% opacuserjs %][% END %]
-	//]]>
+    //]]>
+</script>
+<script id="region-opacuserjs" type="text/javascript">
+    [% opacuserjs %]
+</script>
+<script type="text/javascript">
 [% IF ( opacbookbag ) %]</script><script type="text/javascript" src="[% themelang %]/js/basket.js">
 [% ELSIF ( virtualshelves ) %]</script><script type="text/javascript" src="[% themelang %]/js/basket.js">
 [% ELSE %]</script><script type="text/javascript">var readCookie;[% END %]</script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 0af9d74996..79eb1a1b10 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -14,9 +14,9 @@
    	</ul>	
   [% END %]
 </div>
-  [% IF ( opacheader ) %]
-	[% opacheader %]
-  [% END %]
+<div id="region-opacheader">
+    [% opacheader %]
+</div>
 <div id="opac-main-search" class="yui-g">
    [% IF ( opacsmallimage ) %]
    <h1 id="libraryname" style="background-image: url('[% opacsmallimage %]');">
@@ -202,11 +202,9 @@
     You did not specify any search criteria.
     [% END %]
 </p>
-[% IF ( OPACNoResultsFound ) %]
 <div id="noresultsfound">
 [% OPACNoResultsFound %]
 </div>
-[% END %]
 
 </div>
 [% END %]</p>[% END %]</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index 9cd2c1279b..c3c25e6ac9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -1,6 +1,9 @@
+<div id="region-opacnav">
 [% OpacNav %]
+</div>
 [% IF IsPatronPage %]
 [% INCLUDE usermenu.inc %]
 [% END %]
+<div id="region-opacnavbottom">
 [% OpacNavBottom %]
-
+</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 70206732aa..ec17f80a4e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -1,8 +1,6 @@
-[% IF ( opaccredits ) %]
-	<div class="ft">
-            [% opaccredits %]
-        </div>
-[% END %]
+<div id="region-opaccredits" class="ft">
+    [% opaccredits %]
+</div>
 </div>
 
 [% IF ( opaclanguagesdisplay || OpacKohaUrl ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
index 5486b0c33e..48d39d3339 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -29,10 +29,7 @@
 [% END %]
 </ul>
 </div>
-[% IF ( OPACResultsSidebar ) %]
 <div id="opacresultssidebar">
-[% OPACResultsSidebar %]
 </div>
 [% END %]
 [% END %]
-[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
index 7403bb05fb..eb1e600464 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
@@ -37,8 +37,8 @@
     <div id="daily-quote" class="container"><h1>Quote of the Day</h1><div><span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span></div></div>
 [% END %]
 
-	[% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock" class="container">[% OpacMainUserBlock %]</div>[% END %]
- [% IF ( OpacMainUserBlockMobile ) %]<div id="opacmainuserblockmobile" class="container">[% OpacMainUserBlockMobile %]</div>[% END %]
+<div id="opacmainuserblock" class="container">[% OpacMainUserBlock %]</div>
+<div id="opacmainuserblockmobile" class="container">[% OpacMainUserBlockMobile %]</div>
 
 </div>
 		
@@ -69,7 +69,7 @@
     [% END %]
     [% END %]
     [% END %]
-    [% IF ( OpacNavRight ) %]<div id="opacrightsidebar" class="container">[% OpacNavRight %]</div>[% END %]
+    <div id="opacrightsidebar" class="container">[% OpacNavRight %]</div>
     </div>
     [% END %]
 </div>