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 411725362d..68dee3a683 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -868,6 +868,10 @@ tr.highlight td {
 	background-color : #F6F6F6;
 }
 
+tr.highlight th {
+	background-color : #DDDDDD;
+}
+
 #circ_circulation_issue label {
 	font-size: 105%;
 	font-weight : bold;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index bc403648c5..c3914fc33a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Cataloging Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -39,7 +40,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         //this.oAutoComp.queryDelay = 1;
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
-});    
+});
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 <div id="addbooks_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index f8f61f0d2a..2c3cbbb14d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Cities Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="city_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index ee665362e1..792f65fdfe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Currencies Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="currency_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
index 1aff5933c5..53ad82d4b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/label-status.inc
@@ -1,4 +1,5 @@
-<div class="details" style="width: 43%">
+<div style="margin-top: 1em;">
+<h3>Active  Settings</h3>
 <table>
 <tr><th>Layout:</th><td><!-- TMPL_IF NAME="active_layout_name" --><!-- TMPL_VAR NAME="active_layout_name" --><!-- TMPL_ELSE --><span class="error">No Layout Specified: <a href="/cgi-bin/koha/labels/label-home.pl">Select a Label Layout</a></span><!-- /TMPL_IF --> </td></tr>
 <tr><th>Template: </th><td><!-- TMPL_IF NAME="active_template_name" --><!-- TMPL_VAR NAME="active_template_name" --><!-- TMPL_ELSE --><span class="error">No Template Specified: <a href="/cgi-bin/koha/labels/label-templates.pl">Select a Label Template</a></span><!-- /TMPL_IF --> </td></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 7d3e96edac..ff102b50b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Notices Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="notices_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 2706c6c52b..d5592de886 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Patrons Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="patron_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 1caa4777e9..171947edcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Patrons Admin Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="patron_category_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index 14c4fa94fd..bb294ed8e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Roads Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="roadtype_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 24ac617aa9..f4b5254127 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Serials Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -40,6 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
+//]]>
 </script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="subscription_search" class="residentsearch primary">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
index 7b78193dfa..aad9bf7c79 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
@@ -12,43 +12,58 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
 <form name="input" action="/cgi-bin/koha/labels/label-save-template.pl" method="get">
 
+<div class="yui-g">
 <h3>Edit Label Template</h3>
+<div class="yui-u first">
+<fieldset class="rows"><legend>Template Settings</legend>
 
-<h3>Template Settings</h3>
+<ol>
+<li><span class="label">Template ID: <!-- TMPL_VAR NAME="tmpl_id" --> </span></li>
+	<li><label for="tmpl_code">Template Code:</label> <input type="text"  size="40" name="tmpl_code" id="tmpl_code" value="<!-- TMPL_VAR NAME="tmpl_code" -->" /></li>
+	<li><label for="tmpl_desc">Template Description:</label> <textarea cols="40" rows="3" id="tmpl_desc" name="tmpl_desc"><!-- TMPL_VAR NAME="tmpl_desc" --></textarea></li>
 
-<p>Template ID: <!-- TMPL_VAR NAME="tmpl_id" --> <br />
-Template Code: <input type="text"  size="40" name="tmpl_code" value="<!-- TMPL_VAR NAME="tmpl_code" -->" /><br />
-Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc"><!-- TMPL_VAR NAME="tmpl_desc" --></textarea><br /></p>
+<li>
+        <label for="page_width">Page Width: </label><input type="text"  size="4" name="page_width" id="page_width" value="<!-- TMPL_VAR NAME="page_width" -->" />
+</li>
+<li>
+        <label for="page_height">Page Height: </label><input type="text" size="4" name="page_height" id="page_height" value="<!-- TMPL_VAR NAME="page_height" -->" />
+</li>
+<li>
+        <label for="label_width">Label Width: </label><input type="text"  size="4" name="label_width" id="label_width" value="<!-- TMPL_VAR NAME="label_width" -->" />
+</li>
+<li>
+        <label for="label_height">Label Height: </label><input type="text" size="4" name="label_height" id="label_height" value="<!-- TMPL_VAR NAME="label_height" -->" />
+</li>
+<li>
+        <label for="topmargin">Top Page Margin: </label><input type="text" size="4" name="topmargin" id="topmargin" value="<!-- TMPL_VAR NAME="topmargin" -->" />
+</li>
+<li>
+        <label for="leftmargin">Left Page Margin: </label><input type="text" size="4" name="leftmargin" id="leftmargin" value="<!-- TMPL_VAR NAME="leftmargin" -->" />
+</li>
+</ol>
+</fieldset>
+</div>
+<div class="yui-u">
+<fieldset class="rows">
+<ol>
 
-<table>
+<li>
+        <label for="cols">Number of Columns: </label><input type="text" size="4" name="cols" id="cols" value="<!-- TMPL_VAR NAME="cols" -->" />
+</li>
+<li>
+        <label for="rows">Number of Rows: </label><input type="text" size="4" name="rows" id="rows" value="<!-- TMPL_VAR NAME="rows" -->" />
+</li>
+<li>
+        <label for="colgap">Gap between Columns: </label><input type="text" size="4" name="colgap" id="colgap" value="<!-- TMPL_VAR NAME="colgap" -->" />
+</li>
+<li>
+        <label for="rowgap">Gap between Rows: </label><input type="text" size="4" name="rowgap" id="rowgap" value="<!-- TMPL_VAR NAME="rowgap" -->" />
 
-<tr>
-        <td>Page Width:</td><td><input type="text"  size="4" name="page_width"  value="<!-- TMPL_VAR NAME="page_width" -->" /></td>
-        <td>Page Height:</td><td><input type="text" size="4" name="page_height"  value="<!-- TMPL_VAR NAME="page_height" -->" /></td>
-</tr>
-<tr>
-        <td>Label Width:</td><td><input type="text"  size="4" name="label_width"  value="<!-- TMPL_VAR NAME="label_width" -->" /></td>
-        <td>Label Height:</td><td><input type="text" size="4" name="label_height"  value="<!-- TMPL_VAR NAME="label_height" -->" /></td>
-</tr>
-<tr>
-        <td>Top Page Margin:</td><td><input type="text" size="4" name="topmargin"  value="<!-- TMPL_VAR NAME="topmargin" -->" /></td>
-        <td>Left Page Margin:</td><td><input type="text" size="4" name="leftmargin"  value="<!-- TMPL_VAR NAME="leftmargin" -->" /></td>
-</tr>
-<tr>
-        <td>Number of Columns:</td><td><input type="text" size="4" name="cols"  value="<!-- TMPL_VAR NAME="cols" -->" /></td>
-        <td>Number of Rows:</td><td><input type="text" size="4" name="rows"  value="<!-- TMPL_VAR NAME="rows" -->" /></td>
-</tr>
-<tr>
-        <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"  value="<!-- TMPL_VAR NAME="colgap" -->" /></td>
-        <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"  value="<!-- TMPL_VAR NAME="rowgap" -->" /></td>
+</li>
 
-</tr>
-</table>
-
-Units: <select name="units">
+<li><label for="units">Units: </label><select id="units" name="units">
     <!-- TMPL_LOOP NAME="units" -->
         <!-- TMPL_IF NAME="selected" -->
             <option value="<!-- TMPL_VAR NAME="unit" -->" selected="selected">
@@ -56,21 +71,24 @@ Units: <select name="units">
             <option value="<!-- TMPL_VAR NAME="unit" -->">
         <!-- /TMPL_IF --><!-- TMPL_VAR NAME="desc" --></option>
     <!-- /TMPL_LOOP -->
-</select>
+</select></li>
 
-Font Size: <input type="textbox" name="fontsize"  size="1" value="<!-- TMPL_VAR NAME="fontsize" -->" />
+<li><label for="fontsize">Font Size:</label> <input type="text" id="fontsize" name="fontsize"  size="1" value="<!-- TMPL_VAR NAME="fontsize" -->" /></li>
 
-Active: 
+<li><label for="active">Active: </label>
 <!-- TMPL_IF NAME="active" -->
-<input type="checkbox" name="active" checked="checked" />
+<input type="checkbox" name="active" id="active" checked="checked" />
 <!-- TMPL_ELSE -->
-<input type="checkbox" name="active" />
+<input type="checkbox" name="active" id="active" />
 <!-- /TMPL_IF -->
-        <input type="hidden" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->" />
-<p>
-        <input type="submit" value="Save" />
-        <input type="reset" value="Reset" />
-</p>
+        <input type="hidden" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->" /></li>
+
+</ol></fieldset>
+</div>
+</div><div class="yui-g">
+<fieldset class="action">
+        <input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/labels/label-save-template.pl">Cancel</a>
+</fieldset></div>
 </form>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index 99ce036f3a..650e44de1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -14,11 +14,14 @@
 	<div class="yui-b">
 
 <!-- TMPL_INCLUDE NAME="tools-labels-toolbar.inc" -->
-<!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_IF NAME="layout_loop" -->
-<h2>Select a Current Layout</h2>
+<div class="yui-gc">
+<div class="yui-u first">
 <form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
+<fieldset>
+<legend>Set Active Layout</legend>
+
 <table>
 <tr>
         <th>Layout</th>
@@ -43,7 +46,7 @@
                 <a href="/cgi-bin/koha/labels/label-edit-layout.pl?layout_id=<!-- TMPL_VAR NAME="id" -->">Edit</a>
         </td>
         <td>
-                <a href="/cgi-bin/koha/label-home.pl?op=delete_layout&layout_id=<!-- TMPL_VAR NAME="id"-->">Delete</a>
+                <a href="/cgi-bin/koha/label-home.pl?op=delete_layout&amp;layout_id=<!-- TMPL_VAR NAME="id"-->">Delete</a>
         </td>
 <td> <!-- TMPL_IF NAME="active" -->
 <input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->" checked="checked" />
@@ -52,13 +55,20 @@
 <!-- /TMPL_IF -->
         </td>
 </tr>
-
 <!-- /TMPL_LOOP -->
-<tr><td colspan="7">
-     <input type="submit" value="Set Active Layout" />
-        <input type="hidden" name=op value="set_active_layout" />
+
 </table>
-</form>
+</fieldset>
+<fieldset class="action">
+     <input type="submit" value="Save" />
+        <input type="hidden" name=op value="set_active_layout" /></fieldset>
+</form></div>
+<div class="yui-u">
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
+</div>
+</div>
+<!-- TMPL_ELSE -->
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
index f27a43c9aa..eb2e56d7c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
@@ -2,7 +2,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
 function Plugin(batch_id) {
-	window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=600,height=460,toolbar=no,scrollbars=yes');
+	window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=640,height=400,toolbar=no,scrollbars=yes');
 }
 </script>
 </head>
@@ -17,12 +17,14 @@ function Plugin(batch_id) {
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="tools-labels-toolbar.inc" -->
-<!-- TMPL_INCLUDE NAME="label-status.inc" -->
 
 <!-- TMPL_UNLESS NAME="batch_id" -->
+<!-- TMPL_INCLUDE NAME="tools-labels-toolbar.inc" -->
 
 <!-- TMPL_IF NAME="batches" -->
+<div class="yui-g">
+
+<div class="yui-u first">
 <h2>Label Batches</h2>
 <table>
 <tr>
@@ -44,24 +46,56 @@ function Plugin(batch_id) {
                 <a href="/cgi-bin/koha/labels/label-manager.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Edit</a>
         </td>
         <td>
-                <a href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
+                <a href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
         </td>
           <td>
-		  <a class="button" style="float: right;"  href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch  <!-- TMPL_VAR NAME="batch_id" --></a>
+		  <a style="float: right;"  href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch  <!-- TMPL_VAR NAME="batch_id" --></a>
         </td></tr>
 <!-- /TMPL_LOOP -->
 </table>
-
+</div>
+<div class="yui-u">
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
+</div>
+</div>
+<!-- TMPL_ELSE -->
+<!-- TMPL_INCLUDE NAME="label-status.inc" -->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_ELSE -->
-<div class="details">
 
-        <a class="button" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->); return false;">Add item(s) to batch</a> &nbsp;&nbsp;&nbsp;&nbsp;
-		<a class="button" href="/cgi-bin/koha/labels/label-manager.pl?batch_id=">Return to batch summary</a>&nbsp;&nbsp;&nbsp;&nbsp;
-        <a class="button" style="border:2px solid #634;" href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete current batch (<!-- TMPL_VAR NAME="batch_id" -->)</a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a class="button"  href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch: <!-- TMPL_VAR NAME="batch_id" --></a>
-</div>
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	 	$("#additemsc").empty();
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+		new YAHOO.widget.Button({
+                                            id: "additems", 
+                                            type: "button", 
+                                            label: "Add item(s) to batch", 
+                                            container: "additemsc",
+											onclick: {fn:function(){Plugin(<!-- TMPL_VAR NAME="batch_id" -->)}}
+                                        });
+		new YAHOO.widget.Button("deletebatch");
+		new YAHOO.widget.Button("generate");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li id="additemsc"><a id="additems" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->); return false;">Add item(s) to batch</a></li>
+	<li><a id="deletebatch" href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete current batch</a></li>
+	<li><a id="generate" href="/cgi-bin/koha/labels/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch</a></li>
+</ul></div>
 
 <h2>Items to be Printed for Batch <!-- TMPL_VAR NAME="batch_id" -->  (<!-- TMPL_VAR NAME="batch_count" -->  items)</h2>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
index 382c26d287..a024ee8521 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -1,10 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo;  Labels</title>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<style type="text/css">#custom-doc { width:47.23em;*width:46.04em;min-width:610px; margin:auto;margin-top: .4em; text-align:left; }</style>
 </head>
 <body>
 
-<div id="main-compact">
+<div id="custom-doc" class="yui-t7">
+   <div id="bd">
 
 <h1>Catalog item search
 
@@ -16,7 +18,8 @@
 <form name="f" method="post">
 	<input type="hidden" name="op" value="do_search" />
 	<input type="hidden" name="batch_id" value="<!-- TMPL_VAR NAME="batch_id" -->" />
-<div>
+	<fieldset class="rows">
+<ol><li>
   <select name="idx">
     <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
     <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
@@ -33,7 +36,7 @@
     <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
 </select>
    <input type="text" size="30" name="marclist" title="Enter search terms" value=""/>  
-</div><div>
+</li><li>
 <select name="idx">
     <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
     <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
@@ -48,9 +51,9 @@
     <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Series Title</option>
     <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
     <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
-</select>
-   <input type="text" size="30" name="q" title="Enter search terms" value=""/>  
-</div>
+</select></li>
+  <li> <input type="text" size="30" name="q" title="Enter search terms" value="" />  </li></ol>
+</fieldset>
 
 <!-- TMPL_IF NAME="sort_by_loop" -->
 <fieldset><legend>Sort by: </legend>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
index 0c1d93d63d..56f7090ffb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
@@ -1,40 +1,37 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>SMS Administration</title>
+<title>Koha &rsaquo; SMS Administration</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; SMS Administration</div>
 
 <div id="doc3" class="yui-t2">
 
    <div id="bd">
        <div id="yui-main">
-	       <div class="yui-b"><div class="yui-g">
-<h1>NEULIS SMS Administration</h1>
+	       <div class="yui-b">
 
-
-<table>
-<caption>SMS Messaging </caption>
 <!--TMPL_IF NAME="error"--><div class="error"><!--TMPL_VAR NAME="error"--> </div><!--/TMPL_IF-->
 <form action="/cgi-bin/koha/sms/sms.pl" method="post">
-<tr><input type="hidden" value="sendsms" name="operation"/>
-	<td >Your Message<textarea name="message"  cols="35" rows="4"><!--TMPL_VAR NAME="message"--></textarea></td>
-</tr>
-<tr>
-	<td>Phone:<input type="text" name="phone" value="<!--TMPL_VAR NAME="phone"-->"/>5338644143</th>
-	
-</tr>
-	<tr>
-	
-	<td><input type="submit" value="Send SMS"></td>
-</tr>
+<fieldset class="rows">
+<legend>SMS Messaging</legend>
+<ol>
+	<li><label for="message">Your Message: </label><textarea name="message" id="message" cols="35" rows="4"><!--TMPL_VAR NAME="message"--></textarea></li>
+	<li><label for="phone">Phone:</label><input type="text" name="phone" id="phone" value="<!--TMPL_VAR NAME="phone"-->"/> 5338644143</li>
+</ol>
+</fieldset>
+<fieldset class="action"><input type="submit" value="Send SMS"></fieldset>
 </form>
 
-<th>Şu anda sadece KTcell abonelerine mesaj gönderilebilir. Rezervasyonu gelenler için kullanın!</th>
+<div class="message">Şu anda sadece KTcell abonelerine mesaj gönderilebilir. Rezervasyonu gelenler için kullanın!</div>
 
-</table>
 </div>
 </div>
-    </div>
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
index edc13b4f93..15794ef5e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Tools &rsaquo; Clean Patron Records</title>
+<title>Koha &rsaquo; Tools &rsaquo; Clean Patron Records <!-- TMPL_IF NAME="step2" -->&rsaquo; Confirm<!-- /TMPL_IF --><!-- TMPL_IF NAME="step3" -->&rsaquo; Finished<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script type="text/javascript">
@@ -41,7 +41,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>  &rsaquo; Clean Patron Records</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>  &rsaquo; <!-- TMPL_IF NAME="step1" -->Clean Patron Records<!-- TMPL_ELSE --><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean Patron Records</a> &rsaquo; <!-- /TMPL_IF --><!-- TMPL_IF NAME="step2" -->Confirm<!-- /TMPL_IF --><!-- TMPL_IF NAME="step3" -->Finished<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -49,7 +49,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-<h1>Delete some old patrons/Anonymize some issue history</h1>
+<h1>Delete some old patrons/Anonymize some check-out history</h1>
 
 <!-- TMPL_IF NAME="step1" -->
 <!-- step 1 START -->
@@ -70,7 +70,7 @@
             </script></p>
         
         <p><input id="checkissue" type="checkbox" name="checkbox" value="issue" checked="checked" />
-        <label for="checkissue">Anonymize issue history older than</label>
+        <label for="checkissue">Anonymize check-out history older than</label>
         <input size="10" id="date2" name="filterdate2" value="<!-- TMPL_VAR NAME="filterdate2"-->" type="text" />
             <script type="text/javascript">
                 Calendar.setup(
@@ -81,11 +81,11 @@
                 );
             </script></p>
 
-            <input type="submit" value="Submit" />
             
             <!-- hidden here -->
             <input type="hidden" name="step2" value="1" />
 			</fieldset>
+            <fieldset class="action"><input type="submit" value="Next &gt;&gt;" /></fieldset>
     </form>
 </div>
 <!-- step 1 END -->
@@ -94,40 +94,38 @@
 <!-- TMPL_IF NAME="step2" -->
 <!-- STEP 2 START -->
 <div id="step2">
+        <form name="f2" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post" onsubmit="return checkForm2(this);">
     <fieldset>
         <legend>Warnings</legend>
-        <b>
-        <!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR NAME="totalToDelete" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> patrons will be deleted.
-        <br />
-        <!-- TMPL_IF NAME="totalToAnonymize" --><!-- TMPL_VAR NAME="totalToAnonymize" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> issue history will be anonymized.
 
-        </b>
+        	<ul>
+        		<li><!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR NAME="totalToDelete" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> patrons will be deleted.</li>
+        		<li><!-- TMPL_IF NAME="totalToAnonymize" --><!-- TMPL_VAR NAME="totalToAnonymize" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> check-out history will be anonymized.</li>
+        	</ul>
+
         <br />
-        <form name="f2" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post" onsubmit="return checkForm2(this);">
             <!-- TMPL_IF NAME="totalToDelete" -->
-                What do you want to do for deleted patrons ?<br />
-                <label for="delete">Delete completly theses patrons</label>
+                <fieldset><legend>What do you want to do for deleted patrons?</legend>
+                <label for="delete">Permanently delete these patrons</label>
                 <input id="delete" type="radio" name="radio" value="delete" checked="checked" />
                 
-                <label for="trash">Move to trash theses patrons</label>
+                <label for="trash">Move these patrons to the trash</label>
                 <input id="trash" type="radio" name="radio" value="trash" />
-                <input type="hidden" name="do_delete" value="<!-- TMPL_VAR NAME="totalToDelete" -->" />
-                <br />
+                <input type="hidden" name="do_delete" value="<!-- TMPL_VAR NAME="totalToDelete" -->" /></fieldset>
+
             <!-- /TMPL_IF -->
             <!--TMPL_IF NAME="totalToAnonymize"-->
-                <br />
-                Are you sure you want to anonymize issue history for <!-- TMPL_VAR NAME="totalToAnonymize"--> patrons ?
+
+                Check-out history for <!-- TMPL_VAR NAME="totalToAnonymize"--> patrons will be anonymized.
                 <input type="hidden" name="do_anonym" value="<!-- TMPL_VAR NAME="totalToAnonymize" -->" />
             <!-- /TMPL_IF -->
-            <br /><br />
-            <a href="JavaScript:back();" title="go back">Cancel</a>
-            <input type="submit" value=" OK " />
-            
+               
             <input type="hidden" name="step3" value="1" />
             <input type="hidden" name="filterdate1" value="<!-- TMPL_VAR NAME="filterdate1" -->" />
             <input type="hidden" name="filterdate2" value="<!-- TMPL_VAR NAME="filterdate2" -->" />
-        </form>
     </fieldset>
+	<fieldset class="action"><input type="submit" value="Finish" /> <a class="cancel" href="/cgi-bin/koha/tools/cleanborrowers.pl">Cancel</a></fieldset>
+        </form>
 </div>
 <!-- STEP 2 END -->
 <!-- /TMPL_IF -->
@@ -136,20 +134,23 @@
 <!-- Step 3 START -->
 
     <div id="step3">
-          <b>
+
           <!-- TMPL_IF NAME="do_delete" -->
                 <!-- TMPL_IF NAME="trash" -->
-                    <!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfuly moved to trash.
+                    <h4><!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfuly moved to trash.</h4>
                 <!-- TMPL_ELSE -->
-                    <!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfuly deleted.
+                    <h4><!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfully deleted.</h4>
                 <!-- /TMPL_IF -->
+			<!-- TMPL_ELSE -->
+				<h4>No patron records have been removed.</h4>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="do_anonym" -->
-                All patrons whose issue history older than <!-- TMPL_VAR NAME="filterdate1" --> has been anonimized.
+                <h4>All patrons with checkouts older than <!-- TMPL_VAR NAME="filterdate1" --> have been anonymized.</h4>
+			<!-- TMPL_ELSE -->
+				<h4>No patron records have been anonymized.</h4>
             <!-- /TMPL_IF -->
-          </b>
+
     </div>
-    <a href="/cgi-bin/koha/tools/tools-home.pl">Go back to tools home.</a>
 <!-- Step 3 END -->
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
index 53a1dd1161..b6584f0166 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
@@ -94,7 +94,8 @@
         </li></ol>
     </fieldset>
     <input type="hidden" name="op" value="export" />
-    <input type="submit" value="Export" class="button" />
+	
+    <fieldset class="action"><input type="submit" value="Export" class="button" /></fieldset>
 </form>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
index fbe0730194..c07e5cc71b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
@@ -1,22 +1,21 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Cataloging &rsaquo; MARC Import</title>
+<title>Koha &rsaquo; Cataloging &rsaquo; Patron Import <!-- TMPL_IF NAME="uploadborrowers" -->&rsaquo; Results<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
+<!-- TMPL_INCLUDE NAME="patron-search.inc"-->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Patron Import</div>
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Borrower Import</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Patron Import <!-- TMPL_IF name="uploadborrowers" --><a href="/cgi-bin/koha/tools/import_borrowers.pl">Patron Import</a> &rsaquo; Results<!-- TMPL_ELSE -->Patron Import<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
+<div class="yui-g">
+<div class="yui-u first">
 <h1>Patron import</h1>
-
 <!-- TMPL_IF name="uploadborrowers" -->
 <p>Import results :</p>
 <ul>
@@ -34,14 +33,12 @@
 </ul>
 <form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
 <fieldset class="rows">
-<legend>Import into the borrowers table</legend><ol>
+<legend>Import into the borrowers table</legend>
+<ol>
 	<li>
 		<label for="uploadborrowers">Select the file to import: </label>
-		
-			<input type="file" id="uploadborrowers" name="uploadborrowers" /><br />
-		
+		<input type="file" id="uploadborrowers" name="uploadborrowers" />
 	</li>
-
 </ol></fieldset>
 	<fieldset class="rows">
 	<legend>If cardnumber is already in the borrowers table:</legend><ol><li class="radio">
@@ -49,10 +46,11 @@
 		<input type="radio" id="overwrite_cardnumberno" name="overwrite_cardnumber" value="0" checked="checked" /><label for="overwrite_cardnumberno">Ignore this one, keep the existing one</label></li>
 <li class="radio">
 			<input type="radio" id="overwrite_cardnumberyes" name="overwrite_cardnumber" value="1" /><label for="overwrite_cardnumberyes">Overwrite the existing one with this</label>
-	</li></ol></fieldset><input type="submit" value="Import" />
+	</li></ol></fieldset><fieldset class="action"><input type="submit" value="Import" /></fieldset>
 </form>
 <!-- /TMPL_IF -->
-<div>
+</div>
+<div class="yui-u">
 <h2>Notes:</h2>
 <ul>
 <li>Format the file in CSV format with the following fields:</li>
@@ -70,10 +68,11 @@
     'sex',           'userid',       'opacnote',         'contactnote',
     'password',      'sort1',        'sort2'
 </li>
-<li>Please make sure the 'branchcode' and 'categorycode' are valid entries in your database</li>
-<li>password should be stored in plaintext, and will be converted to a md5 hash(if your passwords are already crypted, talk to your systems administrator about options)</li>
+<li>Please make sure the 'branchcode' and 'categorycode' are valid entries in your database.</li>
+<li>password should be stored in plaintext, and will be converted to a md5 hash (if your passwords are already encrypted, talk to your systems administrator about options).</li>
 </ul>
 </div>
+</div>
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 2c77768998..5c72fc7fd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -14,8 +14,9 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
     <h1>Inventory/Stocktaking</h1>
+	<div class="yui-g">
+	<div class="yui-u first">
     <form method="post" action="/cgi-bin/koha/tools/inventory.pl">
         <fieldset class="rows">
         <legend>Select items you want to check</legend>
@@ -70,14 +71,17 @@
         </li></ol>
   </fieldset>
             <input type="hidden" name="op" value="do_it" />
-            <input type="submit" value="Submit" class="button" />
+            <fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
     </form>
+	</div>
+	
+	<div class="yui-u">
     <form name="barcodefile" method="post" action="/cgi-bin/koha/tools/inventory.pl">
         <fieldset class="rows">
             <legend>Use a barcode file</legend>
 			<ol>
             <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
-            <li><label for="setdate">Set date last seen to :</label> <input type="text" id="setdate" name="setdate" />
+            <li><label for="setdate">Set date last seen to:</label> <input type="text" id="setdate" name="setdate" />
              <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="setdate_button" alt="Show Calendar" />
             <script type="text/javascript">
             Calendar.setup(
@@ -90,17 +94,19 @@
             </script>
 </li></ol>
         </fieldset>
-            <p><input type="submit" value="Submit" class="button" /></p>
+            <fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
     </form>
+	</div>
+	</div>
     <!--TMPL_IF Name="Number" --><p><!--TMPL_VAR Name="Number"--> items modified : datelastseen set to <!--TMPL_VAR Name="date"--></p><!-- /TMPL_IF-->
     <!--TMPL_IF Name="errorfile" --><p class="error"><!--TMPL_VAR Name="errorfile"--> can't be opened</p><!-- /TMPL_IF-->
     <!--TMPL_LOOP Name="errorloop"-->
         <p class="error">
             <!--TMPL_VAR Name="barcode"-->
-            <!--TMPL_IF Name="ERR_BARCODE"--> : barcode not found<!--/TMPL_IF-->
-            <!--TMPL_IF Name="ERR_WTHDRAWN"--> : item withdrawn<!--/TMPL_IF-->
-            <!--TMPL_IF Name="ERR_ONLOAN_RET"--> : item was on loan. It was returned before marked as seen<!--/TMPL_IF-->
-            <!--TMPL_IF Name="ERR_ONLOAN_NOT_RET"--> : item was on loan. couldn't be returned.<!--/TMPL_IF-->
+            <!--TMPL_IF Name="ERR_BARCODE"-->: barcode not found<!--/TMPL_IF-->
+            <!--TMPL_IF Name="ERR_WTHDRAWN"-->: item withdrawn<!--/TMPL_IF-->
+            <!--TMPL_IF Name="ERR_ONLOAN_RET"-->: item was on loan. It was returned before marked as seen<!--/TMPL_IF-->
+            <!--TMPL_IF Name="ERR_ONLOAN_NOT_RET"-->: item was on loan. couldn't be returned.<!--/TMPL_IF-->
         </p>
     <!-- /TMPL_LOOP-->
     <!-- TMPL_IF NAME="loop" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index d9f4f23edb..50ba08c432 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -78,8 +78,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
             </ol>
 			</fieldset>
   
-                <input class="button" type="submit" value="Save" />
-                <input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/tools/opac-news.pl'" />
+                <fieldset class="action"><input class="button" type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/tools/opac-news.pl">Cancel</a></fieldset>
         </form>
     <!-- TMPL_ELSE -->
         <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl">
@@ -134,7 +133,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                     <!-- /TMPL_LOOP -->
                 </table>
                 <input type="hidden" name="op" value="del" />
-                <input type="submit" class="button" value="Delete selected" />
+                <fieldset class="action"><input type="submit" class="button" value="Delete selected" /></fieldset>
             </form>
         <!-- TMPL_ELSE -->
             <p>No news loaded</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index 6dabfd09c4..e4e4fe6324 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -253,18 +253,18 @@
 		<li>
 			<label for="SQLfieldname">Message Body:</label>
 		</li>
-		<li>		
-		<select name="SQLfieldname" id="SQLfieldname" size="9">
+		<li>
+		<table>
+		<tr><td><select name="SQLfieldname" id="SQLfieldname" size="9">
 			<!-- TMPL_LOOP name="SQLfieldname" -->
 				<option value="<!-- TMPL_VAR name="value"-->"><!-- TMPL_VAR name="text"--></option>
 			<!-- /TMPL_LOOP -->
-		</select>
-        <input type="button" name="insert" value="&gt;&gt;" onclick="insertValueQuery()" title="Insert" />
-        <textarea name="content" cols="80" rows="15"><!-- TMPL_VAR NAME="content" --></textarea>
+		</select></td><td><input type="button" name="insert" value="&gt;&gt;" onclick="insertValueQuery()" title="Insert" /></td><td><textarea name="content" cols="80" rows="15"><!-- TMPL_VAR NAME="content" --></textarea></td></tr></table>
+
 		</li>
 		</ol>
 		</fieldset>
-		<p><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></p>
+		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /></fieldset>
 		</form>
 	<!-- /TMPL_IF -->
 	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
index a79d1b9ef8..4560ac0602 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
@@ -58,26 +58,22 @@
                     <!--/TMPL_IF -->
                     </caption>
                     <tr>
-                        <th>&nbsp;</th><th colspan="3" scope="col">First</th><th colspan="3" scope="col">Second</th><th colspan="3" scope="col">Third</th>
+                        <th rowspan="2">&nbsp;</th><th colspan="3" scope="col">First</th><th colspan="3" scope="col">Second</th><th colspan="3" scope="col">Third</th>
                     </tr>
                     <tr>
-                        <th>&nbsp;</th><th scope="col">Delay</th><th scope="col">Letter</th><th scope="col">Debar</th><th scope="col">Delay</th><th scope="col">Letter</th><th scope="col">Debar</th><th scope="col">Delay</th><th scope="col">Letter</th><th scope="col">Debar</th>
+                        <th scope="col">Delay</th><th scope="col">Letter</th><th scope="col">Debar</th><th scope="col">Delay</th><th scope="col">Letter</th><th scope="col">Debar</th><th scope="col">Delay</th><th scope="col">Letter</th><th scope="col">Debar</th>
                     </tr>
                     <!-- TMPL_LOOP NAME="table" -->
-                        <tr>
-                            <th><!-- TMPL_VAR NAME="line" --></th>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
+                     <!-- TMPL_IF NAME="toggle" -->
+                                <tr class="highlight">
                             <!-- TMPL_ELSE -->
-                                <td>
+                                <tr>
                             <!-- /TMPL_IF -->
+                            <th><!-- TMPL_VAR NAME="line" --></th>
+<td>
                                 <input name="delay1-<!-- TMPL_VAR NAME="overduename" -->" size="5" value="<!-- TMPL_VAR NAME="delay1" -->" />
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                             <!--TMPL_IF Name="noletter" -->
                                 <input type="text" name="letter1-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter1"-->" />
                             <!--TMPL_ELSE -->
@@ -93,29 +89,17 @@
                                 </select>
                             <!--/TMPL_IF -->
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                                 <!-- TMPL_IF NAME="debarred1" -->
                                     <input type="checkbox" name="debarred1-<!-- TMPL_VAR NAME="overduename" -->" checked="checked" value="1" />
                                 <!-- TMPL_ELSE -->
                                     <input type="checkbox" name="debarred1-<!-- TMPL_VAR NAME="overduename" -->" value="1" />
                                 <!-- /TMPL_IF -->
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                                 <input name="delay2-<!-- TMPL_VAR NAME="overduename" -->" size="5" value="<!-- TMPL_VAR NAME="delay2" -->" />
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                             <!--TMPL_IF Name="noletter" -->
                                 <input type="text" name="letter2-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter2"-->" />
                             <!--TMPL_ELSE -->
@@ -131,29 +115,17 @@
                                 </select>
                             <!--/TMPL_IF -->
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                                 <!-- TMPL_IF NAME="debarred2" -->
                                     <input type="checkbox" name="debarred2-<!-- TMPL_VAR NAME="overduename" -->" checked="checked" value="1" />
                                 <!-- TMPL_ELSE -->
                                     <input type="checkbox" name="debarred2-<!-- TMPL_VAR NAME="overduename" -->" value="1" />
                                 <!-- /TMPL_IF -->
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                                 <input name="delay3-<!-- TMPL_VAR NAME="overduename" -->" size="5" value="<!-- TMPL_VAR NAME="delay3" -->" />
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                             <!--TMPL_IF Name="noletter" -->
                                 <input type="text" name="letter3-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter3"-->" />
                             <!--TMPL_ELSE -->
@@ -169,11 +141,7 @@
                                 </select>
                             <!--/TMPL_IF -->
                             </td>
-                            <!-- TMPL_IF NAME="toggle" -->
-                                <td class="highlight">
-                            <!-- TMPL_ELSE -->
-                                <td>
-                            <!-- /TMPL_IF -->
+<td>
                                 <!-- TMPL_IF NAME="debarred3" -->
                                     <input type="checkbox" name="debarred3-<!-- TMPL_VAR NAME="overduename" -->" checked="checked" value="1" />
                                 <!-- TMPL_ELSE -->
@@ -183,7 +151,7 @@
                         </tr>
                     <!-- /TMPL_LOOP -->
                 </table>
-                <input type="submit" value="Save Changes" />
+                <fieldset class="action"><input type="submit" value="Save Changes" /></fieldset>
             </form>
             <!-- TMPL_ELSE -->
                 <div class="warning">You don't have defined a patron category, or the patron categories don't need overdue notices.</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl
index c970e188df..5a392dd45f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl
@@ -10,28 +10,27 @@
 		<li>Set left- and bottom-margins of the page that you are going to use. This parameter will help to center the barcodes on the labels.</li>
 	</ul>
 	<br />
-	<form id="formulario" method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
+	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
 		<input type="hidden" name="saveSettings" value="1" />
-		<table>
-			<tr>
-				<th scope="row">
-					Label width (Expressed in mm)
-				</th><td> 
+		<fieldset class="rows"><ol>
+			<li>
+				<label for="labelWidth">
+					Label width (Expressed in mm): </label> 
 					<input id="labelWidth" type="text" name="labelWidth" size="5" value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->">
-				</td></tr>
-				<th scope="row">
-					Label heigth (Expressed in mm)
-				</th><td> 
+				</li>
+				<li>
+				<label for="labelHeigth">
+					Label heigth (Expressed in mm): </label> 
 					<input id="labelHeigth" type="text" name="labelHeigth" size="5" value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->">
-				</td></tr>
-				<th scope="row">
-					System dpi
-				</th><td>
+				</li>
+				<li>
+				<label for="systemDpi">
+					System dpi: </label>
 					<input id="systemDpi" type="text" name="systemDpi" size="5" value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->">
-				</td></tr>
-				<th scope="row">
-					Page Type
-				</th>	<td>
+				</li>
+				<li>
+				<label for="pageType">
+					Page Type: </label>	
 					<select name="pageType" id="pageType" size="1">
 						<!-- TMPL_IF name="A4" -->
 							<option value="A4" selected="selected">A4</option>
@@ -48,28 +47,29 @@
 				        <!-- TMPL_ELSE -->
 							<option value="Legal">Legal</option>
 						<!-- /TMPL_IF -->    </select>
-				</td></tr>
-				<th scope="row">
-					Columns
-				</th>  <td>
+				</li>
+				<li>
+				<label for="columns">
+					Columns: </label>  
 					<input id="columns" type="text" name="columns" size="5" value="<!-- TMPL_VAR NAME="COLUMNS" -->">
-				</td></tr>
-				<th scope="row">
-					Rows
-				</th>   <td>
+				</li>
+				<li>
+				<label for="rows">
+					Rows: </label>   
 					<input id="rows" type="text" name="rows" size="5" value="<!-- TMPL_VAR NAME="ROWS" -->">
-				</td></tr>
-				<th scope="row">
-					Margin Bottom (Expressed in mm)
-				</th>   <td>
+				</li>
+				<li>
+				<label for="marginBottom">
+					Margin Bottom (Expressed in mm): </label>   
 					<input id="marginBottom" type="text" name="marginBottom" size="5" value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->">
-				</td></tr>
-				<th scope="row">
-					Margin Left (Expressed in mm)
-				</th>   <td>
+				</li>
+				<li>
+				<label for="marginLeft">
+					Margin Left (Expressed in mm): </label>   
 					<input id="marginLeft" type="text" name="marginLeft" size="5" value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->">
-				</td></tr>
-			</table><input type="submit" value="Save Settings" />
+				</li>
+			</ol></fieldset>
+			<fieldset class="action"><input type="submit" value="Save Settings" /></fieldset>
 	</form>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl
index 19fe7d27f1..57b298d8d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl
@@ -41,26 +41,22 @@
 <legend>Stage records into the reservoir</legend><ol>
 	<li>
 		<label for="uploadmarc">Select the file to stage: </label>
-		
-			<input type="file" id="uploadmarc" name="uploadmarc" /><br />
+		<input type="file" id="uploadmarc" name="uploadmarc" /><br />
 		
 	</li>
 	<li>
 		<label for="comments">Notes about this file: </label>
-		
-			<input type="text" id="comments" name="comments" />
+		<input type="text" id="comments" name="comments" />
 		
 	</li>
 	<li>
 		<label for="syntax">Character encoding: </label>
-		
-			<select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
+		<select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
 		
 	</li>
 </ol></fieldset>
 	<fieldset class="rows">
 	<legend>Look for existing records in catalogue?</legend><ol><li class="radio">
-		 
 		<input type="radio" id="check_for_matchesno" name="check_for_matches" value="0" checked="checked" /><label for="check_for_matchesno">Do not look for matching records (using ISBN)</label></li>
 <li class="radio">
 			<input type="radio" id="check_for_matchesyes" name="check_for_matches" value="1" /><label for="check_for_matchesyes">Look for matching records</label>
@@ -78,7 +74,7 @@
       </li>
     </ol>
   </fieldset>
-  <input type="submit" value="Stage for import" />
+  <fieldset class="action"><input type="submit" value="Stage for import" /></fieldset>
 </form>
 <!-- /TMPL_IF -->
 
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index d3c7816958..f32294c5c0 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -21,7 +21,6 @@
 use strict;
 require Exporter;
 use CGI;
-use C4::Koha;
 use C4::Auth;
 use HTML::Template;
 use C4::Context;
@@ -31,6 +30,7 @@ use C4::Output;
 use C4::Biblio;
 use C4::Acquisition;
 use C4::Search;
+use C4::Dates qw( DHTMLcalendar );
 use C4::Koha;    # XXX subfield_is_koha_internal_p
 
 #use Smart::Comments;
@@ -252,7 +252,7 @@ else {
 }
 # Print the page
 $template->param(
-    DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 output_html_with_http_headers $query, $cookie, $template->output;