diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl
index a3dd2e9470..c3e3c5e8ee 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl
@@ -14,12 +14,12 @@ function Dopop(link) {
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR NAME="crit"--> =</label><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_IF NAME="loopfilter"-->
 		<br>
 		<table>
-			<tr >
+			<tr>
 				<th>Rank/Borrowers</th>
 				<!-- TMPL_LOOP NAME="loopcol" -->
 					<th colspan="2"><!-- TMPL_VAR NAME="coltitle" --></th>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
index 76fb2914e1..cbd1941267 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
@@ -10,7 +10,7 @@
 <input type="hidden" name="type" value="intranet" />
 <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
 
-<div class="form">
+<div class="data">
 <table>
 <caption>Quick Search</caption>
 					<tr>
@@ -57,7 +57,9 @@
 			<input type="hidden" name="excluding" value="" />
 			<input type="hidden" name="operator" value="contains" />
 			<input type="text" id="seriestitle" name="value" size="35"/></td></tr>
-	</table><input type="submit" value="Start search" class="submit" /><table>
+	</table>
+	<p><input type="submit" value="Start search" class="submit" /></p>
+	<table>
 		<tr>
 			<th><label for="itemtype">Item Type</label></th>
 			<td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
@@ -107,7 +109,7 @@
 			<input type="text" id="publisher" name="value" onchange="sql_update()" size="35"  accesskey="p" /></td>
 		</tr>
 		</table>
-		<input type="submit" value="Start search" class="submit" />
+		<p><input type="submit" value="Start search" class="submit" /></p>
 </div>
 
 <div class="table">