diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
index e616252255..f63511192b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
@@ -1,21 +1,19 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <div id="mainbloc">
 
-<h1>Acquisitions</h1>
+<h1 class="acquisition">Acquisitions</h1>
 <div id="bloc25">
-	<div id="bloctitle">Start, receive, modify order</div>
-	Supplier name :
+	<h2 class="acquisition">Start, receive, modify order</h2>
 		<form action="/cgi-bin/koha/acqui/order.pl" method=post>
-			<input type="text"  size="25"   name="supplier">
-			<input type="submit" class="button" value="OK">
+			Supplier name : <input type="text"  size="25"   name="supplier">
+			<input type="submit" class="button acquisition" value="OK">
 		</form>
 </div>
 <div id="bloc25">
-	<div id="bloctitle">Receive or modify periodical order</div>
-	Title Search
+	<h2 class="acquisition">Receive or modify periodical order</h2>
 	<form action="/cgi-bin/koha/acqui/acquire.pl" method=post>
-		<input type="text"  size="25"   name="recieve">
-		<input type="submit" class="button" value="OK">
+		Title Search : <input type="text"  size="25"   name="recieve">
+		<input type="submit" class="button acquisition" value="OK">
 	</form>
 </div>
 
@@ -23,7 +21,7 @@
 <div id="bloc25">
 	<form action="/cgi-bin/koha/currency.pl">
 	<input type=hidden name=type value=change>
-	<div id="bloctitle">exchange rates</div>
+	<h2 class="acquisition">exchange rates</h2>
 	<table>
 	<!-- TMPL_LOOP name="loop_currency" -->
 		<tr>
@@ -36,36 +34,36 @@
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
-	<input type=submit value="Save" class="button">
+	<input type=submit value="Save" class="button acquisition">
 </div>
 
 <!-- showbudget-->
 <div id="bloc25">
 	<form action="/cgi-bin/koha/search.pl">
-		<div id="bloctitle">budgets and bookfunds</div>
+		<h2 class="acquisition">budgets and bookfunds</h2>
 		<table>
 			<tr>
-				<td><b>Budgets</B></td>
-				<td><b> Total</B></td>
-				<td><b>Spent</B></td>
-				<td><b>Comtd</B></td>
-				<td><b>Avail</B></td>
+				<th class="acquisition">Budgets</th>
+				<th class="acquisition">Total</th>
+				<th class="acquisition">Spent</th>
+				<th class="acquisition">Comtd</th>
+				<th class="acquisition">Avail</th>
 			</tr>
 			<!-- TMPL_LOOP name="loop_budget" -->
 				<tr>
 					<td><!-- TMPL_VAR name="bookfundname" --></td>
-					<td align=right><!-- TMPL_VAR name="budgetamount" --></td>
-					<td align=right><!-- TMPL_VAR name="spent" --></td>
-					<td align=right><!-- TMPL_VAR name="comtd" --></td>
-					<td align=right><!-- TMPL_VAR name="avail" --></td>
+					<td align="right"><!-- TMPL_VAR name="budgetamount" --></td>
+					<td align="right"><!-- TMPL_VAR name="spent" --></td>
+					<td align="right"><!-- TMPL_VAR name="comtd" --></td>
+					<td align="right"><!-- TMPL_VAR name="avail" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 			<tr>
-				<td><b> Total</b></td>
-				<td align=right><b><!-- TMPL_VAR name="total" --></b></td>
-				<td align=right><b><!-- TMPL_VAR name="totspent" --></b></td>
-				<td align=right><b><!-- TMPL_VAR name="totcomtd" --></b></td>
-				<td align=right><b><!-- TMPL_VAR name="totavail" --></b></td>
+				<th class="acquisition" align="right">Total</th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR name="total" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR name="totspent" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR name="totcomtd" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR name="totavail" --></th>
 			</tr>
 		</table>
 		<p>
@@ -74,11 +72,15 @@
 	</form>
 </div>
 
-<div id="bloc100">
-	<div id="bloctitle">HELP Ordering:</div>
-	<ul>To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.</ul>
-	<ul>Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to </ul>
-	<ul>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </ul>
-	<p>To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".</p>
-</DIV>
+<div id="bloc25">
+	<h2 class="acquisition">HELP Ordering</h2>
+	<ul>
+		<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.</p>
+		<p>Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to </p>
+		<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.</p>
+		<p>To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".</p>
+	</ul>
+</div>
+
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc
index 23ecb58ed2..608b4be336 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc
@@ -2,13 +2,12 @@
 
 <html>
 <head>
-<title>KOHA: INTRANET: Parameters</title>
+<title>KOHA: INTRANET: About</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
 </head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
+<body>
 
 <style>
 
@@ -27,48 +26,18 @@ a.about:hover {
 </style>
 
 <!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="#dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=70%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-					</td>
-					<td>
-						<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a>
-					</td>
-					<td>
-						<a class="members" href="/cgi-bin/koha/members-home.pl">Members</a>
-					</td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-					</td>
-					<td>
-						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-					</td>
-					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-					</td>
-					<td>
-						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-					</td>
-					<td>
-						<a class="about" href="/cgi-bin/koha/about.pl">About</a>
-					</td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<BLOCKQUOTE>
+<div id="menubar">
+	<span class="koha">KOHA</span>
+	<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
+	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a>
+	<a class="members" href="/cgi-bin/koha/members-home.pl">Members</a>
+	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
+	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
+	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
+	<a class="about" href="/cgi-bin/koha/about.pl">About</a>
+</div>
+
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
 <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
index 3fd25004bf..075bbc4a78 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
@@ -2,10 +2,9 @@
 <p> &nbsp; </p>
 
 
-</BLOCKQUOTE>
+</blockquote>
 
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
+<center>
 <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">Members</a> ||
@@ -15,8 +14,7 @@
 <A HREF="/cgi-bin/koha/admin-home.pl">Parameters</a> ||
 <A HREF="/cgi-bin/koha/about.pl">About</a> || 
 Help
-</FONT>
-</CENTER>
-</BODY>
+</center>
+</body>
 
-</HTML>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
index fa6f16494d..af9ef24afd 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
@@ -44,8 +44,7 @@ a.catalogue:hover {
 </div>
 <div id="submenu">
 	<span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet" class="submenu">Quick search</a>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet" class="submenu2">MARC search</a>
+	<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet" class="submenu2">search</a>
 	<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtual shelves</a>
 	<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="submenu2">Add biblio</a>
 	<a href="/cgi-bin/koha/maint/catmaintain.pl" class="submenu">Cat maintenance</a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
index e98f4adf44..2257e38209 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
@@ -6,6 +6,10 @@ body {
 	background-color:#99CC33;
 }
 
+input {
+	display:inline;
+}
+
 p {
 	margin-bottom:0px;
 	margin-top:0px;
@@ -20,7 +24,7 @@ p {
 
 label {
 	float:left;
-	width: 10em;
+	width: 6em;
 	display:inline;
 }
 label20 {
@@ -31,7 +35,7 @@ label20 {
 label100 {
 	float:left;
 	width: 10em;
-	display:block;
+	display:inline;
 }
 
 
@@ -101,7 +105,7 @@ h1 {
 	color:#000000;
 	background-color:#DDDDDD;
 	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
-	font-size: 125%;
+	font-size: 150%;
 	text-align:center;
 	padding: 4px;
 	border: 4px inset #666666;
@@ -112,7 +116,21 @@ h2 {
 	margin-bottom:4px;
 	text-align:center;
 	padding:0px;
+	font-size:125%;
+	padding-left:10px;
+	padding-right:10px;
+	padding-bottom:3px;
+	padding-top:3px;
 }
+
+h3 {
+	margin-top:0px;
+	margin-bottom:4px;
+	padding:0px;
+	font-size:100%;
+	font-weight:bold;
+}
+
 #bloctitle{
 	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
 	color:#000000;
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css b/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css
index 156c5fbd83..fd9e81fd6b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/marc-editor.css
@@ -26,34 +26,16 @@ div.tabs a {
 	color: #FFFFFF;
 	border: thin solid black;
 	margin-right: 2px;
-	padding: 20px 10px;
+	padding: 10px 10px;
 	-moz-border-radius: 5px 0px 0px 5px;
 }
 
 div.tab {
-	display: none;
-	width:95%;
-	text-align: center;
-	background-color:white;
-}
-
-div.tab:target {
 	width:90%;
 	text-align: center;
 	display: block;
+	visibility:hidden;
 	position:absolute;
 	margin-left:70px;
 	margin-top:100px;
 }
-
-:target div.tab {
-	width:100%;
-	text-align: center;
-	display: block;
-	position:absolute;
-	margin-left:10%;
-}
-
-:target div.tab{
-	display: none;
-}
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
index 5e5d233a4f..5a6979bc63 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
@@ -37,8 +37,8 @@
 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/thesaurus.pl>Thesaurus</a></td>
-	<td>Management of thesaurus and authorities files.</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/authtypes.pl>Thesaurus Structure</a></td>
+	<td>Define categories and thesaurus/authority MARC structure.</td>
 </tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/marctagstructure.pl>MARC tag structure</a></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl
index c9645c1115..697b14cbec 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl
@@ -1,129 +1,132 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<table width="100%" cellpadding=5 cellspacing=5>
-	<tr background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
-		<td><b>Test</b></td>
-		<td><b>Result</b></td>
-	</tr>
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemnum" -->
-	<tr>
-		<td><b>itemnum</b></td>
-		<td><li>The field itemnum MUST be mapped </li>
-			<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>itemnum : the field itemnumber is mapped to a field in tab -1</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemfields" -->
-	<tr>
-		<td><b>item fields</b></td>
-		<td>ALL items fields MUST :<br/>
-			<li>be mapped to the same tag,</li>
-			<li>and they must all be in the 10 (items) tab</li></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>All item fields are in the same tag and in item tab</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemtypes_empty" -->
-	<tr>
-		<td><b>itemtypes table empty</b></td>
-		<td>the itemtypes table is empty. It must contain at least 1 value</td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>itemtypes table filled with at least 1 value</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemtype" -->
-	<tr>
-		<td><b>itemtype NOT mapped</b></td>
-		<td>the biblioitems.itemtype field MUST :<br/>
-			<li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised_value=itemtype</li></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>biblioitems.itemtype defined</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="branches_empty" -->
-	<tr>
-		<td><b>branch table empty</b></td>
-		<td>the branch table is empty. It must contain at least 1 value !</td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>branch table filled with at least 1 value</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="branch" -->
-	<tr>
-		<td><b>homebranch NOT mapped</b></td>
-		<td>the items.homebranch field MUST :<br/>
-			<li>be mapped to a MARC subfield,</li>
-			<li>the correspounding subfield MUST have authorised value=branches</li></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>homebranch defined</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="holdingbranch" -->
-	<tr>
-		<td><b>holdingbranch NOT mapped</b></td>
-		<td>the items.holdingbranch field MUST :<br/>
-			<li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised value=branches</li></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>holdingbranch defined</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="biblionumber" -->
-	<tr>
-		<td><b>biblio and biblionumber</b></td>
-		<td>The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :<br/>
-			<li>be mapped to a MARC subfield,</li>
-			<li>be in the SAME tag (for example : 090$a and 090$b)</li>
-			<li>be in tab -1</li></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td><i>biblionumber and biblioitemnumber mapped correctly</i></td>
-	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="total" -->
-	<tr>
-		<td><b>TOTAL</b></td>
-		<td>You have <b><!-- TMPL_VAR name="total" --></b> error(s) in your MARC configuration. Please fix them before using koha</td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>&nbsp;</td>
-		<td><b>Configuration OK, you don't have errors in your MARC parameters table</b></td>
-	</tr>
-<!-- /TMPL_IF -->
-</table>
+<div id="mainbloc">
+	<h1>Checking MARC setup</h1>
+	<table>
+		<tr>
+			<th>Test</th>
+			<th>Result</th>
+		</tr>
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="itemnum" -->
+		<tr>
+			<td><b>itemnum</b></td>
+			<td><li>The field itemnum MUST be mapped </li>
+				<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>itemnum : the field itemnumber is mapped to a field in tab -1</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="itemfields" -->
+		<tr>
+			<td><b>item fields</b></td>
+			<td>ALL items fields MUST :<br/>
+				<li>be mapped to the same tag,</li>
+				<li>and they must all be in the 10 (items) tab</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>All item fields are in the same tag and in item tab</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="itemtypes_empty" -->
+		<tr>
+			<td><b>itemtypes table empty</b></td>
+			<td>the itemtypes table is empty. It must contain at least 1 value</td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>itemtypes table filled with at least 1 value</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="itemtype" -->
+		<tr>
+			<td><b>itemtype NOT mapped</b></td>
+			<td>the biblioitems.itemtype field MUST :<br/>
+				<li>be mapped to a MARC subfield, </li>
+				<li>the correspounding subfield MUST have authorised_value=itemtype</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>biblioitems.itemtype defined</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="branches_empty" -->
+		<tr>
+			<td><b>branch table empty</b></td>
+			<td>the branch table is empty. It must contain at least 1 value !</td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>branch table filled with at least 1 value</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="branch" -->
+		<tr>
+			<td><b>homebranch NOT mapped</b></td>
+			<td>the items.homebranch field MUST :<br/>
+				<li>be mapped to a MARC subfield,</li>
+				<li>the correspounding subfield MUST have authorised value=branches</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>homebranch defined</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="holdingbranch" -->
+		<tr>
+			<td><b>holdingbranch NOT mapped</b></td>
+			<td>the items.holdingbranch field MUST :<br/>
+				<li>be mapped to a MARC subfield, </li>
+				<li>the correspounding subfield MUST have authorised value=branches</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>holdingbranch defined</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="biblionumber" -->
+		<tr>
+			<td><b>biblio and biblionumber</b></td>
+			<td>The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :<br/>
+				<li>be mapped to a MARC subfield,</li>
+				<li>be in the SAME tag (for example : 090$a and 090$b)</li>
+				<li>be in tab -1</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>biblionumber and biblioitemnumber mapped correctly</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!------------------------------------------------------------------------------------------------------------>
+	<!-- TMPL_IF name="total" -->
+		<tr>
+			<td><b>TOTAL</b></td>
+			<td>You have <b><!-- TMPL_VAR name="total" --></b> error(s) in your MARC configuration. Please fix them before using koha</td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>&nbsp;</td>
+			<td><b>Configuration OK, you don't have errors in your MARC parameters table</b></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	</table>
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
index c804512deb..3c6298804c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl
@@ -1,183 +1,186 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<!-- TMPL_IF name="add_form" -->
-<!---------------------------------------------------------------------------->
-	<H1><!-- TMPL_VAR name="action" --></H1>
-	<p>Choose and validate 1 of the following for <b><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></b></p>
-	<table>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist0" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist1" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist2" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist3" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist4" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist5" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist6" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist7" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist8" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
-		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist9" -->
-		</td>
-		<td>
-			<INPUT type=submit value='OK'>
-		</td>
-	</form>
-	</tr>
-	<tr>
-		<td>
-			<p align="right">To "unmap", click ==></p>
-		</td>
-		<td>
-			<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=put>
-				<input type=hidden name=op value='add_validate'>
-				<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-				<input type="hidden" name="choice" value="">
-				<INPUT type=submit value='HERE'>
+<div id="mainbloc">
+	<!-- TMPL_IF name="add_form" -->
+	<!---------------------------------------------------------------------------->
+		<h1>Choose and validate 1 of the following for <b><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></b></h1>
+		<table>
+			<tr>
+				<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+					<td>
+						<input type=hidden name=op value='add_validate'>
+						<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<!-- TMPL_VAR name="marclist0" -->
+					</td>
+					<td>
+						<input type=submit value='OK' class="button">
+					</td>
+				</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist1" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
 			</form>
-		</td>
-	</tr>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist2" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist3" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist4" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist5" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist6" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist7" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist8" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+			<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<td>
+					<input type=hidden name=op value='add_validate'>
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<!-- TMPL_VAR name="marclist9" -->
+				</td>
+				<td>
+					<input type=submit value='OK' class="button">
+				</td>
+			</form>
+			</tr>
+			<tr>
+				<td>
+					<p align="right">To "unmap", click ==></p>
+				</td>
+				<td>
+					<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=put>
+						<input type=hidden name=op value='add_validate'>
+						<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+						<input type="hidden" name="choice" value="">
+						<input type=submit value='HERE' class="button">
+					</form>
+				</td>
+			</tr>
+		</table>
+	<!-- /TMPL_IF -->
+	
+	<!---------------------------------------------------------------------------->
+	<!-- TMPL_IF name="else" -->
+	<h1 class="parameters">MARC links<!-- TMPL_VAR name="tagfield" --></h1>
+	<p><b>NOTES :</b></p>
+	<ul>
+		<p>If you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
+		<p>If you change a link here, EVERY framework will be modified.</p>
+	</p>
+	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+	<!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK" class="button parameters">
+	</form>
+	
+	<table>
+		<tr>
+			<th width=10%>Koha field <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></th>
+			<th width=5%>Tag</th>
+			<th width=5%>Subfield</th>
+			<th width=42%>Lib</th>
+			<th width=8%>&nbsp;</th>
+		<!-- TMPL_LOOP name="loop" -->
+			<tr bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+				<td><b><!-- TMPL_VAR name="kohafield" --></b></td>
+				<td><!-- TMPL_VAR name="tagfield" --></td>
+				<td><!-- TMPL_VAR name="tagsubfield" --></td>
+				<td><!-- TMPL_VAR name="liblibrarian" --></td>
+				<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
 	</table>
-<!-- /TMPL_IF -->
-
-<!---------------------------------------------------------------------------->
-<!-- TMPL_IF name="else" -->
-<font SIZE=6><em>MARC links<!-- TMPL_VAR name="tagfield" --></em></font>
-<p><b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
-</p>
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-<!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK">
-</form>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Tag</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Subfield</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=42%><b>Lib</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%>
-<!-- TMPL_LOOP name="loop" -->
-<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
-	<td><b><!-- TMPL_VAR name="kohafield" --></b></td>
-	<td><!-- TMPL_VAR name="tagfield" --></td>
-	<td><!-- TMPL_VAR name="tagsubfield" --></td>
-	<td><!-- TMPL_VAR name="liblibrarian" --></td>
-	<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<!-- /TMPL_IF -->
-
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
index 482776a478..aec165b4aa 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
@@ -7,33 +7,46 @@
 <!---------------------------------------------------------------------------->
 	<H1>
 	<!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
 	<!-- TMPL_ELSE --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
 	</H1>
 	<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
 	<input type=hidden name=op value='add_validate'>
 	<input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->">
 	<table>
-	<tr><th>Field</th>
-		<th colspan=2>Constraints</th>
 	</tr>
 	<!-- TMPL_LOOP name="loop" -->
 		<tr bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
 		<td>
-			<p><!-- TMPL_VAR name="tagfield" --> - <!-- TMPL_VAR name="tagsubfield" --></p>
-			<p><input type=text name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" -->" size=40 maxlength=80></p>
-			<p><input type=text name="libopac" value="<!-- TMPL_VAR name="libopac" -->" size=40 maxlength=80></p>
-		<td>
-			<p><label>Appears in tab:</label> <!-- TMPL_VAR name="tab" --></p>
-			<p><label>Repeatable:</label> <!-- TMPL_VAR name="repeatable" --></p>
-			<p><label>Mandatory:</label><!-- TMPL_VAR name="mandatory" --></p>
-			<p><label>See also:</label> <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20 maxlength=80></p>
+			<h2 class="parameters">Tag <!-- TMPL_VAR name="tagfield" -->, Subfield <!-- TMPL_VAR name="tagsubfield" --></h2>
+			<h3>MARC constraints</h3>
+			<p>
+				<label>&nbsp;</label><!-- TMPL_VAR name="repeatable" --> repeatable 
+				<!-- TMPL_VAR name="mandatory" --> mandatory
+			</p>
+			<p>
+				<label>&nbsp;</label>
+				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20 maxlength=80> (example for 200a : '700a','701a','702a')
+			</p>
+			<p><label>&nbsp;</label><label>Koha link:</label> <!-- TMPL_VAR name="kohafield" --></p>
+			<h3>Editor constaints</h2>
+			<p> <label>&nbsp;</label>
+				<label>Text for librarian</label>
+				<input type=text name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" -->" size=40 maxlength=80>
+			</p>
+			<p>
+				<label>&nbsp;</label>
+				<label>Text for OPAC</label> <input type=text name="libopac" value="<!-- TMPL_VAR name="libopac" -->" size=40 maxlength=80>
+			</p>
+			<p><label>&nbsp;</label><label>Managed in tab</label> <!-- TMPL_VAR name="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
+			<p><label>&nbsp;</label><!-- TMPL_VAR name="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
+			<p><label>&nbsp;</label><!-- TMPL_VAR name="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
+			<p>
+				<label>&nbsp;</label><label>Auth value:</label> <!-- TMPL_VAR name="authorised_value" -->
+				or thesaurus: <!-- TMPL_VAR name="thesaurus_category" -->
+				or plugin: <!-- TMPL_VAR name="value_builder" -->
+			</p>
 		</td>
-		<td>
-			<p><label>Koha link:</label> <!-- TMPL_VAR name="kohafield" --></p>
-			<p><label>Auth value:</label> <!-- TMPL_VAR name="authorised_value" --></p>
-			<p><label>Thesaurus:</label> <!-- TMPL_VAR name="thesaurus_category" --></p>
-			<p><label>plugin:</label> <!-- TMPL_VAR name="value_builder" --></td>
 	<!-- /TMPL_LOOP -->
 	</table>
 	<INPUT type=submit value='OK'>
@@ -79,27 +92,34 @@
 <tr>
 	<th>Subfield</th>
 	<th>Lib</th>
-	<th>Koha field<span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></th>
-	<th>Rep<span style="font-size:8;color:red" title="subfield may be repeated (1=yes, 0=no)">?</span></th>
-	<th>Mand <span style="font-size:8;color:red" title="subfield is mandatory (1=yes, 0=no)">?</span></th>
-	<th>Tab <span style="font-size:8;color:red" title="subfield is shown in which tab (0-9 or item)">?</span></th>
-	<th>See also<span style="font-size:8;color:red" title="if subfields entered here, searches on this field will also be done on seealso subfields (syntax 200a,300e)">?</span></th>
-	<th>Auth value<span style="font-size:8;color:red" title="values authorised for this subfield">?</span></th>
-	<th>Thesaurus<span style="font-size:8;color:red" title="Thesaurus linked to this subfield">?</span></th>
-	<th>Val build<span style="font-size:8;color:red" title="Value builder">?</span></th>
+	<th>Constraints</th>
 	<th>Delete</th>
 <!-- TMPL_LOOP name="loop" -->
 <tr bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
 	<td><!-- TMPL_VAR name="tagsubfield" --></td>
-	<td><!-- TMPL_VAR name="liblibrarian" --></td>
-	<td><!-- TMPL_VAR name="kohafield" --></td>
-	<td><!-- TMPL_IF name="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_VAR name="tab" --></td>
-	<td><!-- TMPL_VAR name="seealso" --></td>
-	<td><!-- TMPL_VAR name="authorised_value" --></td>
-	<td><!-- TMPL_VAR name="thesaurus_category" --></td>
-	<td><!-- TMPL_VAR name="value_builder" --></td>
+	<td>
+		<!-- TMPL_IF name="subfield_ignored" -->
+			<i><!-- TMPL_VAR name="liblibrarian" --></i>
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_VAR name="liblibrarian" -->
+		<!-- /TMPL_IF -->
+		</td>
+	<td>
+		<!-- TMPL_IF name="subfield_ignored" -->
+			<i>subfield ignored</i>
+		<!-- TMPL_ELSE -->
+			Tab :<!-- TMPL_VAR name="tab" -->,
+			<!-- TMPL_IF name="kohafield" -->Koha field : <!-- TMPL_VAR name="kohafield" -->, <!--/TMPL_IF -->
+			<!-- TMPL_IF name="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="seealso" -->see also : <!-- TMPL_VAR name="seealso" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="hidden" -->hidden,<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="isurl" -->is an url,<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="authorised_value" --> Auth value :<!-- TMPL_VAR name="authorised_value" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="thesaurus_category" --> Thesaurus :<!-- TMPL_VAR name="thesaurus_category" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="value_builder" -->Plugin :<!-- TMPL_VAR name="value_builder" -->,<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+	</td>
 	<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
 </tr>
 <!-- /TMPL_LOOP -->