diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
index c28afa7dfb..87eeaff784 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl
@@ -1,212 +1,199 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF NAME="add_form" -->
-        <script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-   return false;
-                }
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=='') {
-                return false;
-        }
-        return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                        return false;
-                }
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.currency.value.length==0) {
-                        _alertString += "\n- " + _("Currency name missing");
-                }
-                if (f.rate.value.length==0) {
-                        _alertString += "\n- " + _("Rate missing");
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2  = _("Form not submitted because of the following problem(s)");
-                        alertString2 += "\n------------------------------------------------------------------------------------\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </script>
-
-	<!-- TMPL_IF NAME="searchfield" -->
-		<h1>Modify currency</h1>
-	<!-- TMPL_ELSE -->
-		<h1>Add currency</h1>
-	<!-- /TMPL_IF -->
-
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate">
-
-	<table>
-
-	<!-- TMPL_IF NAME="searchfield" -->
-		<tr>
-			<td>Currency</td>
-			<td>
-				<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
-			</td>
-		</tr>
-	<!-- TMPL_ELSE -->
-		<tr>
-			<td>Currency</td>
-			<td>
-				<input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this)">
-			</td>
-		</tr>
-	<!-- /TMPL_IF -->
-
-        	<tr>
-			<td>Rate</td>
-			<td>
-				<input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->">
-			</td>
-		</tr>
-        	<tr>
-			<td> </td>
-			<td><input type="button" value="OK" onclick="Check(this.form)"></td>
-		</tr>
-        </table>
-        </form>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-	Data recorded
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK">
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-	<table border="0" cellspacing="0" cellpadding="5">
-		<tr bgcolor="#99cc33">
-			<td background="/images/background-mem.gif"><b>Currency</b></td>
-			<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
-		</tr>
-
-        	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed">
-			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-        
-        	<tr>
-			<td>Rate</td>
-			<td><!-- TMPL_VAR NAME="rate" --></td>
-		</tr>
-		<!-- TMPL_IF NAME="totalgtzero" -->
-		<tr>
-			<td colspan="2" align="center">
-				<b>This record is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</b>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				</form>
-				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-					<input type="submit" value="OK">
-				</form>
-			</td>
-		</tr>
-		<!-- TMPL_ELSE -->
-		<tr>
-			<td colspan="2" align="center">CONFIRM DELETION</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="submit" value="YES">
-				</form>
-			</td>
-			<td>
-				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-					<input type="submit" value="NO">
-				</form>
-			</td>
-		</tr>
-		<!-- /TMPL_IF -->
-	</table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="OK">
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-	<h2>Currencies admin</h2>
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                <input type="reset" name="reset" value="clr">
-        </form>
-
-	<!-- TMPL_IF NAME="searchfield" -->
-		You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
-	<!-- /TMPL_IF -->
-
-	<table border="0" cellspacing="0" cellpadding="5">
-		<tr bgcolor="#99cc33">
-			<td background="/images/background-mem.gif"><b>Currency</b></td>
-			<td background="/images/background-mem.gif"><b>Rate</b></td>
-			<td background="/images/background-mem.gif"> </td>
-			<td background="/images/background-mem.gif"> </td>
-		</tr>
-		<!-- TMPL_LOOP NAME="loop" -->
-		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-			<td><!-- TMPL_VAR NAME="currency" --></td>
-			<td><!-- TMPL_VAR NAME="rate" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button">Edit</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button">Delete</a></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form">
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+			<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isNotNull(f,noalert) {
+					if (f.value.length ==0) {
+	return false;
+					}
+					return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function toUC(f) {
+					var x=f.value.toUpperCase();
+					f.value=x;
+					return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isNum(v,maybenull) {
+			var n = new Number(v.value);
+			if (isNaN(n)) {
+					return false;
+					}
+			if (maybenull==0 && v.value=='') {
+					return false;
+			}
+			return true;
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function isDate(f) {
+					var t = Date.parse(f.value);
+					if (isNaN(t)) {
+							return false;
+					}
+			}
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			function Check(f) {
+					var ok=1;
+					var _alertString="";
+					var alertString2;
+					if (f.currency.value.length==0) {
+							_alertString += "\n- " + _("Currency name missing");
+					}
+					if (f.rate.value.length==0) {
+							_alertString += "\n- " + _("Rate missing");
+					}
+					if (_alertString.length==0) {
+							document.Aform.submit();
+					} else {
+							alertString2  = _("Form not submitted because of the following problem(s)");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
+							alertString2 += _alertString;
+							alert(alertString2);
+					}
+			}
+			</script>
+	
+		<!-- TMPL_IF NAME="searchfield" -->
+			<h1 class="parameters">Modify currency</h1>
+		<!-- TMPL_ELSE -->
+			<h1 class="parameters">Add currency</h1>
+		<!-- /TMPL_IF -->
+	
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
+	
+		<!-- TMPL_IF NAME="searchfield" -->
+			<p>
+				<label>Currency</label>
+				<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+			</p>
+		<!-- TMPL_ELSE -->
+			<p>
+				<label>Currency</label>
+				<input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this)">
+			</p>
+		<!-- /TMPL_IF -->
+		<p>
+			<label>Rate</label>
+			<input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->">
+		</p>
+		<p><input type="button" value="OK" onclick="Check(this.form)" class="button parameters"></p>
+		</form>
 	
-	<!-- TMPL_IF NAME="offsetgtzero" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
 	<!-- /TMPL_IF -->
-
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-	<!-- TMPL_IF NAME="ltcount" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
-	<!-- /TMPL_iF -->
-
-        <br>
-	<input type="submit" class="button" value="Add currency" alt="Add currency">
-	<br>
-        </form>
-
-<!-- /TMPL_IF -->
-
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+		Data recorded
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Currency</b></td>
+				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
+			</tr>
+	
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			
+				<tr>
+				<td>Rate</td>
+				<td><!-- TMPL_VAR NAME="rate" --></td>
+			</tr>
+			<!-- TMPL_IF NAME="totalgtzero" -->
+			<tr>
+				<td colspan="2" align="center">
+					<b>This record is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</b>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2">
+					</form>
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+						<input type="submit" value="OK">
+					</form>
+				</td>
+			</tr>
+			<!-- TMPL_ELSE -->
+			<tr>
+				<td colspan="2" align="center">CONFIRM DELETION</td>
+			</tr>
+			<tr>
+				<td>
+					<input type="submit" value="YES">
+					</form>
+				</td>
+				<td>
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+						<input type="submit" value="NO">
+					</form>
+				</td>
+			</tr>
+			<!-- /TMPL_IF -->
+		</table>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+		Data deleted
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+		<h1 class="parameters">Currencies admin</h1>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="submit" value="Filter" class="button parameters">
+			</form>
+	
+		<!-- TMPL_IF NAME="searchfield" -->
+			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
+		<!-- /TMPL_IF -->
+	
+		<table>
+			<tr>
+				<th class="parameters"><b>Currency</b></td>
+				<th class="parameters"><b>Rate</b></td>
+				<th class="parameters"> </td>
+				<th class="parameters"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<td><!-- TMPL_VAR NAME="currency" --></td>
+				<td><!-- TMPL_VAR NAME="rate" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button parameters">Edit</a></td>
+							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button parameters">Delete</a></td>
+			</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+	
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
+		
+		<!-- TMPL_IF NAME="offsetgtzero" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+		<!-- /TMPL_IF -->
+	
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+	
+		<!-- TMPL_IF NAME="ltcount" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
+		<!-- /TMPL_iF -->
+	
+			<br>
+		<input type="submit" class="button parameters" value="Add currency" alt="Add currency">
+		<br>
+			</form>
+	
+	<!-- /TMPL_IF -->
+</div>
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
index c456130375..68735b00ff 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
@@ -44,9 +44,6 @@ function Check(f) {
 	if (!(isNotNull(window.document.Aform.description,1))) {
 		_alertString += "\n- " + _("Description missing");
 	}
-	if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) {
-		_alertString += "\n- " + _("Loan length is not a number");
-	}
 	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
 		_alertString += "\n- " + _("Rental charge is not a number");
 	}
@@ -63,9 +60,9 @@ function Check(f) {
 <div id="mainbloc">
 <!-- TMPL_IF NAME="add_form" -->
 	<!-- TMPL_IF NAME="itemtype" -->
-		<h1>Modify item type</h1>
+		<h1 class="parameters">Modify item type</h1>
 	<!-- TMPL_ELSE -->
-		<h1>Add item type</h1>
+		<h1 class="parameters">Add item type</h1>
 	<!-- /TMPL_IF -->
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
 		<input type="hidden" name="op" value="add_validate">
@@ -88,11 +85,6 @@ function Check(f) {
 				<!-- /TMPL_IF -->
 				if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item
 			</p>
-			<p>
-				<label class="label100">Loan length</label>
-					<input type="text" name="loanlength" size="10" value="<!-- TMPL_VAR NAME="loanlength" -->">
-					meaningful only if not for loan is not set
-			</p>
 			<p>
 				<label class="label100" name="renewalsallowed">Number of renewals allowed</label>
 				<input type="text" name="renewalsallowed" value="<!-- TMPL_VAR NAME="renewalsallowed" -->">
@@ -112,7 +104,6 @@ function Check(f) {
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->">
 	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
-	<p><label>Loan length</label><!-- TMPL_VAR NAME="loanlength" --></p>
 	<p><label>Renewals</label><!-- TMPL_IF NAME="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></p>
 	<p><lable>Rental charge</label><!-- TMPL_VAR NAME="rentalcharge" --></p>
 	<!-- TMPL_IF NAME="total" -->
@@ -134,12 +125,11 @@ function Check(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-<h1>Item type Admin</h1>
+<h1 class="parameters">Item type Admin</h1>
 <table>
 	<tr>
 		<th class="parameters">Code</th>
 		<th class="parameters">Description</th>
-		<th class="parameters">Loan length</th>
 		<th class="parameters">Renewable</th>
 		<th class="parameters">Charge</th>
 		<th class="parameters">Edit</th>
@@ -149,7 +139,6 @@ function Check(f) {
 		<tr>
 			<td><!-- TMPL_VAR NAME="itemtype" --></td>
 			<td><!-- TMPL_VAR NAME="description" --></td>
-			<td><!-- TMPL_VAR NAME="loanlength" --></td>
 			<td><!-- TMPL_IF NAME="renewalsallowed" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
 			<td><!-- TMPL_VAR NAME="rentalcharge" --></td>
 			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
@@ -159,7 +148,7 @@ function Check(f) {
 </table>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_form">
-	<input type="submit" class="button" value="Add item type" title="Add item type" alt="Add item type" >
+	<input type="submit" class="button parameters" value="Add item type" title="Add item type" alt="Add item type" >
 	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
 	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
 </form>