diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 0fe2548982..e54f273e85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -263,8 +263,9 @@ tr.highlight.onissue td {
 }
 
 caption {
-	font-size : 153.9%;
+	font-size : 133.9%;
 	font-weight : bold;
+	margin : .3em 0;
 }
 
 span.problem {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
index b86b6dc744..67574c6267 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl
@@ -16,17 +16,16 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Billing</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 <h1>Billing on 
    <!-- TMPL_VAR NAME="todaysdate" --> <br/>From <!-- TMPL_VAR NAME="from" -->
 	to <!-- TMPL_VAR NAME="to" --></h1>
 <div id="filters">
-<br />
 
 <form action="/cgi-bin/koha/circ/billing.pl" method="post" >
 <p>
@@ -166,10 +165,8 @@ Calendar.setup(
         <b>No items found.</b>
     <!-- /TMPL_IF -->
 </div>
+
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
index a0d5ab5b62..e629207fc0 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -8,18 +8,18 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Library Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 
 <h1>Circulation: Library Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></h1>
 
 <!-- selector of location -->
 <!-- TMPL_IF NAME="location" -->
-<legend>location selected</legend>
+<h4>location selected</h4>
 <form name="changelocation" action="branchoverdues.pl">
     <ul>
         <li>
@@ -29,9 +29,8 @@
     </ul>
 </form>
 <!-- TMPL_ELSE -->
-<p>Select a location
 <form name="selectlocation" action="branchoverdues.pl" method="post">
-    <select id="location" name="location">
+    <label for="location">Select a location: </label><select id="location" name="location">
         <option value="">All locations</option>
         <!-- TMPL_LOOP NAME="locationsloop" -->
             <option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
@@ -39,11 +38,10 @@
     </select>
     <input type="submit" name="location" class="button" value="OK" />
 </form>
-</p>
+
 <!-- /TMPL_IF -->
-    <form name="sendnotify" action="branchoverdues.pl" method="post">
     <!-- TMPL_IF name="overduesloop" -->
-        <table>
+        <table style="width:100%;">
         <tr>
             <th>Date_due</th>
             <th>Title</th>
@@ -119,9 +117,9 @@
         There is no overdue for today
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="todayoverduesloop" -->
-        <fieldset id="branch_odues_today_odues">
-        <legend>Today's notifications</legend>	
-            <table>
+        <div id="branch_odues_today_odues">
+            <table style="width:100%;">
+			<caption>Today's notifications</caption>
             <tr>
                 <th>Date_due</th>
                 <th>Title</th>
@@ -176,13 +174,10 @@
                     </tr>
                 <!-- /TMPL_LOOP -->
             </table>
-        </fieldset>
+        </div>
     <!-- /TMPL_IF -->
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index d7529296d4..7539d8c385 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -8,55 +8,68 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues as of <!-- TMPL_VAR NAME="todaysdate" --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 <h2>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></h2>
   
   <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
-  <fieldset>
+  <fieldset class="rows">
     <legend>Filter on :</legend>
-    <p><label>Name or cardnumber:</label><input type="text" name="borname" value="<!--TMPL_VAR Name="borname"-->"></p>
-    <p><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option>
+	<ol>
+    <li><label>Name or cardnumber:</label><input type="text" name="borname" value="<!--TMPL_VAR Name="borname"-->" /></li>
+    <li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option>
       <!-- TMPL_LOOP name="borcatloop" -->
-        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="catname" --></option>
+        <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="catname" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="catname" --></option><!-- /TMPL_IF -->
       <!-- /TMPL_LOOP -->
       </select>
-    </p>
-    <p>
-    <p><label>Patron flags:</label><!--TMPL_VAR Name="CGIflags" --></p>
-    <p><label>Item type:</label><select name="itemtype" id="itemtype"><option value="">Any</option>
-      <!-- TMPL_LOOP name="itemtypeloop" -->
-        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemtypename" --></option>
+    </li>
+    <li><label>Patron flags:</label><!--TMPL_VAR Name="CGIflags" --></li>
+    <li><label>Item type:</label><select name="itemtype" id="itemtype"><option value="">Any</option>
+      <!-- TMPL_LOOP name="itemtypeloop" --><!-- TMPL_IF NAME="selected" -->
+        <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="itemtypename" --></option><!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="itemtypename" --></option><!-- /TMPL_IF -->
       <!-- /TMPL_LOOP -->
       </select>
-    </p>
-    <p>
+    </li>
+    <li>
     <label>Library of the patron:</label><select name="branch" id="branch">
         <option value="">Any</option>
       <!-- TMPL_LOOP name="branchloop" -->
-        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+        <!-- TMPL_IF NAME="selected" -->
+        <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="itemtypename" --></option><!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="itemtypename" --></option><!-- /TMPL_IF -->
       <!-- /TMPL_LOOP -->
       </select>
-    </p>
-    Show any items currently issued:<input type="checkbox" name="showall" value="show" <!--TMPL_IF Name="showall"-->checked="checked"<!--/TMPL_IF-->>
-    Sort By<select name="order" tabindex="0" size="1" id="order">
-<option <!--TMPL_UNLESS Name"order"-->selected<!-- /TMPL_UNLESS--> value="">Due Date</option>
-<option  value="borrower">Patron</option>
-<option  value="title">Title</option>
-<option  value="barcode">Barcode</option>
-<option  value="date_due desc">Due Date desc</option>
-<option  value="borrower desc">Patron desc</option>
-<option  value="title desc">Title desc</option>
-<option  value="barcode desc">Barcode</option>
-</select>
-      <input TYPE="submit" value="Apply Filter" class="button reports">
+    </li>
+   
+    <li><label for="order">Sort By:</label> <select name="order" id="order">
+<!-- TMPL_IF NAME="order" -->
+<option value="">Due Date</option>
+<!-- TMPL_ELSE --><option value="" selected="selected">Due Date</option><!-- /TMPL_IF -->
+<option value="borrower">Patron</option>
+<option value="title">Title</option>
+<option value="barcode">Barcode</option>
+<option value="date_due desc">Due Date desc</option>
+<option value="borrower desc">Patron desc</option>
+<option value="title desc">Title desc</option>
+<option value="barcode desc">Barcode</option>
+</select></li>
+<li class="radio"><label for="showall">Show any items currently issued:</label> 
+	<!-- TMPL_IF NAME="showall" --><input type="checkbox" id="showall" name="showall" value="show" checked="checked" /><!-- TMPL_ELSE --><input type="checkbox" id="showall" name="showall" value="show" /><!-- /TMPL_IF -->
+</li>
+</ol>
+   </fieldset>   
+   <fieldset class="action">
+      <input type="submit" value="Apply Filter" class="submit" />
    </fieldset>   
   </form>
-<a href="overdue.pl?op=csv&branch=<!-- TMPL_VAR name="branchfilter" -->">Download file of all overdues</a> (for <!-- TMPL_IF name="branchfilter" -->branch <!-- TMPL_VAR name="branchfilter" --><!-- TMPL_ELSE --> all branches <!-- /TMPL_IF --> . Other filters are ignored)
+  
+ <h3>Results</h3>
+<a href="overdue.pl?op=csv&amp;branch=<!-- TMPL_VAR name="branchfilter" -->">Download file of all overdues</a> (for <!-- TMPL_IF name="branchfilter" -->branch <!-- TMPL_VAR name="branchfilter" --><!-- TMPL_ELSE -->all branches<!-- /TMPL_IF -->. Other filters are ignored)
 <div class="searchresults">
 <table>
 <tr>
@@ -86,8 +99,6 @@
 </div>
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
+
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index 458a0b0ded..551b8fdf60 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -16,11 +16,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Pending Holds</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 <h1>Hold Pull List</h1>
 <h1>Pending holds on <!-- TMPL_VAR NAME="todaysdate" --> (from <!-- TMPL_VAR NAME="from" -->
@@ -190,8 +190,5 @@ Calendar.setup(
 </div>
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
index dcc8a2c68f..31941392d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
@@ -16,11 +16,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Hold Ratios</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 <h1>Hold Ratios to Calculate Items Needed<br/>
     Calculated on <!-- TMPL_VAR NAME="todaysdate" --> <br/>From <!-- TMPL_VAR NAME="from" -->
@@ -179,8 +179,5 @@ Calendar.setup(
 </div>
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
index ea2188b8aa..a264991a2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -8,11 +8,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transfers to do</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 
     <h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
@@ -73,8 +73,5 @@
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index 6182b0c588..bc0224e2a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -1,18 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation &rsaquo; Transfers to your branch</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Transfers to your library</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Transfers to your branch</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>  &rsaquo; Transfers to your library</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
+	<div class="yui-g">
 
 
 	<h1>Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
@@ -21,10 +21,8 @@
             <div id="resultlist">
             <!-- TMPL_LOOP NAME="branchesloop" -->
                 <!-- TMPL_IF NAME="branchcode" -->
-                <table>
-                <tr>
-                        <th colspan="5">Coming from <!-- TMPL_VAR NAME="branchname" --> </th>
-                </tr>
+                <table style="width: 100%">
+				<caption>Coming from <!-- TMPL_VAR NAME="branchname" --></caption>
                 <tr>
                     <th>Date of transfer</th>
                     <th>Title</th>
@@ -80,8 +78,5 @@
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 78397f3721..14de5b22f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -8,14 +8,11 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Holds</div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b">
-
-
-<h1>Circulation: Library Holds</h1>
+	<div class="yui-g">
 
         <h2>Holds for your library on : <!-- TMPL_VAR NAME="show_date" --></h2>
         <!-- TMPL_IF NAME="messagetransfert" -->
@@ -43,9 +40,6 @@
         <div id="resultlist">
             <!-- TMPL_IF NAME="reserveloop" -->
                 <table>
-                <tr>
-                        <th colspan="5">Holds at your library</th>
-                </tr>
                 <tr>
                         <th>Available since</th>
                         <th>Title</th>
@@ -94,8 +88,5 @@
 
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->