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 b4ac3e3b39..aca700b4f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -441,7 +441,7 @@ fieldset.rows label, fieldset.rows span.label {
 
 fieldset.rows fieldset {
 	border-width : 1px;
-	margin : 0;
+	margin : 0 0 .5em 0;
 	padding : .3em;
 }
 
@@ -507,8 +507,9 @@ fieldset.rows ol.radio label.radio {
 }
 
 fieldset.rows table {
+	font-size : 105%;
 	clear : both;
-	margin : 1em 0 0 1em;
+	margin : 1em 0 1em 1em;
 }
 
 fieldset.rows td label {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
index e705d82340..351a7abbed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
@@ -39,10 +39,10 @@
         <option value="9">9</option>
         <option value="10">10</option>
         </select>
-        <label>Title</label>
+        <label for="tx_title">Title</label>
         </td>
 <td>
-        <select name="tx_subtitle">
+        <select name="tx_subtitle" id="tx_subtitle">
           <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -55,11 +55,11 @@
         <option value="9">9</option>
         <option value="10">10</option>
       </select>
-        <label>Subtitle</label>
+        <label for="tx_subtitle">Subtitle</label>
         </td>
  
         <td>
-        <select name="tx_author">
+        <select name="tx_author" id="tx_author">
          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -72,12 +72,12 @@
         <option value="9">9</option>
         <option value="10">10</option>
        </select>
-        <label>Author</label>
+        <label for="tx_author">Author</label>
         </td>
 </tr>
 <tr>
         <td>
-        <select name="tx_isbn">
+        <select name="tx_isbn" id="tx_isbn">
          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -90,11 +90,11 @@
         <option value="9">9</option>
         <option value="10">10</option>
        </select>
-        <label>ISBN</label>
+        <label for="tx_isbn">ISBN</label>
         </td>
 
         <td>
-        <select name="tx_issn">
+        <select name="tx_issn" id="tx_issn">
           <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -107,11 +107,11 @@
         <option value="9">9</option>
         <option value="10">10</option>
       </select>
-        <label>ISSN</label>
+        <label for="tx_issn">ISSN</label>
         </td>
 
         <td>
-        <select name="tx_itemtype">
+        <select name="tx_itemtype" id="tx_itemtype">
          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -124,14 +124,14 @@
         <option value="9">9</option>
         <option value="10">10</option>
        </select>
-        <label>Itemtype</label>
+        <label for="tx_itemtype">Itemtype</label>
         </td>
 
 
   </tr>
 <tr>
         <td>
-        <select name="tx_dewey">
+        <select name="tx_dewey" id="tx_dewey">
          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -144,11 +144,11 @@
         <option value="9">9</option>
         <option value="10">10</option>
        </select>
-        <label>Dewey</label>
+        <label for="tx_dewey">Dewey</label>
         </td>
 
         <td>
-        <select name="tx_barcode">
+        <select name="tx_barcode" id="tx_barcode">
          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -161,11 +161,11 @@
         <option value="9">9</option>
         <option value="10">10</option>
        </select>
-        <label>Barcode</label>
+        <label for="tx_barcode">Barcode</label>
         </td>
 
         <td>
-        <select name="tx_classif">
+        <select name="tx_classif" id="tx_classif">
          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -178,12 +178,12 @@
         <option value="9">9</option>
         <option value="10">10</option>
        </select>
-        <label>Classification</label>
+        <label for="tx_classif">Classification</label>
         </td>
 </tr>
 <tr>
         <td>
-        <select name="tx_subclass">
+        <select name="tx_subclass" id="tx_subclass">
          <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -196,10 +196,10 @@
         <option value="9">9</option>
         <option value="10">10</option>
        </select>
-        <label>Sub-Class</label>
+        <label for="tx_subclass">Sub-Class</label>
         </td>
         <td colspan="2">
-        <select name="tx_itemcallnumber">
+        <select name="tx_itemcallnumber" id="tx_itemcallnumber">
           <option value="0" selected="selected"></option>
         <option value="1">1</option>
         <option value="2">2</option>
@@ -212,7 +212,7 @@
         <option value="9">9</option>
         <option value="10">10</option>
       </select>
-        <label>Call Number</label>
+        <label for="tx_itemcallnumber">Call Number</label>
         </td>
   </tr>
 </table></fieldset></li>
@@ -242,8 +242,8 @@
 
 
 <li><label for="guidebox">Draw Guide Boxes: </label><input type="checkbox" id="guidebox" name="guidebox" value="1" /></li></ol></fieldset>
-<p>		<input type="hidden" name="op" value="add_layout" />
-        <input type="submit" value="Submit" /></p>
+<fieldset class="action"><input type="hidden" name="op" value="add_layout" />
+        <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/labels/label-home.pl">Cancel</a></fieldset>
 </form>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl
index 6ef542a106..ee8261cf31 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl
@@ -28,22 +28,20 @@ function confirm_deletion(biblionumber,itemnumber) {
 	<div id="yui-main">
 	<div class="yui-b">
 
-<form name="input" action="/cgi-bin/koha/labels/label-create-profile.pl" method="get">
 
-<div class="yui-g">
+
 <h3>Create Printer Profile</h3>
 <!-- TMPL_IF NAME="dberror" -->
-<div class="yui-g first">
-<fieldset class="rows"><legend>Error Creating Profile</legend>
-<ol>
-<li>
+<div class="yui-g">
+<div class="dialog alert"><h3>Error Creating Profile</h3>
+<p>
     <!-- TMPL_VAR NAME="errmsg" --> 
-</li>
-</ol>
-</fieldset>
+</p>
 </div>
-<!-- TMPL_ELSE -->
-<div class="yui-g first">
+</div>
+<!-- /TMPL_IF -->
+<div class="yui-g">
+<form name="input" action="/cgi-bin/koha/labels/label-create-profile.pl" method="get">
 <fieldset class="rows"><legend>Profile Settings</legend>
 
 <ol>
@@ -55,28 +53,25 @@ function confirm_deletion(biblionumber,itemnumber) {
     <label for="paper_bin">Paper Bin:</label><input type="text"  size="20" name="paper_bin" id="paper_bin" />
 </li>
 <li>
-    <label for="tmpl_id">Template Code: </label><select id="tmpl_id" name="tmpl_id" />
+    <label for="tmpl_id">Template Code: </label><select id="tmpl_id" name="tmpl_id">
     <!-- TMPL_LOOP NAME="tmpllist" -->
         <option value="<!-- TMPL_VAR NAME="tmpl_id" -->"><!-- TMPL_VAR NAME="tmpl_code" --></option>
-    <!-- /TMPL_LOOP -->
+    <!-- /TMPL_LOOP --></select>
 </li>
 <li>
-    <label><h4>Offset:</h4></label>
-</li>
-<li>
-    <label for="offset_horz">Horizontal:</label><input type="text" size="2" name="offset_horz" id="offset_horz" />
-</li>
-<li>
-    <label for="offset_vert">Vertical:</label><input type="text"  size="2" name="offset_vert" id="offset_vert" />
-</li>
-<li>
-    <label><h4>Creep:</h4></label>
+    <fieldset><legend>Offset:</legend>
+    <ol><li><label for="offset_horz">Horizontal:</label><input type="text" size="2" name="offset_horz" id="offset_horz" /></li>
+    <li><label for="offset_vert">Vertical:</label><input type="text"  size="2" name="offset_vert" id="offset_vert" /></li></ol></fieldset>
 </li>
 <li>
+    <fieldset><legend>Creep:</legend>
+<ol><li>
     <label for="creep_horz">Horizontal:</label><input type="text" size="2" name="creep_horz" id="creep_horz" />
 </li>
 <li>
     <label for="creep_vert">Vertical:</label><input type="text" size="2" name="creep_vert" id="creep_vert" />
+</li></ol>
+</fieldset>
 </li>
 <li><label for="unit">Units: </label><select id="unit" name="unit">
     <!-- TMPL_LOOP NAME="unit" -->
@@ -87,13 +82,9 @@ function confirm_deletion(biblionumber,itemnumber) {
 </ol>
 </fieldset>
 <fieldset class="action">
-        <input type="submit" name="op" value="Save" />
-        <input type="reset" name="op" value="Reset" />
-        <input type="submit" name="op" value="Cancel" />
-</fieldset></div>
-<!-- /TMPL_IF -->
+        <input type="submit" name="op" value="Save" /> <a class="cancel" href="/cgi-bin/koha/labels/label-profiles.pl">Cancel</a>
+</fieldset></form></div>
 </div>
-</div></form>
 
 </div>
 <div class="yui-b">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
index d5dd9f993f..405304488d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
@@ -59,13 +59,13 @@
         <label for="rowgap">Gap between Rows:</label><input type="text" size="2" name="rowgap" id="rowgap" />
 </li>
 
-<li class="radio"><label for="fontsize">Font Size:</label> <input type="textbox" id="fontsize" name="fontsize"  size="1" value="" /></li>
-<li class="radio"><label for="active">Active: </label><input type="checkbox" id="active" name="active" /></li>
+<li><label for="fontsize">Font Size:</label> <input type="text" id="fontsize" name="fontsize"  size="1" value="" /></li>
+<li><label for="active">Active: </label><input type="checkbox" id="active" name="active" /></li>
 </ol>
 </fieldset>
-        <input type="hidden" name="op" value="create" />
+        <fieldset class="action"><input type="hidden" name="op" value="create" />
         <input type="submit" value="Save" />
-        <input type="reset" value="Reset" />
+        <a class="cancel" href="/cgi-bin/koha/labels/label-home.pl">Cancel</a></fieldset>
 </form>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
index d2a2d7b2a9..fbe889438e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha -- Labels</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Labels</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -14,12 +14,14 @@
 	<div class="yui-b">
 
 <form name="input" action="/cgi-bin/koha/labels/label-manager.pl" method="get">
+<fieldset class="rows">
+<legend>Edit Label Layout</legend>
+<ol>
+<li><label for="layoutname">Layout Name</label>
+<input type="text" name="layoutname" id="layoutname" size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" /></li>
 
-<h3>Layout Name</h3>
-<input type="textbox" name="layoutname"  size="20" value="<!-- TMPL_VAR NAME="layoutname" -->" />
-
-<h3>Choose Barcode Type (encoding)</h3>
-<select name="barcodetype">
+<li><label for="barcodetype">Choose Barcode Type (encoding)</label>
+<select name="barcodetype" id="barcodetype">
     <!-- TMPL_LOOP NAME="barcode_types" -->
 	<!-- TMPL_IF NAME="active" -->
         <option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
@@ -27,11 +29,11 @@
         <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
 	<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-</select>
+</select></li>
 
 
-<h3>Choose Layout Type</h3>
-<select name="printingtype">
+<li><label for="printingtype">Choose Layout Type</label>
+<select name="printingtype" id="printingtype">
     <!-- TMPL_LOOP NAME="printingtypes" -->
 <!-- TMPL_IF NAME="active" -->
 	<option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="desc" --></option>
@@ -39,16 +41,16 @@
         <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="desc" --></option>
 <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-</select>
+</select></li>
 
-
-<h3>
+<li><fieldset class="rows">
+<legend>
     Choose Order Of Text Fields to Print
-</h3>
+</legend>
 <table summary="fields to print">
 <tr>
         <td>
- <select name="tx_title">
+ <select name="tx_title" id="tx_title">
             <!-- TMPL_LOOP Name="tx_title" -->
 			<!-- TMPL_IF Name="selected" -->
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -61,10 +63,10 @@
 		<!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
             </select>
-        <label>Title</label>
+        <label for="tx_title">Title</label>
         </td>
             <td>
-        <select name="tx_subtitle">
+        <select name="tx_subtitle" id="tx_subtitle">
                  <!-- TMPL_LOOP Name="tx_subtitle" -->
          <!-- TMPL_IF Name="selected" -->
 				<option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -77,11 +79,11 @@
 			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
       </select>
-        <label>Subtitle</label>
+        <label for="tx_subtitle">Subtitle</label>
         </td> 
 
         <td>
-        <select name="tx_author">
+        <select name="tx_author" id="tx_author">
              <!-- TMPL_LOOP Name="tx_author" -->
 		<!-- TMPL_IF Name="selected" -->	 
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -94,12 +96,12 @@
 		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
-       <label>Author</label>
+       <label for="tx_author">Author</label>
         </td>
 </tr> 
  <tr>
         <td>
-        <select name="tx_isbn">
+        <select name="tx_isbn" id="tx_isbn">
               <!-- TMPL_LOOP Name="tx_isbn" -->
 		<!-- TMPL_IF Name="selected" -->	  
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -112,11 +114,11 @@
 		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
-      <label>ISBN</label>
+      <label for="tx_isbn">ISBN</label>
         </td>
 
         <td>
-        <select name="tx_issn">
+        <select name="tx_issn" id="tx_issn">
                <!-- TMPL_LOOP Name="tx_issn" -->
 		<!-- TMPL_IF Name="selected" -->	   
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -129,9 +131,10 @@
 		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
-     <label>ISSN</label>
+     <label for="tx_issn">ISSN</label>
+	 </td>
         <td>
-        <select name="tx_itemtype">
+        <select name="tx_itemtype" id="tx_itemtype">
                  <!-- TMPL_LOOP Name="tx_itemtype" -->
 		<!-- TMPL_IF Name="selected" -->		 
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -144,12 +147,12 @@
 		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
             </select>
-   <label>Itemtype</label>
+   <label for="tx_itemtype">Itemtype</label>
         </td>
   </tr>
 <tr>
         <td>
-        <select name="tx_dewey">
+        <select name="tx_dewey" id="tx_dewey">
                 <!-- TMPL_LOOP Name="tx_dewey" -->
 		<!-- TMPL_IF Name="selected" -->		
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -162,10 +165,10 @@
 			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
        </select>
-        <label>Dewey</label>
+        <label for="tx_dewey">Dewey</label>
         </td>
         <td>
-        <select name="tx_barcode">
+        <select name="tx_barcode" id="tx_barcode">
                  <!-- TMPL_LOOP Name="tx_barcode" -->
 		<!-- TMPL_IF Name="selected" -->		 
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -178,10 +181,10 @@
 			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
       </select>
-        <label>Barcode (as text)</label>
+        <label for="tx_barcode">Barcode (as text)</label>
         </td>
         <td>
-        <select name="tx_classif">
+        <select name="tx_classif" id="tx_classif">
                   <!-- TMPL_LOOP Name="tx_classif" -->
 		<!-- TMPL_IF Name="selected" -->		    
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -194,12 +197,12 @@
 		<!-- /TMPL_IF -->		
             <!-- /TMPL_LOOP -->
      </select>
-        <label>Classification</label>
+        <label for="tx_classif">Classification</label>
         </td>
 </tr> 
  <tr>
         <td>
-        <select name="tx_subclass">
+        <select name="tx_subclass" id="tx_subclass">
                   <!-- TMPL_LOOP Name="tx_subclass" -->
 		<!-- TMPL_IF Name="selected" -->		  
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -212,10 +215,10 @@
 			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
      </select>
-        <label>Subclass</label>
+        <label for="tx_subclass">Subclass</label>
         </td>
             <td>
-        <select name="tx_itemcallnumber">
+        <select name="tx_itemcallnumber" id="tx_itemcallnumber">
                  <!-- TMPL_LOOP Name="tx_itemcallnumber" -->
 			<!-- TMPL_IF Name="selected" -->	  
                 <option value="<!-- TMPL_VAR Name="num" -->" selected="selected">
@@ -228,30 +231,30 @@
 			<!-- /TMPL_IF -->	
             <!-- /TMPL_LOOP -->
       </select>
-        <label>Call Number</label>
+        <label for="tx_itemcallnumber">Call Number</label>
         </td>
 		<td>&nbsp;</td>
   </tr>
 </table>
+</fieldset></li>
+
+<li><label for="startlabel">Start printing from Label number: </label><input type="text" name="startlabel"  id="startlabel" size="1"  value="<!-- TMPL_VAR NAME="startlabel" -->" /></li>
 
 
-<h3>
-        Start printing from Label number: <input type="textbox" name="startlabel"  size="1"  value=" <!-- TMPL_VAR NAME="startlabel" --> " />
-</h3>
-
-<h3>Draw Guide Boxes 
+<li><label for="guidebox">Draw Guide Boxes</label>
 <!-- TMPL_IF NAME="guidebox"-->
-<input type="checkbox" name="guidebox" value="1"  checked="checked" />
+<input type="checkbox" name="guidebox" id="guidebox" value="1"  checked="checked" />
 <!-- TMPL_ELSE -->
-<input type="checkbox" name="guidebox" value="1" />
-<!-- /TMPL_IF -->
-</h3>
+<input type="checkbox" name="guidebox" id="guidebox" value="1" />
+<!-- /TMPL_IF --></li>
 
-<p>
-        <input type="submit" value="Submit" />
+</ol>
+</fieldset>
+<fieldset class="action">
+        <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/labels/label-home.pl">Cancel</a>
         <input type="hidden" name="op" value="save_layout" />
         <input type="hidden" name="layout_id" value="<!-- TMPL_VAR NAME="layout_id" -->" />
-</p>
+</fieldset>
 </form>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
index 1cec888eee..c16081e106 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
@@ -1,7 +1,8 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcodes and Labels: Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/javascript">
-<!--
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha &rsaquo; Barcodes and Labels &rsaquo; Search Results</title><!-- 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>
 
+<script type="text/javascript">
+//<![CDATA[
 function add_item(itemnum,batch_id){
 
  var getstr='';
@@ -36,41 +37,42 @@ function add_item3(itemnumber){
  var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"";
      window.opener.location.href = myurl;
 }
-
-//-->
+//]]>
 </script>
 </head>
 <body>
-<div id="main-compact">
-	<h1>Search results</h1>
+
+<div id="custom-doc" class="yui-t7">
+   <div id="bd">
+<h1>Search results</h1>
 	<div class="results">
 		<p >
-			<!-- TMPL_IF NAME=displayprev -->
+			<!-- TMPL_IF NAME="displayprev" -->
 				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">
 					&lt;&lt;
 				</a>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" -->
 					<span class="current"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
 					<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
+			<!-- TMPL_IF NAME="displaynext" -->
 				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</p>
 		<p>
-			<!-- TMPL_IF name=total -->
+			<!-- TMPL_IF name="result" -->
 			&nbsp;<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
 			<!-- TMPL_ELSE -->
 			&nbsp; No results found<br />
 			<!-- /TMPL_IF -->
 		</p>
 	</div>
-<form name='resultform'>
-	<span class="no"><a class="button" href="#" onclick="history.go(-1)" > &laquo; Back</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="icon addchecked" href="#" onclick="window.close()">[ Done ]</a></span>
+<form name="resultform">
+	<span class="no"><a class="button" href="#" onclick="history.go(-1)" > &laquo; Back</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="close" href="#">[ Done ]</a></span>
 <input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->); return false" />
 	<table>
 	<tr>
@@ -88,7 +90,7 @@ function add_item3(itemnumber){
 		<!-- /TMPL_IF -->
 			<td> <input type="checkbox" name="itemnumber" id="itm<!-- TMPL_VAR NAME="itemnumber" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	</td>
 			<td>
-					<p><b><!-- TMPL_VAR NAME="title" --></b>&nbsp;&nbsp;
+					<p><label for="itm<!-- TMPL_VAR NAME="itemnumber" -->" style="font-weight:bold;"><!-- TMPL_VAR NAME="title" --></label> 
 					<!-- TMPL_VAR NAME="author" -->
 					<p>[ <!-- TMPL_VAR NAME="itemtype" --> ]
 					<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
@@ -114,21 +116,20 @@ function add_item3(itemnumber){
 </form>
 	<div class="results">
 		<p>
-			<!-- TMPL_IF NAME=displayprev -->
+			<!-- TMPL_IF NAME="displayprev" -->
 			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&lt;&lt;</a>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" -->
 				<span class="current"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
 				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
+			<!-- TMPL_IF NAME="displaynext" -->
 			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</p>
-	</div> 
-</div>
+	</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 eec992df8a..be9344ed9a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -3,7 +3,7 @@
 <!-- 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 onload="document.getElementById('marclist').select();">
+<body>
 
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
@@ -14,12 +14,12 @@
 <!-- /TMPL_IF  -->
 </h1>
 
-<form name="f" method="post">
+<form name="f" method="post" action="/cgi-bin/koha/labels/label-item-search.pl">
 	<input type="hidden" name="op" value="do_search" />
 	<input type="hidden" name="batch_id" value="<!-- TMPL_VAR NAME="batch_id" -->" />
 	<fieldset class="rows">
 <ol><li>
-  <select name="idx" disabled><!-- FIXME: script does keyword search regardless -->
+  <select name="idx" disabled="disabled"><!-- FIXME: script does keyword search regardless -->
     <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>
     <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
@@ -34,9 +34,9 @@
     <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" id="marclist" name="marclist" title="Enter search terms" value=""/>  
+   <input type="text" size="30" id="marclist" name="marclist" class="focus" title="Enter search terms" value=""/>  
 </li><li>
-<select name="idx" disabled><!-- FIXME: script does keyword search regardless -->
+<select name="idx" disabled="disabled"><!-- FIXME: script does keyword search regardless -->
     <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>
     <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
@@ -51,7 +51,7 @@
     <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="" disabled/><!-- FIXME: script doesn't "catch" q param -->
+   <input type="text" size="30" name="q" title="Enter search terms" value="" disabled="disabled" /><!-- FIXME: script doesn't "catch" q param -->
 </li>
 </ol>
 </fieldset>
@@ -117,7 +117,7 @@
 -->
     <tr><th scope="row">Document Type</th>
                 <td colspan="2">
-                    <select name="Filter" disabled><!-- FIXME: script returns ALL type regardless-->
+                    <select name="Filter" disabled="disabled"><!-- FIXME: script returns ALL type regardless-->
                         <option value="">All Item Types</option>
                         <!-- TMPL_LOOP name="itemtypeloop" -->
                             <!-- TMPL_IF name="selected" -->
@@ -133,7 +133,7 @@
 	</table>
 	<br />
 </fieldset>
-<p><input style="margin-top:5px;" type="submit" value="Start search" class="submit" /></p>
+<fieldset class="action"><input type="submit" value="Start search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
 </form>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->