diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 064dcf0b35..b8f8943169 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -212,8 +212,9 @@ sub create_input {
                         name=\"".$subfield_data{id}."\"
       value=\"$value\"
       class=\"input_marceditor\"
-                        tabindex=\"1\"                     
-      DISABLE READONLY \/>
+      tabindex=\"1\"                     
+      disabled=\"disabled\"
+	  readonly=\"readonly\" \/>
       <span class=\"buttonDot\"
         onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}')\">...</span>
     ";
@@ -236,12 +237,12 @@ sub create_input {
         $subfield_data{marc_value} =
     "<input tabindex=\"1\"
                         type=\"text\"
-                        id=".$subfield_data{id}."
-      name=".$subfield_data{id}."
+                        id=\"".$subfield_data{id}."\"
+      name=\"".$subfield_data{id}."\"
       value=\"$value\"
                         class=\"input_marceditor\"
-      onfocus=\"javascript:Focus$function_name($index_tag)\"
-      onblur=\"javascript:Blur$function_name($index_tag); \" \/>
+      onfocus=\"Focus$function_name($index_tag)\"
+      onblur=\"Blur$function_name($index_tag); \" \/>
     <span class=\"buttonDot\"
       onclick=\"Clic$function_name('$subfield_data{id}')\">...</a>
     $javascript";
@@ -251,16 +252,16 @@ sub create_input {
         $subfield_data{marc_value} =
             "<input tabindex=\"1\"
                     type=\"hidden\"
-                    id=".$subfield_data{id}."
-                    name=".$subfield_data{id}."
+                    id=\"".$subfield_data{id}."\"
+                    name=\"".$subfield_data{id}."\"
                     value=\"$value\" \/>
             ";
     }
     elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) {
         $subfield_data{marc_value} =
             "<input type=\"text\"
-                    id=".$subfield_data{id}."
-                    name=".$subfield_data{id}."
+                    id=\"".$subfield_data{id}."\"
+                    name=\"".$subfield_data{id}."\"
                     class=\"input_marceditor\"
                     tabindex=\"1\"
                     value=\"$value\"
@@ -282,8 +283,8 @@ sub create_input {
             $subfield_data{marc_value} =
                 "<textarea cols=\"70\"
                            rows=\"4\"
-                           id=".$subfield_data{id}."
-                           name=".$subfield_data{id}."
+                           id=\"".$subfield_data{id}."\"
+                           name=\"".$subfield_data{id}."\"
                            class=\"input_marceditor\"
                            tabindex=\"1\"
                            >$value</textarea>
@@ -292,8 +293,8 @@ sub create_input {
         else {
             $subfield_data{marc_value} =
                 "<input type=\"text\"
-                        id=".$subfield_data{id}."
-                        name=".$subfield_data{id}."
+                        id=\"".$subfield_data{id}."\"
+                        name=\"".$subfield_data{id}."\"
                         value=\"$value\"
                         tabindex=\"1\"
                         class=\"input_marceditor\"
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 f80f84ba15..b1de927f5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -653,15 +653,15 @@ fieldset.rows fieldset.action {
     background: none;
 }
 
-#patronlists .tabs-nav a {
+.toptabs .tabs-nav a {
     top: 0;
  }
 
-#patronlists .tabs-nav li {
+.toptabs .tabs-nav li {
 	margin-right : .5em;
 }
 
-#patronlists .tabs-nav li a {
+.toptabs .tabs-nav li a {
 	background-color : #F3F3F3;
 	border-top : 1px solid #E8E8E8;
 	border-left : 1px solid #E8E8E8;
@@ -671,11 +671,11 @@ fieldset.rows fieldset.action {
 	text-decoration : none;
 }
 
-#patronlists .tabs-nav li.tabs-selected  {
+.toptabs .tabs-nav li.tabs-selected  {
 	background-color : #FFF;
 }
 
-#patronlists .tabs-nav li.tabs-selected a {
+.toptabs .tabs-nav li.tabs-selected a {
 	background-color : #FFF;
 	border-top : 1px solid #E8E8E8;
 	border-left : 1px solid #E8E8E8;
@@ -685,6 +685,15 @@ fieldset.rows fieldset.action {
 	text-align : center;
 }
 
+.toptabs.numbered .tabs-nav li {
+	min-width : 3em;
+}
+
+.toptabs .tabs-container {
+	border : 1px solid #E8E8E8;
+	padding : 1em;
+}
+
 .checkedout {
 	color : #999999;
 	font-style : italic;
@@ -738,3 +747,7 @@ fieldset.rows fieldset.action {
 	background-repeat : no-repeat;
 }
 
+.labelsubfield{
+    min-width:210px;
+    display:inline;
+}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index 56a80af942..58785a01fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -1,22 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<Title>Koha -- Authority details</title>
+<title>Koha -- Authority details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <script type="text/javascript">
 //<![CDATA[
 
-function active(numlayer)
-{
-    for (i=0; i < 10 ; i++ ) {
-        ong = i+"XX";
-        link = "link"+i;
-        if (numlayer==i) {
-                document.getElementById(ong).style.visibility="visible";
-        } else {
-                document.getElementById(ong).style.visibility="hidden";
-        }
-    }
-}
+	 $(document).ready(function() {
+ 		$('#authoritytabs').tabs();
+	 });
+
 /**
  * check if mandatory subfields are writed
  */
@@ -376,6 +368,12 @@ function searchauthority() {
 }
 //]]>
 </script>
+<style type="text/css">
+	#authoritytabs {
+		margin-top : 1em;
+		margin-bottom : 1em;
+	}
+</style>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -393,7 +391,7 @@ function searchauthority() {
 <!-- TMPL_ELSE -->
 <h1>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- /TMPL_IF -->  
-<form method="post" name="f">
+<form method="post" name="f" action="/cgi-bin/koha/authorities/authorities.pl">
     <input type="hidden" name="op" value="add" />
     <input type="hidden" name="addfield_field" value="" />
     <input type="hidden" name="repeat_field" value="" />
@@ -419,25 +417,24 @@ function searchauthority() {
         </div>
 <!-- /TMPL_IF -->
 
+<div id="authoritytabs" class="toptabs numbered">
 <!--TMPL_UNLESS Name="singletab"-->
-<div id="tabs">
-        <!-- TMPL_LOOP name="BIG_LOOP" -->
-            <!-- TMPL_IF name="number" -->
-                <a href="JavaScript:active(<!-- TMPL_VAR name="number"-->)" class="tab_inactive" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+       <ul> <!-- TMPL_LOOP name="BIG_LOOP" -->
+            <li><!-- TMPL_IF name="number" -->
+                <a href="/cgi-bin/authorities/authorties.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
             <!-- TMPL_ELSE -->
-                <a href="JavaScript:active(<!-- TMPL_VAR name="number"-->)" class="tab_active" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
-            <!-- /TMPL_IF -->
-        <!--  /TMPL_LOOP -->
-</div>
+                <a href="/cgi-bin/authorities/authorties.pl#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a>
+            <!-- /TMPL_IF --></li>
+        <!--  /TMPL_LOOP --></ul>
 <!--/TMPL_UNLESS-->
 
 <!-- TMPL_LOOP name="BIG_LOOP" -->
 <!-- hide every tab except the 1st -->
 <!--TMPL_UNLESS Name="singletab"-->
     <!-- TMPL_IF name="number" -->
-        <div id="<!-- TMPL_VAR name="number" -->XX" class="content_hidden">
+        <div id="tab<!-- TMPL_VAR name="number" -->XX">
     <!-- TMPL_ELSE -->
-        <div id="0XX" class="content_visible">
+        <div id="tab<!-- TMPL_VAR name="number" -->XX">
     <!-- /TMPL_IF -->
 <!-- /TMPL_UNLESS -->
     
@@ -449,23 +446,21 @@ function searchauthority() {
                 <span title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></span>
                 <!-- TMPL_IF NAME="fixedfield" -->
                 <input tabindex="1"
-                            class="indicator"
+                            class="indicator flat"
                             type="text"
                             style="display:none;"
                             name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
                             size="2"
                             maxlength="2"
-                            value="<!-- TMPL_VAR NAME="indicator" -->"
-                            class="flat" />
+                            value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- TMPL_ELSE -->
                 <input tabindex="1"
-                            class="indicator"
+                            class="indicator flat"
                             type="text"
                             name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
                             size="2"
                             maxlength="2"
-                            value="<!-- TMPL_VAR NAME="indicator" -->"
-                            class="flat" />
+                            value="<!-- TMPL_VAR NAME="indicator" -->" />
                 <!-- /TMPL_IF --> -
             <!-- TMPL_ELSE -->
                 <!-- TMPL_IF NAME="fixedfield" -->
@@ -482,7 +477,7 @@ function searchauthority() {
             <!-- /TMPL_UNLESS -->
 
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-            <a onClick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')"><!-- TMPL_VAR NAME="tag_lib" --></a>
+            <a onclick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')"><!-- TMPL_VAR NAME="tag_lib" --></a>
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="repeatable" -->
                 <span class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->')">+</span>
@@ -500,7 +495,7 @@ function searchauthority() {
                 <!-- /TMPL_UNLESS --> 
                 
                 <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/../img/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')"/>
+                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/../img/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')" alt="Move Up" title="Move Up" />
                         <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->"
                             style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text"
                             name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
@@ -540,6 +535,7 @@ function searchauthority() {
 <!--TMPL_UNLESS Name="singletab"-->
 </div>	
 <!--/TMPL_UNLESS-->
+</div>
 
 <div name="hidden" id="hidden" class="tab">
 <!-- TMPL_LOOP NAME="hidden_loop" -->
@@ -563,9 +559,9 @@ function searchauthority() {
 <!-- /TMPL_IF -->
 <div id="action">
     <!-- TMPL_IF name="authid" -->
-        <input type="button" value="Save" onClick="Check(this.form)" accesskey="w" />
+        <input type="button" value="Save" onclick="Check(this.form)" accesskey="w" />
     <!-- TMPL_ELSE -->
-        <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" />
+        <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" />
     <!-- /TMPL_IF -->
 </div>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 363a183798..65a13f3f34 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -607,7 +607,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 </fieldset>
 </form>
 
-<div id="patronlists">
+<div id="patronlists" class="toptabs">
 
 <ul>   
 <li>    <!--TMPL_IF NAME="issuecount"-->