diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc b/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc
index 60b65e5d59..06bdf86e27 100644
--- a/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc
+++ b/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc
@@ -1,17 +1,29 @@
 <div id="masthead">
 <h1>Library Catalog Search</h1>
 <div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
-<a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag</a> | <label for="value">Search the Catalog</label>
+<p><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag</a></p> <p><label for="value">Search the Catalog</label>
   <input type="hidden" name="op" value="do_search" />
 			<input type="hidden" name="type" value="opac" />
 			<input type="hidden" name="marclist" value="" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
 			<input type="hidden" name="operator" value="contains" />
-			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></div>
-<div class="menu"><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
-	<a href="/cgi-bin/koha/opac-account.pl">your account</a>  | 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">log out</a>
+			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></p></div>
+<!-- <div class="menu"><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
+	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a> | <a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">log out</a>
   </ul>
+</div> -->
+<!-- TMPL_IF NAME="loggedinusername" --><div id="members">
+	<ul>
+		<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
+		<li><a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a></li>
+		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
+		<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
+	</ul>	
 </div>
+<!-- TMPL_ELSE -->
+	<div id="members">
+		<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
+	</div>
+<!-- /TMPL_IF -->
 </div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc
index 4ea4e56781..42efae5459 100644
--- a/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc
@@ -1,15 +1,27 @@
 <div id="masthead">
 <h1>Library Catalog Search</h1>
 <div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
-<a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a> | <label for="value">Search the Catalog</label>
+<p><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></p> <p><label for="value">Search the Catalog</label>
   <input type="hidden" name="op" value="do_search" />
 			<input type="hidden" name="type" value="opac" />
 			<input type="hidden" name="marclist" value="" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
 			<input type="hidden" name="operator" value="contains" />
-			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></div>
-<TMPL_IF NAME="loggedinusername">
-<div class="menu"><span class="loggedin">You are logged in as <TMPL_LOOP NAME="USER_INFO"><a href="/cgi-bin/koha/opac-user.pl"><TMPL_VAR NAME="title"> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></a></TMPL_LOOP></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div>
-</TMPL_IF>
+			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></p></div>
+<!-- <!-- TMPL_IF NAME="loggedinusername" -->
+<div class="menu"><span class="loggedin">You are logged in as <!-- TMPL_LOOP NAME="USER_INFO" --><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a><!-- /TMPL_LOOP --></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div><!-- /TMPL_IF --> -->
+<!-- TMPL_IF NAME="loggedinusername" --><div id="members">
+	<ul>
+		<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
+		<li><a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a></li>
+		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
+		<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
+	</ul>	
+</div>
+<!-- TMPL_ELSE -->
+	<div id="members">
+		<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
+	</div>
+<!-- /TMPL_IF -->
 </div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc b/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc
index 91c6b0a357..ae5c074f83 100644
--- a/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc
+++ b/koha-tmpl/opac-tmpl/npl/en/includes/masthead_adv.inc
@@ -1,7 +1,21 @@
 <div id="masthead">
 <h1>Library Catalog Search</h1>
 <div class="menu"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> | <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></div>
-<TMPL_IF NAME="loggedinusername">
-<div class="menu"><span class="loggedin">You are logged in as <TMPL_LOOP NAME="USER_INFO"><a href="/cgi-bin/koha/opac-user.pl"><TMPL_VAR NAME="title"> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></a></TMPL_LOOP></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div>
-</TMPL_IF>
+<!-- <!-- TMPL_IF NAME="loggedinusername" -->
+<div class="menu"><span class="loggedin">You are logged in as <!-- TMPL_LOOP NAME="USER_INFO" --><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a><!-- /TMPL_LOOP --></span> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></div>
+<!-- /TMPL_IF --> -->
+
+<!-- TMPL_IF NAME="loggedinusername" --><div id="members">
+	<ul>
+		<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
+		<li><a href="/cgi-bin/koha/opac-shelves.pl">My Book Lists</a></li>
+		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
+		<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
+	</ul>	
+</div>
+<!-- TMPL_ELSE -->
+	<div id="members">
+		<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
+	</div>
+<!-- /TMPL_IF -->
 </div>
\ No newline at end of file