From 91e99db992e071e29b9cf6d826d62e1242e49b90 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Wed, 18 Jan 2006 17:23:32 +0000
Subject: [PATCH] prog templates : completed, fixed & xhtml valid

---
 .../prog/en/{ => members}/boraccount.tmpl     |   6 +-
 .../prog/en/members/jmemberentry.tmpl         |  87 ++++--
 .../prog/en/members/member-flags.tmpl         |   3 +
 .../prog/en/members/member-password.tmpl      |  23 +-
 .../intranet-tmpl/prog/en/members/member.tmpl |  54 ++--
 .../prog/en/members/memberentry.tmpl          | 289 ++++++++++++------
 .../prog/en/members/members-home.tmpl         |   6 +-
 .../prog/en/members/moremember.tmpl           | 222 +++++++++-----
 .../intranet-tmpl/prog/en/members/pay.tmpl    |  23 +-
 .../prog/en/members/readingrec.tmpl           |  23 +-
 members/boraccount.pl                         |   2 +-
 members/memberentry.pl                        |   7 +-
 members/moremember.pl                         |   2 +-
 13 files changed, 481 insertions(+), 266 deletions(-)
 rename koha-tmpl/intranet-tmpl/prog/en/{ => members}/boraccount.tmpl (91%)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl
similarity index 91%
rename from koha-tmpl/intranet-tmpl/prog/en/boraccount.tmpl
rename to koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl
index db02db9035..d3bb3f2e71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl
@@ -1,9 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 <!-- The table with the account items -->
 
+<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+
 <table>
-<caption>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></caption>
   <tr>
   	<th>Date</th>
     <th>Description of Charges</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl
index b821465319..e5361c3cc3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl
@@ -1,5 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Add Child<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 <form action="/cgi-bin/koha/newjmember.pl" method="post">
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->" />
 	<input type="hidden" name="updtype" value="I" />
@@ -13,44 +16,62 @@
 	<input type="hidden" name="faxnumber" value="<!-- TMPL_VAR NAME="faxnumber" -->" />
 	<input type="hidden" name="emailaddress" value="<!-- TMPL_VAR NAME="emailaddress" -->" />
 	<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->" />
-	<input type="hidden" name="altphone" value"<!-- TMPL_VAR NAME="altphone" -->" />
+	<input type="hidden" name="altphone" value="<!-- TMPL_VAR NAME="altphone" -->" />
 
 	<h1>Add Child</h1>
-<table>
-  <caption>Parent or Guardian</caption>
-	<tr><th scope="row"><label for="firstname_guardian">First Name</label></th><td><input type="text" name="firstname_guardian" id="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" /></td></tr>
-		<tr><th scope="row"><label for="surname_guardian">Last Name</label></th><td><input type="text" name="surname_guardian" id="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->" /></td></tr>
-		<tr><th scope="row"><label for="guardian_number">Library Card Number</label></th><td><input type="text" name="guardian_number" id="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></td></tr>
-</table></div>
 
-	<div class="table"><!-- TMPL_LOOP NAME="cmemloop" -->
-	<table>
-		<caption>Child <!-- TMPL_VAR NAME="count" --></caption>
-	<tr>
-		<th scope="row"><label for="cmember">Member Number</label></th><td><!-- TMPL_VAR NAME="cmember" --></td>
-	</tr>
-	<tr>
-	<th scope="row"><label for="cardnumber_child_<!-- TMPL_VAR NAME="i" -->">Card Number</label></th><td><input type="text" id="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" name="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" size="20" value="<!-- TMPL_VAR NAME="jcardnumber" -->" /><input type="hidden" name="bornumber_child_<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="cmember" -->" /></td>
-	</tr>
-	<tr>
-		<th scope="row"><label for="firstname_child_<!-- TMPL_VAR NAME="i" -->">First Name(s)</label></th><td><input type="text" id="firstname_child_<!-- TMPL_VAR NAME="i" -->" name="firstname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  /></td></tr>
-		<tr><th scope="row"><label for="surname_child_<!-- TMPL_VAR NAME="i" -->">Last Name</label></th><td><input type="text" id="surname_child_<!-- TMPL_VAR NAME="i" -->" name="surname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  /></td></tr>
-		<tr><th scope="row"><label for="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->">Date of Birth (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" name="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" id="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" size="10"  /></td></tr>
-		<tr><th scope="row"><label for="sex_child_<!-- TMPL_VAR NAME="i" -->">Sex</label></th><td>
-			<input type="radio" id="sex_child_<!-- TMPL_VAR NAME="i" -->" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F" />F
-			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="M" />M
-		</td></tr>
-	<tr><th scope="row"><label for="school_child_<!-- TMPL_VAR NAME="i" -->">School</label></th><td><input type="text" id="school_child_<!-- TMPL_VAR NAME="i" -->" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" ></td>
-	</tr>
-	<tr>
-		<th scope="row"><label for="altnotes_child_<!-- TMPL_VAR NAME="i" -->">Notes</label></th><td><textarea name="altnotes_child_<!-- TMPL_VAR NAME="i" -->" id="altnotes_child_<!-- TMPL_VAR NAME="i" -->" cols="40" rows="3"></textarea></td>
-	</tr>
-	</table>
-	<!-- /TMPL_LOOP -->
+<h2>Parent or Guardian</h2>
+<p>
+	<label for="firstname_guardian">First Name</label>
+	<input type="text" name="firstname_guardian" id="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
+</p>
+<p>
+	<label for="surname_guardian">Last Name</label>
+	<input type="text" name="surname_guardian" id="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+</p>
+<p>
+	<label for="guardian_number">Library Card Number</label>
+	<input type="text" name="guardian_number" id="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+</p>
+<!-- TMPL_LOOP NAME="cmemloop" -->
+	<h2>Child <!-- TMPL_VAR NAME="count" --></h2>
+	<p>
+		<label>Member Number</label>
+		<!-- TMPL_VAR NAME="cmember" -->
+	</p>
+	<p>
+		<label for="cardnumber_child_<!-- TMPL_VAR NAME="i" -->">Card Number</label>
+		<input type="text" id="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" name="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" size="20" value="<!-- TMPL_VAR NAME="jcardnumber" -->" />
+		<input type="hidden" name="bornumber_child_<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="cmember" -->" />
+	</p>
+	<p>
+		<label for="firstname_child_<!-- TMPL_VAR NAME="i" -->">First Name(s)</label>
+		<input type="text" id="firstname_child_<!-- TMPL_VAR NAME="i" -->" name="firstname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  />
+	</p>
+	<p>
+		<label for="surname_child_<!-- TMPL_VAR NAME="i" -->">Last Name</label>
+		<input type="text" id="surname_child_<!-- TMPL_VAR NAME="i" -->" name="surname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  />
+	</p>
+	<p>
+		<label for="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->">Date of Birth (<!-- TMPL_VAR NAME="dateformat" -->)</label>
+		<input type="text" name="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" id="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" size="10"  />
+	</p>
+	<p>
+		<label for="sex_child_<!-- TMPL_VAR NAME="i" -->">Sex</label>
+		<input type="radio" id="sex_child_<!-- TMPL_VAR NAME="i" -->" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F" />F
+		<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="M" />M
+	</p>
+	<p>
+		<label for="school_child_<!-- TMPL_VAR NAME="i" -->">School</label>
+		<input type="text" id="school_child_<!-- TMPL_VAR NAME="i" -->" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" />
+	</p>
+	<p>
+		<label for="altnotes_child_<!-- TMPL_VAR NAME="i" -->">Notes</label>
+		<textarea name="altnotes_child_<!-- TMPL_VAR NAME="i" -->" id="altnotes_child_<!-- TMPL_VAR NAME="i" -->" cols="40" rows="3"></textarea>
+	</p>
+<!-- /TMPL_LOOP -->
 
 <input type="submit" value="Add New Member" />
-
 </form>
 
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
index 9490e0baf4..f2f3451ca2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
@@ -1,5 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 <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" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl
index 4b52057088..a50e422598 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl
@@ -1,23 +1,30 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- 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="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 <!-- TMPL_IF NAME="newpassword" -->
-<h3>Password Updated</h3>
+<h1>Password Updated</h1>
 
 <!-- TMPL_ELSE -->
 
 <form method="post" action="/cgi-bin/koha/members/member-password.pl">
-<h3>Change Username and/or Password for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h3>
+<h1>Change Username and/or Password for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
 	
 	<!-- TMPL_IF NAME="warn" -->
 		<p>You have entered a User ID that already exists.  Please choose another one.</p>
 	<!-- /TMPL_IF -->
 
-<table><tr><th scope="row">New UserID:</th><td><input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
-	
-<input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->" /></td></tr>
-<tr><th scope="row">New Password:</th><td><input name="newpassword" type="text" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->" /></td></tr></table>
-
-<input type="submit" value="Confirm Password" /> 
+<p>
+	<label>New UserID:</label>
+	<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
+	<input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->" />
+</p>
+<p>
+	<label>New Password:</label>
+	<input name="newpassword" type="text" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->" />
+</p>
+<p><input type="submit" value="Confirm Password" /></p>
 </form><!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
index 0b15bba7c4..e78ad6b5f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
@@ -1,31 +1,33 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member search result<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<table>
-<caption>Member Search Results</caption>
-  <tr>
-    <th>Card</th>
-    <th>Name</th>
-    <th>Cat</th>
-    <th>Address</th>
-    <th>OD/Issues</th>
-	<th>Charges</th>
-    <th>Notes</th>
-  </tr>
-  <!-- TMPL_IF NAME="resultsloop" -->
-  <!-- TMPL_LOOP NAME="resultsloop" -->
-  
-  <tr> <td><!-- TMPL_VAR NAME="cardnumber" --></td>
-      <td><a 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>
-	<td><!-- TMPL_VAR NAME="fines" --></td>
-      <td><!-- TMPL_VAR NAME="borrowernotes" --></td>
-</tr>
-    <!-- /TMPL_LOOP -->
-  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
-</table>
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<h1>Member Search Results</h1>
 
+<!-- TMPL_IF NAME="resultsloop" -->
+	<table>
+	<tr>
+		<th>Card</th>
+		<th>Name</th>
+		<th>Cat</th>
+		<th>Address</th>
+		<th>OD/Issues</th>
+		<th>Charges</th>
+		<th>Notes</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="resultsloop" -->
+	<tr>
+		<td><!-- TMPL_VAR NAME="cardnumber" --></td>
+		<td><a 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>
+		<td><!-- TMPL_VAR NAME="fines" --></td>
+		<td><!-- TMPL_VAR NAME="borrowernotes" --></td>
+	</tr>
+    <!-- /TMPL_LOOP -->
+</table>
+<!-- TMPL_ELSE --><p>No results found</p><!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl
index e2502a1129..604ca165d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl
@@ -1,5 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="modify" -->Edit Record<!-- TMPL_ELSE -->Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Member<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 	<!-- TMPL_IF NAME="addAction" -->
 	<h1>
 		Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Member
@@ -12,7 +15,6 @@
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF Name="NOK" -->
-		
 		<h3>Missing Information</h3>
 			<p>The following fields have a forbidden value. Correct them and press OK again :</p><ul>
 			<!-- TMPL_IF NAME="ERROR_surname" -->
@@ -28,7 +30,7 @@
 				<li><a href="#address">Mailing Address</a></li>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="ERROR_city" -->
-				<li><a href="#city">Mailing Address City/State</a><br>
+				<li><a href="#city">Mailing Address City/State</a></li>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
 				<li><a href="#cardnumber">Card Number</a></li>
@@ -37,7 +39,6 @@
 				<li><a href="#cardnumber">Invalid Card Number</a></li>
 			<!-- /TMPL_IF -->
 			</ul>
-		
 	<!-- /TMPL_IF -->
 	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
 		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
@@ -50,104 +51,204 @@
 		<!-- TMPL_ELSE -->
 			<input type="hidden" name="op" value="modify" />
 		<!-- /TMPL_IF -->
-<table>
-	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="title">Salutation:</label></th><td><!-- TMPL_VAR NAME="Mr" -->
-				<select name="title" id="title">
-					<option <!-- TMPL_VAR NAME="title_selected_ " --> value="">No Title</option>
-					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
-					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
-					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Ms</option>
-					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Mr</option>
-					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
-					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Sir</option>
-				</select>
-				</td></tr><!-- /TMPL_UNLESS -->
-	<tr><th scope="row"><label for="surname"><a name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td><input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td></tr>
-
-	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="firstname"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->><a name="firstname" id="firstname">First Name:</a></label> </th><td><input type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->></td></tr><!-- /TMPL_UNLESS -->
+	
+	<!-- TMPL_UNLESS name="institution" -->
+		<p>
+		<label for="title">Salutation:</label><!-- TMPL_VAR NAME="Mr" -->
+		<select name="title" id="title">
+			<option <!-- TMPL_VAR NAME="title_selected_ " --> value="">No Title</option>
+			<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
+			<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
+			<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Ms</option>
+			<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Mr</option>
+			<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
+			<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Sir</option>
+		</select>
+		</p>
+	<!-- /TMPL_UNLESS -->
+	<p>
+		<label for="surname">
+			<!-- TMPL_IF NAME="institution" -->Institution name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF -->
+		</label>
+		<input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+	</p>
+
+	<!-- TMPL_UNLESS name="institution" -->
+	<p>
+		<label for="firstname">First Name:</label>
+		<input type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
+	</p>
+	<!-- /TMPL_UNLESS -->
 				
-	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="initials">Initials:</label></th><td><input type="text" id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->"></td></tr><!-- /TMPL_UNLESS -->
+	<!-- TMPL_UNLESS name="institution" -->
+	<p>
+		<label for="initials">Initials:</label>
+		<input type="text" id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->" />
+	</p>
+	<!-- /TMPL_UNLESS -->
 					
-	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="othernames">Prefered Name:</label></th><td><input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
-
-<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="sex"><a name="sex" id="sex">Sex:</a> </label></th><td><input type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked="checked"<!-- /TMPL_IF -->>F	<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS -->> M</td>
-</tr><!-- /TMPL_UNLESS -->
-
-<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="dateofbirth">Date of Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td>
-</tr><!-- /TMPL_UNLESS -->
+	<!-- TMPL_UNLESS name="institution" -->
+	<p>
+		<label for="othernames">Prefered Name:</label>
+		<input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
+	</p>
+	<!-- /TMPL_UNLESS -->
+	<!-- TMPL_UNLESS name="institution" -->
+	<p>
+		<label for="sex">Sex:</label>
+		<input type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked="checked"<!-- /TMPL_IF --> />F	<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS --> /> M
+	</p>
+	<!-- /TMPL_UNLESS -->
 
-	<tr><th scope="row">Addresses:</th><td><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
-<br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
-<br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
-
-<fieldset><legend>Street Address (if different)</legend>
-<label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
-<br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
-<br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
+<!-- TMPL_UNLESS name="institution" -->
+	<p><label for="dateofbirth">Date of Birth: </label><input type="text" id="dateofbirth" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->" /> (<!-- TMPL_VAR NAME="dateformat" -->)</p>
+<!-- /TMPL_UNLESS -->
+
+<p>Addresses:</p>
+<fieldset>
+	<legend>Mailing Address</legend>
+	<p>
+		<label for="streetaddress">Address:</label>
+		<input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->" />
+	</p>
+	<p>
+		<label for="city">City, State:</label>
+		<input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" />
+	</p>
+	<p>
+		<label for="zipcode">Zip Code:</label>
+		<input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->" />
+	</p>
 </fieldset>
-</td></tr>
-
-	<tr><th scope="row"><label for="phone">Phone (Home):</label> </th><td><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
-	<tr><th scope="row"><label for="phoneday">Phone (Daytime):</label> </th><td><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
-	<tr><th scope="row"><label for="faxnumber">Fax: </label></th><td><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
-	<tr><th scope="row"><label for="emailaddress">Email :</label> </th><td><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
-			</tr>
-	<tr><th scope="row"><label for="textmessaging">Member message:</label><p> (appears in OPAC)</p></th><td><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
-	<tr><th scope="row"><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
-
-			<tr>
-				<!-- TMPL_IF NAME="addAction" -->
-					<th scope="row">Joining date (leave blank for today): </th>
-					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
-				<!-- TMPL_ELSE -->
-					<th scope="row">Joining date: </th>
-					<td><!-- TMPL_VAR name="joining" --></td>
-				<!-- /TMPL_IF -->
-			</tr>
-			<tr>
-				<th scope="row">Expiry date (leave blank for auto calc): </th>
-				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
-			</tr>
-
-			</table>
 
+<fieldset>
+	<legend>Street Address (if different)</legend>
+	<p>
+		<label for="physstreet">Address:</label>
+		<input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
+	</p>
+	<p>
+		<label for="streetcity">City, State: </label>
+		<input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
+	</p>
+	<p>
+		<label for="homezipcode">Zip Code:</label>
+		<input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" />
+	</p>
+</fieldset>
+<p>
+	<label for="phone">Phone (Home):</label>
+	<input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" />
+</p>
+<p>
+	<label for="phoneday">Phone (Daytime):</label>
+	<input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" />
+</p>
+<p>
+	<label for="faxnumber">Fax: </label>
+	<input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" />
+</p>
+<p>
+	<label for="emailaddress">Email :</label>
+	<input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" />
+</p>
+<p><label for="textmessaging">Member message: (appears in OPAC)</label></p>
+<p>
+	<textarea id="textmessaging" name="textmessaging" cols="30" rows="3">
+		<!-- TMPL_VAR NAME="textmessaging" -->
+	</textarea>
+</p>
+<p>
+	<label for="borrowernotes">Circulation note:(appears in Circulation)</label>
+	<textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3">
+		<!-- TMPL_VAR NAME="borrowernotes" -->
+	</textarea>
+</p>
+<!-- TMPL_IF NAME="addAction" -->
+	<p>
+		<label>Joining date (leave blank for today): </label>
+		<input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" />
+	</p>
+<!-- TMPL_ELSE -->
+	<p>
+		<label>Joining date: </label>
+		<!-- TMPL_VAR name="joining" -->
+	</p>
+<!-- /TMPL_IF -->
+<p>
+	<label>Expiry date (leave blank for auto calc): </label>
+	<input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" />
+</p>
 
 <!-- TMPL_UNLESS name="institution" -->
-		<table>
-		<caption>Alternate Contact</caption>
-		<tr><th scope="row"><label for="contactname">Name: </label></th><td><input type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td></tr>
-		<tr><th scope="row"><label for="altphone">Phone:</label> </th><td><input type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td></tr>
-		<tr><th scope="row"><label for="altrelationship">Relationship:</label> </th><td><select id="altrelationship" name="altrelationship" size="1">
-					<!-- TMPL_LOOP NAME="relshiploop" -->
-						<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
-					<!-- /TMPL_LOOP -->
-					</select></td></tr>
-		<tr><th scope="row"><label for="altnotes">Notes: </label></th><td><textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td></tr>
-		</table><!-- /TMPL_UNLESS -->
-
-<table>
-	<caption>Flags</caption>
-	<!-- TMPL_LOOP NAME="flagloop" -->
-	<tr><th scope="row"><label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="html" --></label></th><td><input type="radio" id="<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No</td></tr>
-				<!-- /TMPL_LOOP -->
-</table>
-
-<table>
-<caption>Member Details</caption>
-	<!-- TMPL_UNLESS NAME="addAction" --><tr><th scope="row"><label>Member Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" --></span></td></tr><!-- /TMPL_UNLESS -->
-	<tr><th scope="row"><label for="categorycode">Category:</label> </th><td><!-- TMPL_VAR NAME="catcodepopup" --></td></tr>
-	<tr><th scope="row"><label for="branchcode">Branch:</label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>	
-	<tr><th scope="row"><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
-</table>
-<table><caption>Additional Fields</caption>
-	<tr><th scope="row"><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
-	<tr><th scope="row"><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
-</table>
-
-
-<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" />
-	</form>
+<h2>Alternate Contact</h2>
+<p>
+	<label for="contactname">Name: </label>
+	<input type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->" />
+</p>
+<p>
+	<label for="altphone">Phone:</label>
+	<input type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->" />
+</p>
+<p>
+	<label for="altrelationship">Relationship:</label>
+	<select id="altrelationship" name="altrelationship" size="1">
+		<!-- TMPL_LOOP NAME="relshiploop" -->
+			<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
+		<!-- /TMPL_LOOP -->
+	</select>
+</p>
+<p>
+	<label for="altnotes">Notes: </label>
+	<textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea>
+</p>
+<!-- /TMPL_UNLESS -->
+
+<h2>Flags</h2>
+<!-- TMPL_LOOP NAME="flagloop" -->
+	<p>
+		<label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="html" --></label>
+		<input type="radio" id="<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" --> />Yes 
+		<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" --> />No
+	</p>
+<!-- /TMPL_LOOP -->
+
+<h2>Member Details</h2>
+	<!-- TMPL_UNLESS NAME="addAction" -->
+		<p>
+			<label>Member Number:</label>
+			<span class="ex"><!-- TMPL_VAR NAME="member" --></span>
+		</p>
+	<!-- /TMPL_UNLESS -->
+	<p>
+		<label for="categorycode">Category:</label>
+		<!-- TMPL_VAR NAME="catcodepopup" -->
+	</p>
+	<p>
+		<label for="branchcode">Branch:</label>
+		<!-- TMPL_VAR NAME="CGIbranch" -->
+	</p>
+	<p>
+		<label for="cardnumber">
+			<a name="cardnumber">Card Number</a>
+		</label>
+		<input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+	</p>
+
+<h2>Additional Fields</h2>
+<p>These fields are available for your own usage. They can be useful for statistical purposes</p>
+<p>
+	<label for="sort1">Sorting field 1</label>
+	<input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+</p>
+<p>
+	<label for="sort2">Sorting field 2</label>
+	<input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
+</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" />
+</form>
 
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
index 369970eddd..49f41cb85c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<title>Member Search</title>
-</head>
-<body>
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 <h1>Member Search</h1>
 
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
index 5997034f06..296a9e9138 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
@@ -1,100 +1,162 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 <h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
 
 <ul>
-	<!-- TMPL_IF name="IS_ADULT" --><li> <form action="/cgi-bin/koha/members/jmemberentry.pl" method="post"> <input type="submit" name="submit" value="Add Child" alt="Add Child" /><input type="hidden" name="type" value="add" /><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form></li><!-- /TMPL_IF -->
-	<li><!-- TMPL_IF name="I" --><form action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" name="modify" value="Edit this Record" /></form><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" name="modify" value="Edit this Record" /></form><!-- /TMPL_IF --></li>
-	<li><form action="/cgi-bin/koha/members/member-password.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" value="Change Member's Password" /></form></li>
-	<li> <form action="/cgi-bin/koha/members/member-flags.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" value="Modify Member's Privileges" /></form></li>
-	<li><form action="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="submit" class="cancel" value="Delete this Member"></form></li>
-	<li><form action="/cgi-bin/koha/boraccount.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" value="View Account" /></form></li>
-	<li>	<form action="/cgi-bin/koha/pay.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" value="Pay Fines" /></form></li>
-<li><form action="/cgi-bin/koha/readingrec.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Member's Reading Record" /></form></li>
+	<!-- TMPL_IF name="IS_ADULT" -->
+	<li>
+	<form action="/cgi-bin/koha/members/jmemberentry.pl" method="post">
+		<input type="submit" name="submit" value="Add Child" alt="Add Child" />
+		<input type="hidden" name="type" value="add" />
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+	</form>
+	</li>
+	<!-- /TMPL_IF -->
+	<li>
+	<!-- TMPL_IF name="I" -->
+	<form action="/cgi-bin/koha/members/imemberentry.pl" method="post">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
+		<input type="submit" name="modify" value="Edit this Record" />
+	</form>
+	<!-- TMPL_ELSE -->
+		<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
+			<input type="submit" name="modify" value="Edit this Record" />
+		</form>
+	<!-- /TMPL_IF -->
+	</li>
+	<li>
+		<form action="/cgi-bin/koha/members/member-password.pl" method="post">
+			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" />
+			<input type="submit" value="Change Member's Password" />
+		</form>
+	</li>
+	<li>
+		<form action="/cgi-bin/koha/members/member-flags.pl" method="post">
+			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" />
+			<input type="submit" value="Modify Member's Privileges" />
+		</form>
+	</li>
+	<li>
+		<form action="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->">
+			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
+			<input type="submit" class="cancel" value="Delete this Member" />
+		</form>
+	</li>
+	<li>
+		<form action="/cgi-bin/koha/members/boraccount.pl" method="get">
+			<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+			<input type="submit" value="View Account" />
+		</form>
+	</li>
+	<li>
+		<form action="/cgi-bin/koha/members/pay.pl" method="get">
+			<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+			<input type="submit" value="Pay Fines" />
+		</form>
+	</li>
+	<li>
+		<form action="/cgi-bin/koha/members/readingrec.pl" method="get">
+			<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+			<input type="submit" value="Member's Reading Record" />
+		</form>
+	</li>
 </ul>
 
 <!-- TMPL_IF NAME="flagged" -->
 	<ul>
-		<!-- TMPL_IF NAME="debarred" --><li>Patron is debarred <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="status" value="0" /><input type="submit" value="Lift Debarment" /></form></li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="debarred" -->
+			<li>Patron is debarred 
+			<form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
+				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+				<input type="hidden" name="status" value="0" />
+				<input type="submit" value="Lift Debarment" />
+			</form>
+			</li>
+		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Patron's address is in doubt.</li><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="lost" --><li>Patron's card has been reported lost.</li><!-- /TMPL_IF -->
 	</ul>
 
 <!-- /TMPL_IF -->
 
-<table>
-<caption>Borrower Information</caption>
-<tr><th scope="row">Title (borrowers.title): </th><td><!-- TMPL_VAR NAME="title" --></td></tr>
-<tr><th scope="row">First Name (borrowers.firstname):</th><td><!-- TMPL_VAR NAME="firstname" --></td></tr>
-<tr><th scope="row">Last Name (borrowers.lastname): </th><td></td></tr>
-<tr><th scope="row">Othernames (borrowers.othernames): </th><td><!-- TMPL_VAR NAME="othernames" --></td></tr>
-<tr><th scope="row">Initials (borrowers.initials): </th><td><!-- TMPL_VAR NAME="initials" --></td></tr>
-<tr><th scope="row">Street Address (borrowers.streetaddress): </th><td><!-- TMPL_VAR NAME="streetaddress" --></td></tr>
-<tr><th scope="row">City (borrowers.city): </th><td><!-- TMPL_VAR NAME="city" --></td></tr>
-<tr><th scope="row">Zip Code (borrowers.zipcode): </th><td><!-- TMPL_VAR NAME="zipcode" --></td></tr>
-
-<!-- TMPL_UNLESS NAME="I"--><tr><th scope="row">(borrowers.physstreet): </th><td><!-- TMPL_VAR NAME="physstreet" --></td></tr>
-<tr><th scope="row">(borrowers.streetcity): </th><td><!-- TMPL_VAR NAME="streetcity" --></td></tr>
-<tr><th scope="row">(borrowers.homezipcode): </th><td><!-- TMPL_VAR NAME="homezipcode" --></td></tr><!-- /TMPL_UNLESS -->
-
-<tr><th scope="row">Home Phone (borrowers.phone): </th><td><!-- TMPL_VAR NAME="phone" --></td></tr>
-<tr><th scope="row">Daytime Phone (borrowers.phoneday): </th><td><!-- TMPL_VAR NAME="phoneday" --></td></tr>
-<tr><th scope="row">Fax (borrowers.faxnumber): </th><td><!-- TMPL_VAR NAME="faxnumber" --></td></tr>
-<tr><th scope="row">E-mail Address (borrowers.emailaddress):</th><td><!-- TMPL_VAR NAME="emailaddress" --></td></tr>
+<h2>Borrower Information</h2>
+<p><label>Title (borrowers.title):</label><!-- TMPL_VAR NAME="title" --></p>
+<p><label>First Name (borrowers.firstname):</label><!-- TMPL_VAR NAME="firstname" --></p>
+<p><label>Last Name (borrowers.lastname): </label><!-- TMPL_VAR NAME="surname" --></p>
+<p><label>Othernames (borrowers.othernames): </label><!-- TMPL_VAR NAME="othernames" --></p>
+<p><label>Initials (borrowers.initials): </label><!-- TMPL_VAR NAME="initials" --></p>
+<p><label>Street Address (borrowers.streetaddress): </label><!-- TMPL_VAR NAME="streetaddress" --></p>
+<p><label>City (borrowers.city): </label><!-- TMPL_VAR NAME="city" --></p>
+<p><label>Zip Code (borrowers.zipcode): </label><!-- TMPL_VAR NAME="zipcode" --></p>
+
+<!-- TMPL_UNLESS NAME="I"-->
+<p><label>(borrowers.physstreet): </label><!-- TMPL_VAR NAME="physstreet" --></p>
+<p><label>(borrowers.streetcity): </label><!-- TMPL_VAR NAME="streetcity" --></p>
+<p><label>(borrowers.homezipcode): </label><!-- TMPL_VAR NAME="homezipcode" --></p>
+<!-- /TMPL_UNLESS -->
+
+<p><label>Home Phone (borrowers.phone): </label><!-- TMPL_VAR NAME="phone" --></p>
+<p><label>Daytime Phone (borrowers.phoneday): </label><!-- TMPL_VAR NAME="phoneday" --></p>
+<p><label>Fax (borrowers.faxnumber): </label><!-- TMPL_VAR NAME="faxnumber" --></p>
+<p><label>E-mail Address (borrowers.emailaddress):</label><!-- TMPL_VAR NAME="emailaddress" --></p>
 
 <!-- TMPL_UNLESS name="I" -->
-<tr><th scope="row">Date of Birth (borrowers.dateofbirth):</th><td><!-- TMPL_VAR NAME="dateofbirth" --></td></tr>
-<tr><th scope="row">Sex (borrowers.sex):</th><td><!-- TMPL_VAR NAME="sex" --></td></tr>
+<p><label>Date of Birth (borrowers.dateofbirth):</label><!-- TMPL_VAR NAME="dateofbirth" --></p>
+<p><label>Sex (borrowers.sex):</label><!-- TMPL_VAR NAME="sex" --></p>
 <!-- /TMPL_UNLESS -->
 
-<tr><th scope="row">Member Number (borrowers.borrowernumber):</th><td><!-- TMPL_VAR NAME="borrowernumber" --></td></tr>
-<tr><th scope="row">Category (borrowers.categorycode):</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
-<tr><th scope="row">Registration Date (borrowers.dateenrolled):</th><td><!-- TMPL_VAR NAME="dateenrolled" --></td></tr>
-<tr><th scope="row">Expiration Date (borrowers.expiry): </th><td><!-- TMPL_VAR NAME="expiry" --></td></tr>
-<tr><th scope="row">Registration Branch (borrowers.branchcode):</th><td><!-- TMPL_VAR NAME="branchcode" --></td></tr>
+<p><label>Member Number (borrowers.borrowernumber):</label><!-- TMPL_VAR NAME="borrowernumber" --></p>
+<p><label>Category (borrowers.categorycode):</label><!-- TMPL_VAR NAME="categorycode" --></p>
+<p><label>Registration Date (borrowers.dateenrolled):</label><!-- TMPL_VAR NAME="dateenrolled" --></p>
+<p><label>Expiration Date (borrowers.expiry): </label><!-- TMPL_VAR NAME="expiry" --></p>
+<p><label>Registration Branch (borrowers.branchcode):</label><!-- TMPL_VAR NAME="branchname" --></p>
 
 <!-- TMPL_IF NAME="printethnicityline" -->
-<tr><th scope="row">Ethnicity (borrowers.ethnicity):</th><td><!-- TMPL_VAR NAME="ethnicity" --></td></tr>
-<tr><th scope="row">Ethnicity Notes (borrowers.ethnotes): </th><td><!-- TMPL_VAR NAME="ethnotes" --></td></tr>
+<p><label>Ethnicity (borrowers.ethnicity):</label><!-- TMPL_VAR NAME="ethnicity" --></p>
+<p><label>Ethnicity Notes (borrowers.ethnotes): </label><!-- TMPL_VAR NAME="ethnotes" --></p>
 <!-- /TMPL_IF -->
 
-<tr><th scope="row">Sort field 1 (borrowers.sort1): </th><td><!-- TMPL_VAR NAME="sort1" --></td></tr>
-<tr><th scope="row">Sort field 2 (borrowers.sort2):</th> <td><!-- TMPL_VAR NAME="sort2" --></td></tr>
-<tr><th scope="row">OPAC login (borrowers.userid): </th><td><!-- TMPL_VAR name="userid" --></td></tr>
-<tr><th scope="row">OPAC Password (borrowers.password): </th><td><!-- TMPL_VAR NAME="password" --></td></tr> 
-<tr><th scope="row">Circulation Notes (borrowers.borrowernotes) :</th> <td><!-- TMPL_VAR name="borrowernotes" --></td></tr>
-<tr><th scope="row">Patron Message (borrowers.textmessaging):</th><td><!-- TMPL_VAR NAME="textmessaging" --></td></tr>
+<p><label>Sort field 1 (borrowers.sort1): </label><!-- TMPL_VAR NAME="sort1" --></p>
+<p><label>Sort field 2 (borrowers.sort2):</label><!-- TMPL_VAR NAME="sort2" --></p>
+<p><label>OPAC login (borrowers.userid): </label><!-- TMPL_VAR name="userid" --></p>
+<p><label>OPAC Password (borrowers.password): </label><!-- TMPL_VAR NAME="password" --></p> 
+<p><label>Circulation Notes (borrowers.borrowernotes) :</label><!-- TMPL_VAR name="borrowernotes" --></p>
+<p><label>Patron Message (borrowers.textmessaging):</label><!-- TMPL_VAR NAME="textmessaging" --></p>
 
 <!-- TMPL_UNLESS name="I" -->
-<tr><th scope="row">Alternate Contact Name (borrowers.contactname):</th><td><!-- TMPL_VAR NAME="contactname" --></td></tr>
-<tr><th scope="row">Alternate Contact Phone (borrowers.altphone): </th><td><!-- TMPL_VAR NAME="altphone" --></td></tr>
-<tr><th scope="row">Alternate Contact Relationship (borrowers.altrelationship):</th><td><!-- TMPL_VAR NAME="altrelationship" --></td></tr>
-<tr><th scope="row">Alternate Contact Notes (borrowers.altnotes): </th><td><!-- TMPL_VAR NAME="altnotes" --></td></tr>
+<p><label>Alternate Contact Name (borrowers.contactname):</label><!-- TMPL_VAR NAME="contactname" --></p>
+<p><label>Alternate Contact Phone (borrowers.altphone): </label><!-- TMPL_VAR NAME="altphone" --></p>
+<p><label>Alternate Contact Relationship (borrowers.altrelationship):</label><!-- TMPL_VAR NAME="altrelationship" --></p>
+<p><label>Alternate Contact Notes (borrowers.altnotes): </label><!-- TMPL_VAR NAME="altnotes" --></p>
 <!-- /TMPL_UNLESS -->
 
 		<!-- TMPL_UNLESS name="I" -->
 			<!-- TMPL_IF name="isguarantee" -->
-				<!-- TMPL_IF NAME="guaranteeloop" --><tr><th scope="row">Guarantees:</th><td><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></td></tr><!-- /TMPL_IF -->
-
+				<!-- TMPL_IF NAME="guaranteeloop" -->
+					<p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></p>
+				<!-- /TMPL_IF -->
 			<!-- TMPL_ELSE -->
-
-<!-- TMPL_IF name="guarantorborrowernumber" --><tr><th scope="row">Guarantor:</th>
-					<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></td></tr><!-- /TMPL_IF -->
-
+				<!-- TMPL_IF name="guarantorborrowernumber" -->
+					<p><label>Guarantor:</label><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></p>
+				<!-- /TMPL_IF -->
 			<!-- /TMPL_IF -->
-			
 		<!-- /TMPL_UNLESS -->
-</table>
 
-<h3>Fines &amp; Charges</h3>
-	<!-- TMPL_IF name="totaldue" -->Total Due: <!-- TMPL_VAR NAME="totaldue" -->
+<h2>Fines &amp; Charges</h2>
+	<!-- TMPL_IF name="totaldue" -->
+		<p>Total Due: <!-- TMPL_VAR NAME="totaldue" --></p>
 	<!-- TMPL_ELSE -->
-	No Outstanding Charges<!-- /TMPL_IF -->
+		<p>No Outstanding Charges</p>
+	<!-- /TMPL_IF -->
 
+<h2>Items On Loan</h2>
 <form action="renewscript.pl" method="post">
 	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
 <table>
-	<caption>Items On Loan</caption>
 	<tr>
 		<th scope="col">Title</th>
 		<th scope="col">Due</th>
@@ -107,11 +169,12 @@
 
 	<!-- tmpl_loop name="issueloop" -->
 	<tr>
-		<td><!-- TMPL_IF name="red" --><span class="overdue"><!-- /TMPL_IF -->
-		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="red" --></span><!-- /TMPL_IF -->
-		<a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
-			<!-- TMPL_VAR NAME="barcode" -->
-		</a>
+		<td>
+			<!-- TMPL_IF name="red" --><span class="overdue"><!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="red" --></span><!-- /TMPL_IF -->
+			<a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+				<!-- TMPL_VAR NAME="barcode" -->
+			</a>
 		</td>
 		<td><!-- TMPL_VAR NAME="date_due" --></td>
 		<td><!-- TMPL_VAR NAME="itemtype" --></td>
@@ -127,27 +190,30 @@
 		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Return</a></td>
 	</tr>
 	<!-- /tmpl_loop -->
-	<tfoot><tr><td colspan="3">Total Replacement Cost:</td><td><!-- TMPL_VAR NAME="totalprice" --></td><td colspan="2">&nbsp;</td></tr></tfoot>
+	<tr><td colspan="3">Total Replacement Cost:</td><td><!-- TMPL_VAR NAME="totalprice" --></td><td colspan="2">&nbsp;</td></tr>
 	</table><p><input type="submit" value="Renew Checked Items" /></p>
 </form>
 
-<form action="renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><!-- TMPL_LOOP NAME="issueloop" --><!-- TMPL_UNLESS NAME="norenew" --><input type="hidden" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y" /><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><input type="submit" value="Renew All" /></form>
-
-
-
+<form action="renewscript.pl" method="post">
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+	<!-- TMPL_LOOP NAME="issueloop" -->
+		<!-- TMPL_UNLESS NAME="norenew" -->
+			<input type="hidden" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y" />
+		<!-- /TMPL_UNLESS -->
+	<!-- /TMPL_LOOP -->
+	<input type="submit" value="Renew All" />
+</form>
 
-	<form action="/cgi-bin/koha/modrequest.pl" method="post">
+<h2>Reserves</h2>
+<form action="/cgi-bin/koha/modrequest.pl" method="post">
 	<input type="hidden" name="from" value="borrower" />
 	<table>
-	<caption>Reserves</caption>
 	<tr>
 		<th scope="row">Title</th>
 		<th scope="row">Requested</th>
 		<th scope="row">Remove</th>
 	</tr>
 
-
-
 	<!-- TMPL_LOOP name="reserveloop" -->
 	<tr>
 		<td>
@@ -168,8 +234,10 @@
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
 	</tr>
 	<!-- /tmpl_loop -->
+</table>
+<!-- TMPL_IF name="reserveloop" -->
+	<input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" />
+<!-- /TMPL_IF -->
+</form>
 
-</table>		<!-- TMPL_IF name="reserveloop" -->
-			<input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" />
-		<!-- /TMPL_IF --></form>
-
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
index ee91e42253..2472e6cac4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
@@ -1,15 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-	<form action="/cgi-bin/koha/pay.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
+<h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
+<form action="/cgi-bin/koha/pay.pl" method="post">
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
 <table>
-<caption>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></caption>
 <tr>
-	<th scope="col">Fines &amp; Charges</th>
-	<th scope="col">Description</th>
-	<th scope="col">Account Type</th>
-	<th scope="col">Amount</th>
-	<th scope="col">Amount Outstanding</th>
+	<th>Fines &amp; Charges</th>
+	<th>Description</th>
+	<th>Account Type</th>
+	<th>Amount</th>
+	<th>Amount Outstanding</th>
 </tr>
 	
 <!-- TMPL_LOOP name="loop_pay" -->
@@ -32,12 +35,10 @@
 	<td class="debit"><!-- TMPL_VAR name="amountoutstanding" --></td>
 </tr>
 <!-- /TMPL_LOOP -->
-<tfoot>
 <tr>
 	<td colspan="4">Total Due</td>
-	<td class="debit"><!-- TMPL_VAR name="total" --></td>
-	</tr>
-	</tfoot>
+	<td><!-- TMPL_VAR name="total" --></td>
+</tr>
 </table>
 <input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
index b62827575e..49edee6a7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
@@ -1,4 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
 <!-- TMPL_IF NAME="showfulllink" -->
 <ul>
 	<li>Showing All Items</li>
@@ -10,22 +14,26 @@
 	<li><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Show All Items</a></li>
 </ul>
 <!-- /TMPL_IF -->
+<h1>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
 <table>
-<caption>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></caption>
 <tr>
-	<th scope="col">
+	<th>
 		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=title&amp;amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
 	</th>
-	<th scope="col">
+	<th>
 		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR name="limit" -->">Author</a>
 	</th>
-	<th scope="col">Call No.</th>
-	<th scope="col">
+	<th>Call No.</th>
+	<th>
 		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=returndate DESC&amp;limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
 	</th>
 </tr>
 <!-- TMPL_LOOP name="loop_reading" -->
-<tr<!-- TMPL_IF NAME="toggle" --><!-- TMPL_ELSE --> class="highlight"<!-- /TMPL_IF -->>
+<!-- TMPL_IF NAME="toggle" -->
+<tr class="highlight">
+<!-- TMPL_ELSE -->
+<tr>
+<!-- /TMPL_IF -->
 	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
  		<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>
 	</td>
@@ -35,11 +43,10 @@
 	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="classification" --></td>
 	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR name="returndate" --><!-- TMPL_ELSE -->Checked Out<!-- /TMPL_IF -->
 	</td>
+</tr>
 <!-- /TMPL_LOOP -->
 </table>
 
 
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
diff --git a/members/boraccount.pl b/members/boraccount.pl
index eb37b95d11..82ac243885 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -38,7 +38,7 @@ my $theme = $input->param('theme'); # only used if allowthemeoverride is set
 #my %tmpldata = pathtotemplate ( template => 'boraccount.tmpl', theme => $theme );
 #my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "boraccount.tmpl",
+    = get_template_and_user({template_name => "members/boraccount.tmpl",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 234be6b0c6..035e9aa822 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -199,9 +199,10 @@ if ($delete){
 	my @relshipdata;
 	while (@relationships) {
 		my $relship = shift @relationships;
+		next unless $relship;
 		my %row = ('relationship' => $relship);
 		if ($data->{'altrelationship'} eq $relship) {
-			$row{'selected'}=' selected';
+			$row{'selected'}=' selected = "selected"';
 		} else {
 			$row{'selected'}='';
 		}
@@ -220,11 +221,11 @@ if ($delete){
 			'name'  => $flags{$key}[0],
 			'html'  => $flags{$key}[1]);
 	if ($data->{$key}) {
-		$row{'yes'}=' checked';
+		$row{'yes'}=' checked="checked"';
 		$row{'no'}='';
 	} else {
 		$row{'yes'}='';
-		$row{'no'}=' checked';
+		$row{'no'}=' checked="checked"';
 	}
 	push(@flagdata, \%row);
 	}
diff --git a/members/moremember.pl b/members/moremember.pl
index fe0aa0f4a4..d90e74ab6c 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -144,7 +144,7 @@ if (C4::Context->preference("IndependantBranches")) {
 	$samebranch =1 if ($userenv->{flags} == 1);
 }
 
-$data->{'branchcode'} = &getbranchname($data->{'branchcode'});
+$data->{'branchname'} = &getbranchdetail($data->{'branchcode'});
 
 # Converts the categorycode to the description
 $data->{'categorycode'} = &getborrowercategory($data->{'categorycode'});
-- 
2.39.5