From 4343180de955e790f66a93748cc2a34005e7e6de Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Tue, 13 Apr 2004 16:50:26 +0000
Subject: [PATCH] Mostly cosmetic changes, including more informative page
 titles

---
 koha-tmpl/intranet-tmpl/npl/en/about.tmpl     |  79 +++++++-
 .../npl/en/acqui.simple/addbiblio.tmpl        |  11 +-
 .../npl/en/acqui.simple/addbooks.tmpl         |  79 +-------
 .../npl/en/acqui.simple/additem.tmpl          |  10 +-
 .../npl/en/acqui.simple/isbnsearch.tmpl       |   6 +-
 .../npl/en/acqui.simple/marcimport.tmpl       |   4 +-
 koha-tmpl/intranet-tmpl/npl/en/auth.tmpl      |   4 +-
 .../intranet-tmpl/npl/en/boraccount.tmpl      |   7 +-
 .../npl/en/catalogue/MARCdetail.tmpl          | 178 +++++++++---------
 .../npl/en/catalogue/catalogue-home.tmpl      |   8 +-
 .../npl/en/catalogue/detail.tmpl              |  48 +++--
 .../npl/en/catalogue/detailprint.tmpl         |   3 +-
 .../npl/en/catalogue/moredetail.tmpl          |   4 +-
 .../npl/en/catalogue/searchresults.tmpl       |   8 +-
 .../npl/en/catalogue/subject.tmpl             |   7 +-
 .../npl/en/circ/branchtransfers.tmpl          |   2 +-
 .../npl/en/circ/circulation.tmpl              |  10 +-
 .../intranet-tmpl/npl/en/circ/returns.tmpl    |  36 ++--
 .../npl/en/circ/selectbranchprinter.tmpl      |   2 +-
 .../intranet-tmpl/npl/en/export/marc.tmpl     |   4 +-
 .../intranet-tmpl/npl/en/import/breeding.tmpl |   4 +-
 .../npl/en/includes/doc-head-circ-close.inc   |   4 +-
 .../en/includes/doc-head-close-addbiblio.inc  |  42 +++++
 .../npl/en/includes/doc-head-close-print.inc  |   9 +
 .../npl/en/includes/doc-head-close.inc        |  42 +++++
 .../npl/en/includes/doc-head-open.inc         |   5 +
 .../npl/en/includes/intranet-nav-brief.inc    |  14 +-
 .../npl/en/includes/intranet-nav.inc          |  13 +-
 .../npl/en/includes/main-top-addbiblio.inc    |   1 +
 .../npl/en/includes/main-top-blank.inc        |   1 +
 .../npl/en/includes/main-top-circ.inc         |   3 +-
 .../npl/en/includes/main-top-print.inc        |   1 +
 .../npl/en/includes/main-top.inc              |   3 +-
 .../npl/en/includes/members-topmenu.inc       |   6 +-
 .../intranet-tmpl/npl/en/intranet-main.tmpl   |  23 +--
 koha-tmpl/intranet-tmpl/npl/en/mancredit.tmpl |   2 +-
 .../intranet-tmpl/npl/en/maninvoice.tmpl      |   2 +-
 .../npl/en/marcimport/AcceptMarcUpload.tmpl   |   5 +-
 .../npl/en/members/imemberentry.tmpl          |   6 +-
 .../npl/en/members/jmemberentry.tmpl          |   4 +-
 .../npl/en/members/member-flags.tmpl          |   2 +-
 .../npl/en/members/member-password.tmpl       |   2 +-
 .../intranet-tmpl/npl/en/members/member.tmpl  |   8 +-
 .../npl/en/members/memberentry.tmpl           |  11 +-
 .../npl/en/members/members-home.tmpl          |  56 +++---
 .../npl/en/members/moremember.tmpl            |   8 +-
 .../intranet-tmpl/npl/en/members/pay.tmpl     |   2 +-
 .../npl/en/members/readingrec.tmpl            |   2 +-
 koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl   |  18 +-
 .../intranet-tmpl/npl/en/modwebsites.tmpl     |   2 +-
 koha-tmpl/intranet-tmpl/npl/en/reports.tmpl   |   2 +-
 koha-tmpl/intranet-tmpl/npl/en/request.tmpl   |  11 +-
 .../intranet-tmpl/npl/en/reservereport.tmpl   |   2 +-
 koha-tmpl/intranet-tmpl/npl/en/shelves.tmpl   | 129 ++++++-------
 koha-tmpl/intranet-tmpl/npl/en/stats.tmpl     |   2 +-
 55 files changed, 525 insertions(+), 432 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-print.inc
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-open.inc

diff --git a/koha-tmpl/intranet-tmpl/npl/en/about.tmpl b/koha-tmpl/intranet-tmpl/npl/en/about.tmpl
index da15b16310..7cdda83137 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/about.tmpl
@@ -1,4 +1,5 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
+<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
@@ -6,27 +7,89 @@
 <h1>About Koha</h1>
 <p>Data about the current version of Koha for bug reports (or general 
 interest).</p>
-<div class="table"><table>
+<div class="table"><div class="items"><table>
   <tr>
-      <td>Koha version:</td>
+      <th>Koha version:</th>
       <td><!-- TMPL_VAR ESCAPE="html" NAME="kohaVersion" --></td>
   </tr>
   <tr>
-      <td>OS version (from 'uname -a'):</td>
+      <th>OS version (from 'uname -a'):</th>
       <td><!-- TMPL_VAR ESCAPE="html" NAME="osVersion" --></td>
   </tr>
   <tr>
-      <td>Perl version:</td>
+      <th>Perl version:</th>
       <td><!-- TMPL_VAR ESCAPE="html" NAME="perlVersion" --></td>
   </tr>
   <tr>
-      <td>MySQL version:</td>
+      <th>MySQL version:</th>
       <td><!-- TMPL_VAR ESCAPE="html" NAME="mysqlVersion" --></td>
   </tr>
   <tr>
-      <td>Apache version:</td>
+      <th>Apache version:</th>
       <td><!-- TMPL_VAR ESCAPE="html" NAME="apacheVersion" --></td>
   </tr>
-</table></div>
+ </table></div>
+
+ <table>
+ <caption>Credits</caption>
+  	<tr>
+	<th>Core Team</th></tr>
+	<tr><td>
+<ul>
+	<li>Pat Eyler, Kaitiaki</li>
+	<li>Paul Poulain, 2.0 release manager (MARC developper)</li>
+	<li>Joshua Ferraro &amp; the Nelsonville Public Library (MARC features funders)</li>
+	<li>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</li>
+	<li>Nicholas Rosasco, (Documentation Compiler)</li>
+	<li>Mike Hansen</li>
+	<li>MJ Ray and Turo Technology LLP, England (quality control, installer &amp; updater)</li>
+	<li>Nicolas Morin, French Translation</li>
+<li><b>Horowhenua Library Trust</b>
+Rosalie Blake, Head of Libraries
+Jo Ransom</li>
+<li><b>Katipo Communications</b>
+Rachel Hamilton-Williams, General Manager (Webmistress)
+Chris Cormack, 1.2 release manager
+and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
+						Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li></ul>
+					</td>
+				</tr>
+<tr><th>Thanks to</th></tr>
+				<tr>
+					<td>
+<ul>
+	<li>Adam Thick</li>
+	<li>Andrew Hooper</li>
+	<li>Al Banks</li>
+	<li>Ambrose Li</li>
+	<li>Andrew Arensburger</li>
+	<li>Benedykt P. Barszcz (Polish for 2.0)</li>
+	<li>Brig C. McCoy</li>
+	<li>Daniel Holth</li>
+	<li>David Strainchamps</li>
+	<li>Dorian Meid</li>
+	<li>Ed Summers</li>
+	<li>Florian Bischof</li>
+	<li>Francisco M. Marzoa Alonso</li>
+	<li>Glen Stewart</li>
+	<li>Henri-Damien Laurent</li>
+	<li>Jérome Vizcaino (Esiee School)</li>
+	<li>Kip DeGraaf</li>
+	<li>Marco Gaiarin</li>
+	<li>Md. Aftabuddin</li>
+	<li>Michaes Herman</li>
+	<li>Michel Lerenard (Esiee School)</li>
+	<li>Mike Johnson</li>
+	<li>Mike Mylonas</li>
+	<li>Pierre Cauchois (Esiee School)</li>
+	<li>Pawel Skuza (Polish for 1.2)</li>
+	<li>Regula Sebastiao</li>
+	<li>Roger Buck</li>
+	<li>Ron Wickersham</li>
+	<li>Sebastiaan Durand</li>
+</ul>					</td>
+				</tr>
+			</table>
+</div>
 </div>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl
index 644eeef781..9901ac402f 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top-addbiblio.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: <!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
 
@@ -9,7 +9,7 @@
 <input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="oldbiblionumber" -->" />
 
 <h3><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h3><input type="button" value="<!-- TMPL_IF NAME="oldbiblionumtagfield" -->Save Bibliographic Record and Go To Items<!-- TMPL_ELSE -->Add Bibliographic Record and Go To Items<!-- /TMPL_IF -->" onclick="Check(this.form);" class="submit" accesskey="w" />
-<input type="button" value="z39.50 Search" class="submit" onclick="PopupZ3950(); return false;" />
+ <input type="button" value="z39.50 Search" class="submit" onclick="PopupZ3950(); return false;" />  <input type="button" class="cancel" value="Delete this Record" onclick="confirm_deletion(); return false;">
 	
 <div id="tabholder" class="tabholder">
    <span id="tab1" class="tab" onclick =" showPanel(1);" onmouseover="hover(this);" onmouseout="setState(1)">007-130</span>
@@ -436,6 +436,13 @@ function AddField(field) {
       tab.style.backgroundColor = '#ccff99';
 			tab.style.color = '#330000';
    }
+
+function confirm_deletion() {
+	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+	if (is_confirmed) {
+		window.location="addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
+	}
+}
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl
index 5b8f97e1a3..d80b7954c8 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging Home<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
@@ -13,80 +13,7 @@
 	<font color="red" size="4">Website Biblioitem Added</font>
 <!-- /TMPL_IF -->
 
-<!-- Commented section used in NPL custom template version -->
-<!-- <div class="form">
-<form method="post" action="addbiblio-simple.pl">
-<input type="hidden" name="op" value="addbiblio" />
-<input type="hidden" name="addfield_field" />
-<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="oldbiblionumber" -->" />
-    <table>
-	<caption>Create Brief Record</caption>
-				<tr>
-					<th><label for="field_value">Title</label></th>
-					<td>
-						<input type="text" name="field_value" id="field_value" value="" size="50" maxlength="255" />
-						<input type="hidden" name="tag" value="245" />
-						<input type="hidden" name="subfield" value="a" />
-
-						<input type="hidden" name="mandatory" value="0" />
-						<input type="hidden" name="kohafield" value="biblio.title" />
-						<input type="hidden" name="tag_mandatory" value="1" />
-					</td>
-				</tr>
-	<tr>
-			<th><label for="field_value">Item Type</label></th>
-					<td>
-						<select name="field_value" id="field_value" size="1">
-<option value=""></option>
-<option  value="AB">Audiobook</option>
-<option  value="AF">Fiction</option>
-<option  value="AV">Videocassette</option>
-
-<option  value="AVJ">Juvenile videocassette</option>
-<option  value="AVNF">Non-fiction videocassette</option>
-<option  value="BIO">Biography</option>
-<option  value="DVD">Digital video disc</option>
-<option  value="EASY">Children's picture books</option>
-<option  value="JB">Juvenile biography</option>
-<option  value="JNF">Juvenile non-fiction</option>
-<option  value="JF">Juvenile fiction</option>
-
-<option  value="JREF">Juvenile reference</option>
-<option  value="LH">Local history</option>
-<option  value="LP">Large print fiction</option>
-<option  value="LPNF">Large print non-fiction</option>
-<option  value="MYS">Mystery</option>
-<option  value="NF">Non-fiction</option>
-<option  value="REF">Reference</option>
-<option  value="SCI">Science fiction/Fantasy</option>
-<option  value="WES">Western</option>
-
-<option  value="YA">Young Adult fiction</option>
-<option  value="YANF">Young Adult non-fiction</option>
-<option  value="CDM">Music CD</option>
-<option  value="AVJN">Juvenile non-fiction videocassette</option>
-<option  value="CDR">CD-ROM software</option>
-<option  value="JAC">Juvenile audiobook</option>
-<option  value="KIT">Children's book/tape kit</option>
-<option  value="PB">Paperback romance</option>
-
-<option  value="YAC">Young Adult audiobook</option>
-<option selected="selected" value="MZ">Magazine</option>
-</select>
-
-						<input type="hidden" name="tag" value="942" />
-						<input type="hidden" name="subfield" value="c" />
-						<input type="hidden" name="mandatory" value="0" />
-						<input type="hidden" name="kohafield" value="biblioitems.itemtype" />
-						<input type="hidden" name="tag_mandatory" value="0" />
-					</td>
-				</tr>
-	</table>
-	<input type="submit" value="Save Bibliographic Record and Go To Items" class="submit" />
-</form>
-	</div>
-<br /> -->
-	<form class="inline" action="isbnsearch.pl"><div class="form">
+<form class="inline" action="isbnsearch.pl"><div class="form">
 	<h3>Search Existing Records</h3>
 	<ul class="notes"><li>If the ISBN is found into the biblio table, it will be retrieved and can be modified.</li>
 	<li>If the ISBN is found into the breeding farm, it will be retrieved, and a biblio added.</li>
@@ -98,7 +25,7 @@
 <input type="submit" class="submit" value="Search" /></div> </form>
 
 <form action="addbiblio.pl"><p> <input type="submit" value="Add Record Without Search" class="submit" /></p></form>
-<br />
+
 <form action="websitesearch.pl" method="post">
 	<div class="form"><table>
 	<caption>Add New Website</caption>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl
index 40acf96f09..9b1c7d7a95 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl
@@ -1,5 +1,5 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Items for Bibliographic Record <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
 
 <div id="main">
@@ -9,6 +9,7 @@
 <div class="tabitem">
 <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form>
 </div>
+<div class="error">Date Accessioned must be entered in this format:  <span class="ex">yyyy-mm-dd</span></div>
 <!-- TMPL_IF NAME="item_loop" -->
 <div class="table">
 <table>
@@ -20,6 +21,7 @@
 		<tr>
 			<!-- TMPL_VAR name="item_value" -->
 			<td><a href="/cgi-bin/koha/acqui.simple/additem.pl?op=edititem&amp;bibid=<!-- TMPL_VAR name="bibid" -->&amp;itemnum=<!-- TMPL_VAR name="itemnum" -->">Edit</a> </td>
+<td><a href="#" onclick="confirm_deletion(<!-- TMPL_VAR name="bibid" -->,<!-- TMPL_VAR name="itemnum" -->)">Delete</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 </table>
@@ -101,6 +103,12 @@ function Dopop(link,i) {
 	defaultvalue=document.forms[0].field_value[i].value;
 	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
+function confirm_deletion(bibid,itemnum) {
+	var is_confirmed = confirm('Do you confirm item deletion ?');
+	if (is_confirmed) {
+	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;
+	}
+}
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl
index 70b683ee9a..45a3b49b7a 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/isbnsearch.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Search Results for <!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->title <!-- TMPL_VAR name="title" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
@@ -36,11 +36,11 @@ Results <!-- TMPL_VAR name="showoffset" --> to <!-- TMPL_VAR name="total" --> di
 	<!-- TMPL_IF name="loop" -->
 	<!-- TMPL_LOOP name="loop" -->
 		<tr>
-			<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>
+			<td><a class="searchresults" href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>
 			<td><!-- TMPL_VAR name="author" --></td>
 			<td><!-- TMPL_IF name="copytrightdate" --><!-- TMPL_VAR name="copyrightdate" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
 			<td><!-- TMPL_IF NAME="class" --><!-- TMPL_VAR NAME="class" --><!-- /TMPL_IF --></td>
-			<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->">Edit Biblio</a></td><td>&nbsp;</td>
+			<td><a class="searchresults" href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->">Edit Biblio</a></td><td>&nbsp;</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	<!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl
index 1847ad4b3c..b691152c56 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl
@@ -1,6 +1,6 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="main-top.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
 
 <form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
 <table border="0" cellpadding="0" cellspacing="0" align="center" class="results" width="80%">
diff --git a/koha-tmpl/intranet-tmpl/npl/en/auth.tmpl b/koha-tmpl/intranet-tmpl/npl/en/auth.tmpl
index 7a7dc931c4..f112ad8dc7 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/auth.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="nopermission" -->Access Denied<!-- /TMPL_IF --><!-- TMPL_IF NAME="timed_out" -->Session Timed Out --<!-- /TMPL_IF --><!-- TMPL_IF NAME="different_ip" -->IP Change -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="invalid_username_or_password" -->Invalid Username or Password -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <div id="main">
 
@@ -26,7 +26,7 @@
 <!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
 
-<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="mainform" id="mainform">
 <!-- TMPL_LOOP NAME="INPUTS" -->
   <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/boraccount.tmpl b/koha-tmpl/intranet-tmpl/npl/en/boraccount.tmpl
index ecdba36f1a..d96b0bc86e 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/boraccount.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -31,10 +31,7 @@
 </table></div>
 <!-- The manual invoice and credit buttons -->
 <div class="tabitem">
-<form action="/cgi-bin/koha/maninvoice.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" class="submit" value="Create
- Manual Invoice" /></form> <form action="/cgi-bin/koha/mancredit.pl" method="get"> <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="submit" value="Create
- Manual Credit" /></form> <form action="moremember.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to 
-Patron Record" class="submit" /></form>
+<form action="/cgi-bin/koha/maninvoice.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" class="submit" value="Create Manual Invoice" /></form> <form action="/cgi-bin/koha/mancredit.pl" method="get"> <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="submit" value="Create Manual Credit" /></form> <form action="moremember.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to Patron Record" class="submit" /></form>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl
index b871bb0590..7d7cad2666 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl
@@ -1,157 +1,157 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: MARC Record View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
 <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
-		<!-- /TMPL_IF --></div>
+		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form></div>
 
-<div class="table"><table>
-	<!-- TMPL_LOOP name="0XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+<div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="0XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
 	</tr>
 	</tmpl_loop>
 	</tmpl_loop>
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="1XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="1XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="2XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="2XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="3XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="3XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="4XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="4XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="5XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="5XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="6XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="6XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="7XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="7XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="8XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="8XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
      </table></div>
 
-    <div class="table"><table>
-	<!-- TMPL_LOOP name="9XX" -->
-	<tr><td colspan="5"><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
+    <div class="table"><table class="marc">
+	<!-- TMPL_LOOP NAME="9XX" -->
+	<tr><th colspan="5"><tmpl_VAR NAME="tag"></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
 	<tr>
          <td>&nbsp;</td>
-	    <td><!-- TMPL_VAR name="marc_subfield" --></td>
-		<td><!-- TMPL_VAR name="marc_lib" --></td>
-		<td><!-- TMPL_VAR name="marc_value" --></td>
-		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">?</a></td>
+	    <td><!-- TMPL_VAR NAME="marc_subfield" --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>
        </tr>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
@@ -159,13 +159,21 @@
 
     <div class="table"><table>
 		<tr>
-			<!-- TMPL_LOOP name="item_header_loop" --><th><tmpl_var name="header_value"></th><!-- /TMPL_LOOP -->
+			<!-- TMPL_LOOP NAME="item_header_loop" --><th><tmpl_VAR NAME="header_value"></th><!-- /TMPL_LOOP -->
 		</tr>
-		<!-- TMPL_LOOP name="item_loop" -->
+		<!-- TMPL_LOOP NAME="item_loop" -->
 			<tr>
-					<!-- TMPL_VAR name="item_value" -->
+					<!-- TMPL_VAR NAME="item_value" -->
 			</tr>
 		<!-- /TMPL_LOOP -->
      </table></div>
 	 </div>
+	<script language="JavaScript" type="text/javascript">
+function confirm_deletion() {
+	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+	if (is_confirmed) {
+		window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR NAME="bibid" -->";
+	}
+}
+</script>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl
index ba6df62c1d..8b5052dbcd 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl
@@ -1,10 +1,10 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 
 <div id="main">
-<h1>Catalogue Search</h1>
+<h1>Advanced Catalogue Search</h1>
 <h3>Search by Number</h3>
 <div class="form">
 <form action="/cgi-bin/koha/search.pl" method="post">
@@ -26,10 +26,6 @@
 			<option value="">Any</option>
 			<!-- TMPL_VAR name="classlist" -->
 			</select></td></tr>
-
-<!-- This is commented out because it doesn't seem to actually work -->			
-<!-- <tr><th>Branch</th><td><select name="branch"><option value="">-- Choose a Branch -- </option></select></td></tr> -->
-
 <tr><th>Pub Date</th><td>(before) <input type="text" size="8" name="date-before">  (after) <input type="text" size="8" name="date-after" /></td></tr>
 <tr><th>Search Type</th><td><input type="radio" name="ttype" value="normal" checked="checked" />Normal	<input type="radio" name="ttype" value="exact" />Exact</td></tr>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl
index 59b5212fe3..32c5225b04 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl
@@ -1,17 +1,18 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Details for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-
 <div id="main">
-
-<div class="details"><!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-			<div style="float: right;"><img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" /></div>
-<h3><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF -->
-	<!-- TMPL_VAR NAME="class" --></h3><h4>Biblio Record <!-- TMPL_VAR NAME="biblionumber" --></h4>
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+<h3 class="title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF -->
+	<!-- TMPL_VAR NAME="class" --></h3><div class="details">
+			<div style="float: right;">
+<img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/koha/intranet/htdocs/intranet-tmpl/npl/en/images/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
+</div>
+<h4>Biblio Record <!-- TMPL_VAR NAME="biblionumber" --></h4>
 	<div class="tabitem"><form action="MARCdetail.pl" method="get">
 <input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="Item Details" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form>
+<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="Item Details" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form>
 </div>
 	<!-- /TMPL_IF -->
 <ul>
@@ -33,6 +34,7 @@
 	<!-- /TMPL_LOOP --></li>
 		<!-- /TMPL_IF -->
 			</ul>
+
 			</div>
 <div class="table"><table>
 	<tr>
@@ -93,26 +95,22 @@
 </table>
 </center>
 <br clear=all>
-<p />
- -->
-<!--
-<table border="1" cellspacing="0" cellpadding="5" width="90%">
-<tr>
-<td bgcolor="$main"
-background="/images/background-mem.gif"><b>Abstract</b></td>
-</tr>
-<tr>
+<p /> -->
+
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+<!-- TMPL_IF NAME="abstract -->
+<table>
+<caption>Abstract</caption>
+<tr>
 <td><!-- TMPL_VAR NAME="abstract" --></td>
-<!-- /TMPL_LOOP -->
 </tr>
 </table>
-<p />
-<table border="1" cellspacing="0" cellpadding="5" width="90%">
-<tr>
-<td bgcolor="$main" background="/images/background-mem.gif"><b>Links to
-Associated Websites<b></td>
-</tr>
+<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+
+<!-- TMPL_IF NAME="SITE_RESULTS" -->
+<table>
+<caption>Links to Associated Web Sites</caption>
 <!-- TMPL_LOOP NAME="SITE_RESULTS" -->
 <tr>
 <td><b>Title:</b> <!-- TMPL_VAR name="title" --><br>
@@ -123,7 +121,7 @@ name="url"></a><br>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
+<!-- /TMPL_IF -->
 
--->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/detailprint.tmpl
index e23ffee7b3..d6d6260496 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/detailprint.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/detailprint.tmpl
@@ -1,4 +1,5 @@
-<TMPL_INCLUDE NAME="main-top-print.inc">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Print View for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close-print.inc" -->
+<!-- TMPL_INCLUDE NAME="main-top-print.inc" -->
 
 <!-- main site -->
 <div id="main">
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/moredetail.tmpl
index 15c6edeeda..077c38b502 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/moredetail.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Item Details for <!-- TMPL_LOOP NAME="BIBITEM_DATA" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
@@ -55,7 +55,7 @@
 <!-- TMPL_IF NAME="dateaccessioned" --><tr><th><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&amp;catview=yes">
 Accession</a>
 Date:</th><td><!-- TMPL_VAR NAME="dateaccessioned" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="wthdrawn" --><tr><th>Withdrawn: </th><td><!-- TMPL_VAR NAME="wthdrawn" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="wthdrawn" --><tr><th>Withdrawn: </th><td>Yes</td></tr><!-- /TMPL_IF -->
 <tr><th><a
 href="/cgi-bin/koha/bookcount.pl?&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Total
 Issues:</a></th><td>&nbsp; <!-- TMPL_VAR NAME="issues" --></td></tr>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl
index 5b7b8facae..06e67f0968 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: <!-- TMPL_IF NAME="searchdesc" -->Search results for <!-- TMPL_VAR NAME="searchdesc" --><!-- TMPL_ELSE -->You did not specify any seach criteria<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
@@ -43,15 +43,15 @@
 <!-- Actual Search Results -->
 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
 	<tr>
-		<td class="data"><a href="/cgi-bin/koha/detail.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> (<!-- TMPL_VAR NAME="isbn" -->)<!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></a></td>
-		<td class="data"><!-- TMPL_IF NAME="author" --><a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="author" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+		<td class="data"><a class="searchresults" href="/cgi-bin/koha/detail.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> (<!-- TMPL_VAR NAME="isbn" -->)<!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></a></td>
+		<td class="data"><!-- TMPL_IF NAME="author" --><a class="searchresults"  href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="author" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
 		<td class="data"> <!-- TMPL_IF NAME="copyrightdate" --><!-- TMPL_VAR NAME="copyrightdate" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td>
 		<td><!-- TMPL_IF NAME="classification" --><!-- TMPL_VAR NAME="classification" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
 		<td class="data"> <!-- TMPL_IF NAME="itemcount" --><!-- TMPL_VAR NAME="itemcount" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td>
 		<td class="data"> <!-- TMPL_IF NAME="location" --><!-- TMPL_VAR NAME="location" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td>
 		<!-- TMPL_IF NAME="opac" -->
 		<!-- TMPL_ELSE -->
-			<td class="data"> <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reserves</a></td>
+			<td class="data"> <a class="searchresults"  href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reserves</a></td>
 		<!-- /TMPL_IF -->
 	</tr>
 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/npl/en/catalogue/subject.tmpl
index 2cfedc9103..e26f22af34 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/catalogue/subject.tmpl
@@ -1,13 +1,12 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Search Results for <!-- TMPL_VAR NAME="searchdesc" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-
+<h3>You searched for <!-- TMPL_VAR NAME="searchdesc" --></h3>
 <div class="results">Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.</div>
 <table>
-<tr>
-<th>Subject</th></tr>
+<tr><th>Subject Heading</th></tr>
 <!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
   <tr>
   <td><a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME="subject2" ESCAPE="HTML" -->"><!-- TMPL_VAR NAME="subject" --></a></td>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl
index 13a99015dd..8b1785bcbd 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-circ-open.inc" -->Koha -- Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl
index 28b650726a..1b40b20b7c 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top-circ.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation<!-- TMPL_IF Name="borrowernumber" -->: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->  (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -54,7 +54,7 @@
 
 <!-- TMPL_IF name="message" -->
 	<div class="details">
-	No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <a href="/cgi-bin/koha/memberentry.pl?type=Add">Add a new patron</a>
+	No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <a href="/cgi-bin/koha/members/memberentry.pl?type=Add">Add a new patron</a>
 	</div>
 <!-- /TMPL_IF -->
 
@@ -66,7 +66,7 @@
 	<p><!-- TMPL_VAR name="CGIselectborrower" --></p>
 	<p><input type="submit" class="submit" value="Select" /><input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
 	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /></p>
-	<p>Patron not found? <a href="/cgi-bin/koha/memberentry.pl?type=Add">Add a new patron</a></p>
+	<p>Patron not found? <a href="/cgi-bin/koha/members/memberentry.pl?type=Add">Add a new patron</a></p>
 	</form>
 </div>
 <!-- TMPL_ELSE -->
@@ -93,7 +93,7 @@
 <li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></li>
 <li><!-- TMPL_VAR NAME="phone" --></li>
 <li>Category: <!-- TMPL_VAR name="categorycode" --></li>
-<li>(<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a> / <a href="/cgi-bin/koha/memberentry.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit">edit</a>)</li>
+<li>(<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a> / <a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit">edit</a>)</li>
 </ul>
  </div>
     <h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
@@ -172,7 +172,7 @@
 <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post">
 			<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 <table>
-	<caption>Issues <span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span></caption>
+	<caption>Issues</caption>
 	<tr>
 		<th>Due Date</th><th>Title</th><th>Author</th><th>Call No</th><th>Barcode</th><th>Renew?</th>
 	</tr>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl
index 33861e171b..9e61b9abd0 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-circ-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -12,7 +12,7 @@
 		<caption><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
 		<tr><th>Patron: </th><td>
 			<ul>
-						<li><a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
 			<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
 			<li><!-- TMPL_VAR Name="borstraddress" --><br />
 			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
@@ -56,7 +56,7 @@
 			<caption><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
 			<tr><th>Patron: </th><td>
 			<ul>
-						<li><a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
 			<li><!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" --></li>
 			<li><!-- TMPL_VAR Name="borstraddress" --><br />
 			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
@@ -79,8 +79,8 @@
 <h1>Circulation: Returns</h1>
 	<div class="details">
 	<form method="post" action="/cgi-bin/koha/circ/returns.pl"  name="mainform" id="mainform">
-			<label for="barcode">Enter Book Barcode</label>
-		<input name="barcode" id="barcode" size="14" maxlength="14" />
+			<label for="barcode">Enter Item Barcode</label>
+			<input name="barcode" id="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" />
 			<input type="submit" class="submit" value="Submit" />
 			<!-- TMPL_LOOP Name="inputloop" -->
 				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -111,10 +111,10 @@
 
 <!-- TMPL_IF Name="returned" -->
 <div class="table"><table>
-		<tr><th>Item Information</th><th>Borrower Information</th></tr>
+		<tr><th>Item Information</th><th>Patron Information</th></tr>
 		<tr><td><!-- TMPL_VAR Name="itemtitle" -->
 		</td><td><div class="flags">
-<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
+<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
 		<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
 
 <!-- removed: removed-from-returns.tmpl -->
@@ -128,25 +128,13 @@
 
 
 
-<!-- TMPL_IF Name="returneditems" -->
+<!-- TMPL_IF Name="riloop" -->
 <div class="table">
 		<table>
 		<caption>Returned Items</caption>
-		<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr>
+		<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Patron</th></tr>
 		<!-- TMPL_LOOP Name="riloop" -->
-			<tr><td>
-				<!-- TMPL_IF Name="duedate" -->
-					<!-- TMPL_IF Name="early" -->
-						<font color="red">
-					<!-- /TMPL_IF -->
-						<!-- TMPL_VAR Name="year" -->/<!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" -->
-					<!-- TMPL_IF Name="early" -->
-						</font>
-					<!-- /TMPL_IF -->
-				<!-- TMPL_ELSE -->
-					Not on Issue.
-				<!-- /TMPL_IF -->
-			</td>
+			<tr><td><!-- TMPL_IF Name="duedate" --><!-- TMPL_IF Name="early" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" -->/<!-- TMPL_VAR Name="year" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF --><!-- TMPL_ELSE -->Not on Issue.<!-- /TMPL_IF --></td>
 			<td>
 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
 			<td><!-- TMPL_VAR Name="itemtitle" --></td>
@@ -154,11 +142,11 @@
 			<td><!-- TMPL_VAR Name="itemtype" --></td>
 			<td>
 			<!-- TMPL_IF Name="duedate" -->
-				<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
+				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
 					<!-- TMPL_VAR Name="borcnum" -->
 				</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
 			<!-- TMPL_ELSE -->
-				<!-- TMPL_VAR Name="bornum" -->
+								<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
 			<!-- /TMPL_IF -->
 			</td></tr>
 		<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/npl/en/circ/selectbranchprinter.tmpl
index 97f9d19d68..d4a0586647 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/circ/selectbranchprinter.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-circ-open.inc" -->Koha -- Circulation: Select Your Home Branch<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Select Your Home Branch<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/export/marc.tmpl b/koha-tmpl/intranet-tmpl/npl/en/export/marc.tmpl
index 29385d4b5a..2885e43efd 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/export/marc.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/export/marc.tmpl
@@ -1,6 +1,6 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
 
 <div id="main"><h1>MARC Export</h1>
 <div class="details"><h4>Export in MARC format the following biblios:</h4>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/npl/en/import/breeding.tmpl
index 60be866189..d32c986894 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/import/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/import/breeding.tmpl
@@ -1,6 +1,6 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
 
 <div id="main">
 <h1>MARC acquisition system</h1>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc
index 2ebfbbeaac..d95f5f761f 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc
@@ -1,6 +1,6 @@
 </title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
 </style>
@@ -17,7 +17,7 @@ function openWindow(targeturl, windowname) {
 	// Open the popup window if it doesn't already exist and give it focus.
 	function PopWin(targeturl, windowname) {
 	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400");
+		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
 	  newwin.focus();
 	}
 	
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc
new file mode 100644
index 0000000000..20b45ff512
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc
@@ -0,0 +1,42 @@
+</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/tabs.css);
+</style>
+<script language="JavaScript" type="text/javascript">
+<!-- Hide from old browsers
+function openWindow(targeturl, windowname) {
+// newwin =
+// window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
+	location.href = targeturl;
+}
+ 
+ 	var newwin;
+	
+	// Open the popup window if it doesn't already exist and give it focus.
+	function PopWin(targeturl, windowname) {
+	
+		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
+	  newwin.focus();
+	}
+	
+  // Set the value of the form field to the passed value and optionally shift
+	// focus and close the popup.
+	function FillForm(val,formname,formfield) {
+	
+		document.forms[formname].elements[formfield].value = val;
+
+		// Uncomment below to shift focus after clicking link in popup.
+		document.forms[formname].elements[formfield].focus();
+		
+		// Uncomment below to close popup after clicking link.
+		newwin.close();
+	}
+ 
+// end hiding -->
+</script>
+</head>
+
+<body onload="showPanel(1);">
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-print.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-print.inc
new file mode 100644
index 0000000000..f8ce9191d0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-print.inc
@@ -0,0 +1,9 @@
+</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/print.css);
+</style>
+</head>
+
+<body>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc
new file mode 100644
index 0000000000..e2637466db
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc
@@ -0,0 +1,42 @@
+</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+</style>
+<script language="JavaScript" type="text/javascript">
+
+<!-- Hide from old browsers
+function openWindow(targeturl, windowname) {
+// newwin =
+// window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
+	location.href = targeturl;
+}
+ 
+ 	var newwin;
+	
+	// Open the popup window if it doesn't already exist and give it focus.
+	function PopWin(targeturl, windowname) {
+	
+		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
+	  newwin.focus();
+	}
+	
+  // Set the value of the form field to the passed value and optionally shift
+	// focus and close the popup.
+	function FillForm(val,formname,formfield) {
+	
+		document.forms[formname].elements[formfield].value = val;
+
+		// Uncomment below to shift focus after clicking link in popup.
+		document.forms[formname].elements[formfield].focus();
+		
+		// Uncomment below to close popup after clicking link.
+		newwin.close();
+	}
+ 
+// end hiding -->
+</script>
+</head>
+
+<body>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-open.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-open.inc
new file mode 100644
index 0000000000..90770a40c3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-open.inc
@@ -0,0 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
index d20a6f0025..d7dd0d5dfa 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
@@ -3,11 +3,21 @@
 				<li><h4>Koha</h4></li>
 
 				<li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li>
-				<li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>	</li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li>
+				<li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>	</li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li> <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li> </ul></li>
 				<li><a href="/cgi-bin/koha/members-home.pl">Patrons</a></li>
 				<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li>
 <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li>
 </ul></li>
-<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li>
+<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li>
+
+ <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> </ul></li>
+ <li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
+<li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a>
+<ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li>
+<li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul>
+</li><li><a href="/cgi-bin/koha/about.pl">About Koha</a></li> 
+<!-- TMPL_IF NAME="loggedinusername" --><li>
+    Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> <ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul></li><!-- /TMPL_IF -->
+
 			</ul>
 </div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
index 1e0f83659c..5a59c594eb 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
@@ -11,7 +11,7 @@
 				<input type="submit" class="submit" value="Submit" />
 	</form></li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
 </li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li>
-				<li><a href="/cgi-bin/koha/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/member.pl" method="post">
+				<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/members/member.pl" method="post">
 	<label for="member">Search:</label><input id="member" type="text" size="10" name="member" />
 	<input type="submit" value="Search" class="submit" />
 
@@ -20,12 +20,15 @@
 		<label for="keyword">Quick Search:</label><input id="keyword" type="text"  size="10" name="keyword" />
 		<input type="submit" value="Search" class="submit" />
 		</form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li>
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li>
+<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li><
 </ul></li>
-<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li>
+<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> </ul></li>
+ <li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
 <li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a>
 <ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li>
 <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul>
-</li>
-</ul>
+</li><li><a href="/cgi-bin/koha/about.pl">About Koha</a></li> 
+<!-- TMPL_IF NAME="loggedinusername" --><li>
+    Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> <ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul></li><!-- /TMPL_IF -->
+				</ul>
 </div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc
index 75f01eab58..ff30338337 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc
@@ -4,6 +4,7 @@
 <head>
 <title>Athens County Library Services -- Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/tabs.css);
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc
index 8220646917..7e620e45f8 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc
@@ -3,6 +3,7 @@
 <head>
 <title>Athens County Library Services -- Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/blank.css);
 </style>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc
index c982a74fc9..c8479156e9 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc
@@ -4,6 +4,7 @@
 <head>
 <title>Athens County Library Services -- Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
 </style>
@@ -20,7 +21,7 @@ function openWindow(targeturl, windowname) {
 	// Open the popup window if it doesn't already exist and give it focus.
 	function PopWin(targeturl, windowname) {
 	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400");
+		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
 	  newwin.focus();
 	}
 	
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc
index fb43100c29..b9bb3e2cca 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc
@@ -3,6 +3,7 @@
 <head>
 <title>Athens County Library Services -- Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/print.css);
 </style>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc
index fd14c110d0..857be25b10 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc
@@ -4,6 +4,7 @@
 <head>
 <title>Athens County Library Services -- Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
 </style>
@@ -21,7 +22,7 @@ function openWindow(targeturl, windowname) {
 	// Open the popup window if it doesn't already exist and give it focus.
 	function PopWin(targeturl, windowname) {
 	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400");
+		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
 	  newwin.focus();
 	}
 	
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/members-topmenu.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/members-topmenu.inc
index 04a8ba5f39..53ce563d61 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/members-topmenu.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/members-topmenu.inc
@@ -1,6 +1,6 @@
-<div id="topmenu"><a href="/cgi-bin/koha/members-home.pl">Patrons Home</a> | <form action="/cgi-bin/koha/member.pl" method="post">
+<div id="topmenu"><a href="/cgi-bin/koha/members/members-home.pl">Patrons Home</a> | <form action="/cgi-bin/koha/members/member.pl" method="post">
 <label for="member">Patron Search</label>
-  <input type="text" id="member" name="member" value="" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form><form action="/cgi-bin/koha/simpleredirect.pl" method="post">
+  <input type="text" id="member" name="member" value="" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form><form action="/cgi-bin/koha/members/memberentry.pl" method="post">
 <input type="submit" class="submit" value="Add New Patron" />
-<input type="hidden" name="chooseform" value="adult" />
+<input type="hidden" name="actionType" value="Add" />
 </form></div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
index fe4729d40c..99ddf7ae2d 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha Intranet Home<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 	<div id="main">
@@ -7,9 +7,9 @@
 			Circulation</a></dt>
 			<dd><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li>  <li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li>  <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
 <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set Branch</a></li></ul></dd>
-<dt><a href="/cgi-bin/koha/members-home.pl">Patrons</a></dt>
+<dt><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></dt>
 			<dd>Start with a search to add, update, or delete a record, check accounts, &amp; renew items.
-	<form action="/cgi-bin/koha/member.pl" method="post">
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
 	<label for="member">Enter Name or Barcode</label><input id="member" type="text" size="25" name="member" />
 	<input type="submit" value="Search" class="submit" />
 	</form></dd>
@@ -19,19 +19,20 @@
 		<label for="keyword">Quick Search:</label><input id="keyword" type="text"  size="25" name="keyword" />
 		<input type="submit" value="Search" class="submit" />
 		</form>
-		<ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li>
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet">Add Record</a></li> <li><a href="/cgi-bin/koha/maint/catmaintain.pl">Catalog Maintenance</a></li> </ul>
+		<ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li> 
+<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li> </ul>
 		</dd>
-		  
- <dt><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></dt><dd>&nbsp;</dd>
+
 <dt><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports
 			</a></dt>
-			<dd>All the system reports, webserver reports, and financial reports.</dd> 
+			<dd>Till reconciliation, overdues, and inventory</dd>
+
 <dt><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dt>
 			<dd><ul>
-<li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a> </li></ul></dd>
-<dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
-<dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul></dd>
+
+<li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a> </li>  <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> </ul></dd>
+ <dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
+<dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul></dd> 
 </dl></div>
             
 </div>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/mancredit.tmpl b/koha-tmpl/intranet-tmpl/npl/en/mancredit.tmpl
index 6b0c950e3e..8cd0adf75d 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/mancredit.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Create Manual Credit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/npl/en/maninvoice.tmpl
index c22751d6cb..6a87f342af 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/maninvoice.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Create Manual Invoice<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/marcimport/AcceptMarcUpload.tmpl b/koha-tmpl/intranet-tmpl/npl/en/marcimport/AcceptMarcUpload.tmpl
index f1672e3fa3..0b88b512f0 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/marcimport/AcceptMarcUpload.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/marcimport/AcceptMarcUpload.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <h1><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->>Main Menu</a></h1>
-<h2>Select a set of MARC records</h2>\n<ul>
+<h2>Select a set of MARC records</h2>
+<ul>
 <!-- TMPL_LOOP name="marc" -->
 	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="id" -->&menu=<!-- TMPL_VAR name="menu" -->><!-- TMPL_VAR name="name" --></a></li>
 <!-- /TMPL_LOOP -->
@@ -22,7 +23,7 @@
 	</tr>
 	<tr>
 		<td>
-			<input type="hidden" name=menu value=<!-- TMPL_VAR name="menu" -->
+			<input type="hidden" name=menu value="<!-- TMPL_VAR name="menu" -->">
 			Name this set of MARC records:
 		</td>
 		<td>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/imemberentry.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/imemberentry.tmpl
index f734fd24f7..dcce54b66c 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/imemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/imemberentry.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: <!-- TMPL_IF NAME="surname" -->Edit Record for  <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New Institution<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -31,7 +31,7 @@
     <tr><td><label for="contactname">Contact Name:</label> </td><td><input type="text" id="contactname" name="contactname" size="40" value="<!-- TMPL_VAR name="contactname" -->" /></td></tr>
 	<tr><td><label for="phoneday">Phone:</label> </td><td><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR name="phoneday" -->" /></td></tr>
 	<tr><td><label for="faxnumber">Fax:</label> </td><td><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR name="faxnumber" -->" /></td></tr>
-	<tr><td><label for="emailaddress">Email:</label> </td><td><input type="text" id="emailaddress" name="emailaddress" size="20" value="<!-- TMPL_VAR name="emailaddress" -->" /></td></tr>
+	<tr><td><label for="emailaddress">Email:</label> </td><td><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR name="emailaddress" -->" /></td></tr>
 	<tr><td><label for="altnotes">Notes:</label> </td><td><textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR name="altnotes" --></textarea></td></tr>
 </table></div>
 
@@ -39,7 +39,7 @@
 	<caption>Institution Details</caption>
 	<tr><td><label>Member Number:</label> </td><td><!-- TMPL_VAR NAME="member" --></td></tr>
 	<tr><td><label for="branchcode">Branch:</label> </td><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
-	<tr><td><label for="cardnumber_institution">Card Number: </label></td><td><input type="text" id="cardnumber_institution" name="cardnumber_institution" size="20" value="<!-- TMPL_VAR NAME="cardnumber_institution" -->" /></td></tr>
+	<tr><td><label for="cardnumber_institution">Card Number: </label></td><td><input type="text" id="cardnumber_institution" name="cardnumber_institution" size="7" maxlength="7" value="<!-- TMPL_VAR NAME="cardnumber_institution" -->" /></td></tr>
 	</table></div>
 
 	<p><input type="submit" class="submit" value="Add this Member" /></p>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl
index 6dc090ce45..8e37ed7414 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/jmemberentry.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Add Child for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -23,7 +23,7 @@
 <div class="table"><table>
   <caption>Parent or Guardian</caption>
 	<tr><td><label for="firstname_guardian">First Name</label></td><td><input type="text" name="firstname_guardian" id="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" /></td></tr>
-		<tr><td><label for="surname_guardian">Last Name</label></td><td><input type="text" name="surname_guardian" id="surname_guardian" size="20" value="<!-- TMPL_VAR NAME=surname -->" /></td></tr>
+		<tr><td><label for="surname_guardian">Last Name</label></td><td><input type="text" name="surname_guardian" id="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->" /></td></tr>
 		<tr><td><label for="guardian_number">Library Card Number</label></td><td><input type="text" name="guardian_number" id="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></td></tr>
 </table></div>
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl
index 2753e70619..6a3f17dd19 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
+<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
 	<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
 	<input type="hidden" name="newflags" value="1" />
 <div class="table">	<table>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/member-password.tmpl
index 56fae7888d..fef3babc27 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/member-password.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: <!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl
index 2ca61a5b9e..2959528230 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -23,7 +23,7 @@
     <tr>
     <!-- /TMPL_IF -->
       <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">ISS</a>)</td>
-      <td><a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a></td>
+      <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a></td>
       <td><!-- TMPL_VAR NAME="categorycode" --></td>
       <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
       <td><!-- TMPL_VAR NAME="odissue" --></td>
@@ -36,9 +36,9 @@
 <div class="tabitem"><form action="/cgi-bin/koha/simpleredirect.pl" method="post">
 <input type="submit" class="submit" value="Add New Patron" />
 <input type="hidden" name="chooseform" value="adult" />
-</form><form action="/cgi-bin/koha/simpleredirect.pl" method="post">
+</form> <form action="/cgi-bin/koha/simpleredirect.pl" method="post">
 <input type="submit" class="submit" value="Add New Institution" />
 <input type="hidden" name="chooseform" value="organisation" />
-</form></div>
+</form> </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl
index aec37f1749..8c49c25674 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl
@@ -1,11 +1,11 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: <!-- TMPL_IF NAME="modify" -->Edit Record for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New Patron<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<form action="/cgi-bin/koha/newmember.pl" method="post">
-<h1><!-- TMPL_VAR NAME="header" -->:</h1><!-- TMPL_IF NAME="modify" --> <h2><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR name="firstname" --></h2><!-- /TMPL_IF -->
+<form action="/cgi-bin/koha/members/newmember.pl" method="post">
+<h1><!-- TMPL_IF NAME="addAction" -->Add New Patron<!-- TMPL_ELSE -->Update Patron Details<!-- /TMPL_IF -->:</h1><!-- TMPL_IF NAME="modify" --> <h2><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR name="firstname" --></h2><!-- /TMPL_IF -->
   
 	<div class="table">
 	<table>
@@ -25,7 +25,8 @@
 
 	<tr>
 		<td><label for="address">Address:</label> </td>
-		<td colspan="3"><input type="text" id="address" name="address" size="25" value="<!-- TMPL_VAR NAME="address" -->" /></td>
+		<td colspan="3"><input type="text" id="address" name="address" size="25" value="<!-- TMPL_VAR NAME="address" -->" /><br />
+<input type="text" name="streetaddress" size="25" value="<!-- TMPL_VAr NAME="streetaddress" -->" /></td>
 	</tr>
 	
 	<tr>
@@ -127,7 +128,7 @@
 	</table></div>
 
 	  			<p><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input name="submit" type="submit" class="submit" value="<!-- TMPL_IF NAME="modify" -->Update<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> This Member" />
-<input class="cancel" type="button" value="Cancel" onclick="location.href='/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="member" -->'; return false;" /></p>
+<input class="cancel" type="button" value="Cancel" onclick="location.href='/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="member" -->'; return false;" /></p>
 
 </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/members-home.tmpl
index 0af99761b3..1c1b2ab5e4 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/members-home.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
@@ -7,40 +7,40 @@
 <div id="menu">
 <dl><dt>Patron Search</dt>
 			<dd>Start with a search to add, update, or delete a record, check accounts, &amp; renew items.
-	<form action="/cgi-bin/koha/member.pl" method="post">
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
 	<label for="member">Enter Name or Barcode</label><input id="member" type="text" size="25" name="member" />
 	<input type="submit" value="Search" class="submit" />
 	</form></dd>
 <dt>Browse Patrons</dt>
 <dd>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=a">A</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=b">B</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=c">C</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=d">D</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=e">E</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=f">F</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=g">G</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=h">H</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=i">I</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=j">J</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=a">A</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=b">B</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=c">C</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=d">D</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=e">E</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=f">F</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=g">G</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=h">H</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=i">I</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=j">J</a>
 
-<a class="nav" href="/cgi-bin/koha/member.pl?member=k">K</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=l">L</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=m">M</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=n">N</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=o">O</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=p">P</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=q">Q</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=r">R</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=s">S</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=k">K</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=l">L</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=m">M</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=n">N</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=o">O</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=p">P</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=q">Q</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=r">R</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=s">S</a>
 
-<a class="nav" href="/cgi-bin/koha/member.pl?member=t">T</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=u">U</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=v">V</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=w">W</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=x">X</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=y">Y</a>
-<a class="nav" href="/cgi-bin/koha/member.pl?member=z">Z</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=t">T</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=u">U</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=v">V</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=w">W</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=x">X</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
+<a class="nav" href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
 </dd>
 <!-- <dt><a href="/cgi-bin/koha/simpleredirect.pl?type=Add&amp;chooseform=adult">Add Patron</a></dt><dd>&nbsp;</dd> -->
 </dl>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
index 9dab9302c1..f8b6e19c9b 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Details for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
@@ -7,13 +7,13 @@
 <div id="main">
 <h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
 <div class="tabitem">
-			 <form method="post" action="/cgi-bin/koha/circ/circulation.pl"><input name="findborrower" type="hidden" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /><input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input type="submit" class="submit" value="Issue" /></form><!-- TMPL_IF name="IS_ADULT" --> <form action="/cgi-bin/koha/jmemberentry.pl" method="post"> <input type="submit" name="submit" value="Add Child" class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form> <!-- /TMPL_IF --><!-- TMPL_IF name="I" --> <form action="/cgi-bin/koha/imemberentry.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" name="modify" class="submit" value="Modify" /></form><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/memberentry.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="submit" name="modify" value="Edit" /></form><!-- /TMPL_IF --> <form action="/cgi-bin/koha/member-password.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Change Password" /></form> <form action="/cgi-bin/koha/member-flags.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Modify Privileges" /></form> <form action="/cgi-bin/koha/deletemem.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="cancel" value="Delete" /></form></div>
+			 <form method="post" action="/cgi-bin/koha/circ/circulation.pl"><input name="findborrower" type="hidden" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /><input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input type="submit" class="submit" value="Issue" /></form><!-- TMPL_IF name="IS_ADULT" --> <form action="/cgi-bin/koha/jmemberentry.pl" method="post"> <input type="submit" name="submit" value="Add Child" class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form> <!-- /TMPL_IF --><!-- TMPL_IF name="I" --> <form action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" name="modify" class="submit" value="Modify" /></form><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="submit" name="modify" value="Edit" /></form><!-- /TMPL_IF --> <form action="/cgi-bin/koha/members/member-password.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Change Password" /></form> <form action="/cgi-bin/koha/members/member-flags.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Modify Privileges" /></form> <form action="/cgi-bin/koha/deletemem.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="cancel" value="Delete" /></form></div>
 <div class="table"><div class="compact">
 <table>
 <tr><th>Name:</th><td><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_IF name="IS_ADULT" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="initials" --><!-- /TMPL_IF --></td></tr>
-		<tr><th>Address:</th><td><!-- TMPL_IF NAME="streetaddress" --><!-- TMPL_VAR NAME="streetaddress" --><br /><!-- /TMPL_IF --><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></td></tr>
+		<tr><th>Address:</th><td><!-- TMPL_IF NAME="streetaddress" --><!-- TMPL_VAR NAME="streetaddress" --><br /><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="physstreet" --><!-- TMPL_VAR NAME="physstreet" --><br /><!-- /TMPL_IF --><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></td></tr>
 		<!-- TMPL_UNLESS name="I" -->
-		<!-- TMPL_IF NAME="physstreet" --><tr><th>Permanent Address:</th><td><!-- TMPL_VAR NAME="physstreet" --><br /> <!-- TMPL_VAR NAME="streetcity" -->, <!-- TMPL_VAR NAME="homezipcode" --></td></tr><!-- /TMPL_IF -->
 		<tr><th>Home Phone: </th><td><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr><!-- /TMPL_UNLESS -->
 		<!-- TMPL_IF NAME="phoneday" --><tr><th>Work Phone: </th><td><!-- TMPL_VAR NAME="phoneday" --></td></tr><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="faxnumber" --><tr><th>Fax: </th><td><!-- TMPL_VAR NAME="faxnumber" --></td></tr><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl
index 7de113cf2d..72aacc498c 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/readingrec.tmpl
index 37d39b501d..75f64dac26 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/readingrec.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl b/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl
index 736efaeedd..d67ffeab27 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Item Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
@@ -21,23 +21,23 @@
 
 <div class="form">
 <table>
+<caption>Set Item Status:</caption>
 <tr>
-<th><label for="lost">Set Item Status to Lost:</label></th>
-<td>
-<input type="radio" id="lost" name="Lost" value="1"<!-- TMPL_IF Name="itemlost" --> checked="checked"<!-- /TMPL_IF --> />
+<th><label for="Lost">Lost:</label></th>
+<td><input type="radio" id="Lost" name="Lost" value="1"<!-- TMPL_IF Name="itemlost" --> checked="checked"<!-- /TMPL_IF -->>
 Yes
 <input type="radio" name="Lost" value="0"<!-- TMPL_UNLESS Name="itemlost" --> checked="checked"<!-- /TMPL_UNLESS --> />
 No
 </td>
 </tr>
-<!-- <tr>
-<td>Cancelled</td>
-<td><input type="radio" name="withdrawn" value="1"<!-- TMPL_IF Name="withdrawn" --> checked="checked"<!-- /TMPL_IF -->>
+<tr>
+<th><label for="withdrawn">Cancelled</label></th>
+<td><input type="radio" id="withdrawn" name="withdrawn" value="1"<!-- TMPL_IF Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_IF -->>
 Yes
-<input type="radio" name="withdrawn" value="0"<!-- TMPL_UNLESS Name="withdrawn" --> checked="checked"<!-- /TMPL_UNLESS -->>
+<input type="radio" name="withdrawn" value="0"<!-- TMPL_UNLESS Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_UNLESS -->>
 No
 </td>
-</tr> -->
+</tr>
 </table>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/modwebsites.tmpl b/koha-tmpl/intranet-tmpl/npl/en/modwebsites.tmpl
index 33a9a3c922..2959db0863 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/modwebsites.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/modwebsites.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Web Site Links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports.tmpl
index 978bf5f4f2..6ad5c7aa60 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/request.tmpl b/koha-tmpl/intranet-tmpl/npl/en/request.tmpl
index 90765e49cb..5bb9a00c29 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/request.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue: Add Reserve for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 <div id="main">
@@ -13,20 +13,21 @@
 <!-- TMPL_VAR Name="author" --></h3>
 <div class="form">
 	<table>
-		<tr><th>Rank</th><td><select name="rank-request">
-			<!--$priorityoptions-->
+		<tr><th>Rank</th><td>
+<select name="rank-request">
 			<!-- TMPL_LOOP Name="optionloop" -->
 				<option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->>
 					<!-- TMPL_VAR Name="num" -->
 				</option>
 			<!-- /TMPL_LOOP -->
-			</select></td></tr>
+			</select>
+			</td></tr>
 
 <!-- 		<tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr> -->
 		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
 		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
 		<!-- <tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr> -->
-		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">?</a></th><td><input type="text" size="10" name="member" /></td></tr>
+		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
 	</table>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reservereport.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reservereport.tmpl
index 775d0937a5..fe45ce28e6 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reservereport.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reservereport.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reserve Report: All Reserves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/npl/en/shelves.tmpl b/koha-tmpl/intranet-tmpl/npl/en/shelves.tmpl
index 79e7150f7e..5a039e6277 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/shelves.tmpl
@@ -1,102 +1,83 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue: Virtual Book <!-- TMPL_IF Name="viewshelf" -->Shelf '<!-- TMPL_VAR Name="shelfname" -->'<!-- TMPL_ELSE -->Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<div id="topmenu">
+<strong>Logged in as: <!-- TMPL_VAR Name="loggedinuser" --></strong> [<a href="/cgi-bin/koha/logout.pl">Log Out</a>]</div>
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<div id="main"><p align=left>Logged in as: <!-- TMPL_VAR Name="loggedinuser" --> [<a href="/cgi-bin/koha/logout.pl">Log Out</a>]</p>
-
+<div id="main">
 
 <!-- TMPL_IF Name="viewshelf" -->
-    <center>
-    <form>
-    <a href=shelves.pl>Shelf List</a><p>
-    <table border="0" cellpadding=0 cellspacing=0>
-		<tr><td colspan=7>
+ <h2>Virtual Shelf '<!-- TMPL_VAR Name="shelfname" -->'</h2> <form class="inline">
+	<label for="addbarcode">Add a book by barcode:</label> <input id="addbarcode" name="addbarcode" type="text" size="14" maxlength="14" />
 			<table>
-			<tr><td>Add a book by barcode:</td><td><input name=addbarcode></td></tr>
-			</table>
-			<br>
-			<table border="0" cellpadding=5 cellspacing=0 width=100%>
-			<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-			<font color=white>Contents of <!-- TMPL_VAR Name="shelfname" --> shelf</font>
-			</th></tr>
-			</table>
-		</td></tr>
+			
+		<tr><th>&nbsp;</th><th>Title</th><th>Author</th><th>Barcode</th></tr>
+	<!-- TMPL_IF NAME="itemsloop" -->
 		<!-- TMPL_LOOP Name="itemsloop" -->
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->" width=10 align=center><img src=/images/blankdot.gif></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+				<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
+				<td><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
+				<td><!-- TMPL_VAR Name="author" --></td><td><!-- TMPL_VAR Name="barcode" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+		<tr><td colspan="4">This shelf has no contents</td></tr>
+	<!-- /TMPL_IF -->
     </table>
-    <br>
-    <input type="hidden" name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-    <input type="hidden" name=modifyshelfcontents value=1>
-    <input type="hidden" name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
-    <input type=submit value="Remove Selected Items">
-    </form>
+    <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+    <input type="hidden" name="modifyshelfcontents" value="1" />
+    <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+    <input type="submit" class="cancel" value="Remove Selected Items" />
+    </form><form class="inline" action="shelves.pl" method="get"><input type="submit" class="submit" value="Back to Virtual Book Shelves" /></form>
 <!-- TMPL_ELSE -->
+<h2>Virtual Book Shelves</h2>
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
-			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+				<div class="error">Shelf "<!-- TMPL_VAR Name="string1" -->" already exists.</div>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP Name="paramsloop" -->
-			<!-- TMPL_IF Name="status" -->
-				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
+			<!-- TMPL_IF Name="status" -->			<div class="error">Shelf has <!-- TMPL_VAR Name="string" --> items on it.  Please remove all items before deleting this shelf.</div>
+
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		<center>
-		<a href=shelves.pl>Modify Shelf Contents</a><p>
-		<h1>Bookshelves</h1>
-		<table border="0" cellpadding=7>
-			<tr><td align=center>
-				<form method=post>
-				<input type="hidden" name=shelves value=1>
-				<table border="0" cellpadding=0 cellspacing=0>
-				<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<font color=white>Select Shelves to Delete</font>
-			</th></tr>
+    <form method="post">
+    <input type="hidden" name="shelves" value="1">
+    <label for="addshelf">Add Shelf:</label> <input name="addshelf" id="addshelf" type="text" size="25" />
+    <input type="submit" value="Add New Shelf" class="submit" />
+    </form>
+	<form method="post">
+				<input type="hidden" name="shelves" value="1">
+				<table>
+				<tr><th>Shelf Name</th><th>Delete?</th></tr>
 			<!-- TMPL_LOOP Name="shelvesloop" -->
 				<tr>
-					<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-						<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
-					</td>
-				</tr>
+					<td><a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><strong><!-- TMPL_VAR Name="shelfname" --></strong> (<!-- TMPL_VAR Name="shelfbookcount" --> books)</a></td><td>
+						<input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->"></td></tr>
 			<!-- /TMPL_LOOP -->
-    </table>
-    <p><input type=submit value="Delete Shelves"><p>
-    </td><td align=center valign=top>
-    <form method=post>
-    <input type="hidden" name=shelves value=1>
-    <p>Add Shelf: <input name=addshelf size=25><p>
-    <p><input type=submit value="Add New Shelf"><p>
-    </form>
-    </td></tr></table>
+	
+    </table><input type="submit" value="Delete Selected Shelves" class="cancel" /></form>
+	
 
-	<!-- TMPL_ELSE -->
-		<center>
-		<table border="0" cellpadding=4 cellspacing=0>
-			<tr><td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<table border="0" cellpadding=5 cellspacing=0 width=100%>
-					<tr><th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-					<font color=white>Shelf List</font>
-					</th></tr>
-				</table>
-			</td></tr>
+	<!-- TMPL_ELSE --><form method="post">
+    <input type="hidden" name="shelves" value="1">
+    <label for="addshelf">Add Shelf:</label> <input name="addshelf" id="addshelf" type="text" size="25" />
+    <input type="submit" value="Add New Shelf" class="submit" />
+    </form>
+		<form action="shelves.pl" method="get"><input type="hidden" name="shelves" value="1" /><table>
+		<tr><th>Shelf Name</th><th>Delete?</th></tr>
+		<!-- TMPL_IF NAME="shelvesloop" -->
 			<!-- TMPL_LOOP Name="shelvesloop" -->
-				<tr><td bgcolor="<!-- TMPL_VAR Name="color" -->">
-					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
-					</a>
-				</td></tr>
+				<tr><td><a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
+						<strong><!-- TMPL_VAR Name="shelfname" --></strong> (<!-- TMPL_VAR Name="shelfbookcount" --> books)</a>
+				</td><td>
+						<input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->"></td></tr>
 			<!-- /TMPL_LOOP -->
+		<!-- TMPL_ELSE -->
+		<tr><td colspan="2">There are no virtual book shelves</td></tr>
+		<!-- /TMPL_IF -->
 		</table>
-		<P><a href=shelves.pl?shelves=1>Add or Remove Book Shelves</a>
+		<input type="submit" value="Delete Selected Shelves" class="cancel" /></form>
+
 	<!-- /TMPL_IF -->
 
 <!-- /TMPL_IF --></div>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl b/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl
index e7d0ab60d3..eb59360235 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Statistics<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-- 
2.39.5