diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc
index 32fc105f7b..3374c6afd5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/duplicates.inc
@@ -23,7 +23,7 @@ function confirmnotdup(){
 		</li>
 	<!--/TMPL_LOOP--></ul>
 </p>
-<form action="<TMPL_VAR Name="action_dup_no_url"-->" method="get">
+<form action="<!--TMPL_VAR Name="action_dup_no_url"-->" method="get">
 	<input type="submit" class="save" onclick="confirmnotdup(); return false;" value="No: Save as New" />
 </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index d0f4729c25..07159e1442 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -24,8 +24,8 @@
        </li>
        <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
         <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
-		<!-- /TMPL_IF -->
-		  <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_borrowers" -->
 		<h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
 		<ul>
         <li><form action="/cgi-bin/koha/members/member.pl" method="post">
@@ -36,7 +36,7 @@
         </li>
     </ul>
 	<!-- /TMPL_IF -->
-		  <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
                 <h3><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></h3>
 				<ul>
                     <li>
@@ -64,34 +64,27 @@
 		<!-- /TMPL_IF -->
     </ul>
     <!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="CAN_user_acquisition" -->
-    <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
-	<!-- /TMPL_IF -->
-    <!-- /TMPL_IF --><!-- TMPL_IF NAME="CAN_user_reports" -->
-          <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_parameters" -->
-   <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
-   			<ul>
+	<!-- TMPL_IF NAME="CAN_user_acquisition" --> <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3> <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_reports"     --> <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> </h3> <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" --> <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
+ 		<ul>
             <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
         </ul>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools" -->
-    <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
-    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" --> <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3> <!-- /TMPL_IF -->
     <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
 	</div>
 	</div>
-			<!-- TMPL_IF NAME="IntranetmainUserblock" --><div id="mainuserblock" class="yui-g">
-		<!-- TMPL_VAR NAME="IntranetmainUserblock" -->
-		</div><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="IntranetmainUserblock" --><div id="mainuserblock" class="yui-g">
+			<!-- TMPL_VAR NAME="IntranetmainUserblock" -->
+			</div><!-- TMPL_ELSE -->&nbsp;
+		<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="koha_news_count" -->
 	</div><!-- /yui-bd -->
 	</div><!-- /yui-main -->
 	<div class="yui-b">
 		<div id="koha-news">
             <h3>News</h3>
-			<!-- <!-- TMPL_VAR name="koha_news_count" --> recent news item(s) -->
             <!-- TMPL_LOOP name="koha_news" -->
                     <div class="newsitem" id="news<!-- TMPL_VAR NAME="idnew" -->"><h4><!-- TMPL_VAR name="title" --></h4>
 					 <p><!-- TMPL_VAR name="new" --></p>