diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tmpl
index f3e32b0389..b1ee71caa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tmpl
@@ -1,70 +1,82 @@
-    <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->i
+    <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
     <title>Koha &rsaquo; Tools &rsaquo; Labels</title>
     <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+	<script type="text/javascript">
+        //<![CDATA[
+		$(document).ready(function(){
+		var selectedUnit = $("#units option:selected").attr("value");
+		var unitfields = $("#offset_horz,#offset_vert,#creep_horz,#creep_vert");
+		$(unitfields).after("<span class=\"unit\">"+getUnit(selectedUnit)+"</span>");
+		$("#units").change(function(){
+			$(".unit").html(getUnit($(this).val()));
+		});
+		function getUnit(unit){
+			switch(unit){
+				case "POINT":
+					var unit = " pt";
+					break;
+				case "AGATE":
+					var unit = " ag";
+					break;
+				case "INCH":
+					var unit = " in";
+					break;
+				case "MM":
+					var unit = " mm";
+					break;
+				case "CM":
+					var unit = " cm";
+					break;
+				default:
+					var unit = "";
+			}
+			return unit;
+		}
+		});
+        //]]>
+	</script>
 </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;
-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>&rsaquo;
-        <a href="/cgi-bin/koha/labels/label-home.pl">Labels</a>&rsaquo;
-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer Profiles</a>&rsaquo;
+        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
+        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
+        <a href="/cgi-bin/koha/labels/label-home.pl">Labels</a> &rsaquo;
+        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer Profiles</a> &rsaquo;
         Edit Printer Profile
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
 	    <div id="yui-main">
 	        <div class="yui-b">
-                    <form name="input" action="/cgi-bin/koha/labels/label-edit-profile.pl" method="get">
                         <div class="yui-g">
                             <h3>Edit Printer Profile</h3>
                                 <div class="yui-g first">
-                                    <fieldset class="rows"><legend>Profile Settings</legend>
+                    <form name="input" action="/cgi-bin/koha/labels/label-edit-profile.pl" method="get">
+                                    <fieldset class="rows"><legend>Profile settings</legend>
                                         <ol>
                                             <li>
-                                                <label for="printer_name">Printer Name:</label>
                                                 <!-- TMPL_IF NAME="profile_id" -->
-                                                 <!-- TMPL_VAR NAME="printer_name" -->
+                                                 <span class="label">Printer name:</span><!-- TMPL_VAR NAME="printer_name" -->
                                                 <!-- TMPL_ELSE -->
-                                                <input type="text"  size="20" name="printer_name" id="printer_name" />
+                                                <label for="printer_name">Printer name:</label><input type="text"  size="20" name="printer_name" id="printer_name" />
                                                 <!-- /TMPL_IF -->
                                             </li>
                                             <li>
-                                                <label for="paper_bin">Paper Bin:</label>
                                                 <!-- TMPL_IF NAME="profile_id" -->
-                                                <!-- TMPL_VAR NAME="paper_bin" -->
+												<span class="label">Paper bin:</span> <!-- TMPL_VAR NAME="paper_bin" -->
                                                 <!-- TMPL_ELSE -->
-                                                <input type="text"  size="20" name="paper_bin" id="paper_bin" />
+                                                <label for="paper_bin">Paper bin:</label><input type="text"  size="20" name="paper_bin" id="paper_bin" />
                                                 <!-- /TMPL_IF -->
                                             </li>
                                             <li>
-                                                <label for="template_name">Template Name:</label>
                                                 <!-- TMPL_IF NAME="label_template" -->
-                                                 <!-- TMPL_VAR NAME="label_template" -->
+                                                 <label for="template_name">Template name:</label> <!-- TMPL_VAR NAME="label_template" -->
                                                 <!-- TMPL_ELSE -->
-                                                 Profile Unassigned
+                                                 <span class="label">Template name:</span> Profile Unassigned
                                                 <!-- /TMPL_IF -->
                                             </li>
-                                            </li>
-                                            <li>
-                                                <label><h4>Offset:</h4></label>
-                                            </li>
-                                            <li>
-                                                <label for="offset_horz">Horizontal: </label><input type="text"  size="4" name="offset_horz" id="offset_horz" value="<!-- TMPL_VAR NAME="offset_horz" -->" />
-                                            </li>
-                                            <li>
-                                                <label for="offset_vert">Vertical: </label><input type="text" size="4" name="offset_vert" id="offset_vert" value="<!-- TMPL_VAR NAME="offset_vert" -->" />
-                                            </li>
-                                            <li>
-                                                <label><h4>Creep:</h4></label>
-                                            </li>
-                                            <li>
-                                                <label for="creep_horz">Horizontal: </label><input type="text"  size="4" name="creep_horz" id="creep_horz" value="<!-- TMPL_VAR NAME="creep_horz" -->" />
-                                            </li>
-                                            <li>
-                                                <label for="creep_vert">Vertical: </label><input type="text" size="4" name="creep_vert" id="creep_vert" value="<!-- TMPL_VAR NAME="creep_vert" -->" />
-                                            </li>
                                             <li>
                                                 <label for="units">Units: </label>
                                                 <select id="units" name="units">
@@ -79,18 +91,40 @@
                                                     <!-- /TMPL_LOOP -->
                                                 </select>
                                             </li>
+                                         </ol>
+										</fieldset>
+										
+										<fieldset class="rows"><legend>Offset:</legend>
+										<ol>
+                                            <li>
+                                                <label for="offset_horz">Horizontal: </label><input type="text"  size="4" name="offset_horz" id="offset_horz" value="<!-- TMPL_VAR NAME="offset_horz" -->" />
+                                            </li>
+                                            <li>
+                                                <label for="offset_vert">Vertical: </label><input type="text" size="4" name="offset_vert" id="offset_vert" value="<!-- TMPL_VAR NAME="offset_vert" -->" />
+                                            </li>
+                                         </ol>
+										</fieldset>
+										
+										<fieldset class="rows"><legend>Creep:</legend>
+										<ol>
+                                            <li>
+                                                <label for="creep_horz">Horizontal: </label><input type="text"  size="4" name="creep_horz" id="creep_horz" value="<!-- TMPL_VAR NAME="creep_horz" -->" />
+                                            </li>
+                                            <li>
+                                                <label for="creep_vert">Vertical: </label><input type="text" size="4" name="creep_vert" id="creep_vert" value="<!-- TMPL_VAR NAME="creep_vert" -->" />
+                                            </li>
                                         </ol>
                                     </fieldset>
                                     <fieldset class="action">
-                                        <span class="yui-button yui-link-button"><span class="first-child"><input type="submit" value="Save" /></span></span>
-                                        <span class="yui-button yui-link-button"><span class="first-child"><input type="button" value="Cancel" onclick="window.location='/cgi-bin/koha/labels/label-manage.pl?label_element=profile';" /></span></span>
+                                        <input type="submit" value="Save" />
+                                        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile" class="cancel">Cancel</a>
                                         <input type="hidden" name="op" value="save" />
                                         <input type="hidden" name="profile_id" value="<!-- TMPL_VAR NAME="profile_id" -->" />
                                     </fieldset>
+                    </form>
                                 </div>
                             </div>
                         </div>
-                    </form>
                 </div>
                 <div class="yui-b">
                     <!-- TMPL_INCLUDE NAME="labels-menu.inc" -->