diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c77e47d593..d6e62e4159 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -356,14 +356,8 @@ a .term {
 }
 
 #members {
-	font-size : .75em;
-	font-weight : bold;
+	font-size : 85%;
 	padding : 4px 0 4px 0;
-	background-image : url(../../images/member-menu-background.gif);
-	background-repeat : repeat-x;
-	border-top : 1px solid #9999CC;
-	border-bottom : 1px solid #9999CC;
-	background-color : #AFBCCF;
 	color : #000066;
 }
 
@@ -371,36 +365,22 @@ a .term {
 	text-decoration : none;
 }
 
-#members a.card {
-	background-image : url(../../images/card.gif);
-	background-position : left;
-	background-repeat : no-repeat;
-	display : block;
-	padding-left : 39px;
-}
-
 #members a.logout {
+	color : #cc3333;
 	font-weight : bold;
 	padding : 0 .3em 0 .3em;
 	text-decoration : none;
 }
 
-#members a.logout:link, #members a.logout:visited, #members a.logout:hover, #members a.logout:active {
-	background-image : url(../../images/member-menu-background-logout.gif);
-	background-repeat : repeat-x;
-	color : #000000;
-}
-
-#members a:hover.logout {
-	background-image : url(../../images/member-menu-background-logout-hover.gif);
-	background-repeat : repeat-x;
-	color : #000000;
+#members li:first-child {
+	border-right : 1px solid black;
 }
 
 #members li {
 	display : inline;
 	list-style : none;
 	margin : 0;
+	padding : 0 .5em;
 }
 
 #members ul {
@@ -409,32 +389,6 @@ a .term {
 	text-align : right;
 }
 
-#members ul li a:link, #members ul li a:visited, #members span.members {
-	background-image : url(../../images/member-menu-background-link.gif);
-	background-repeat : repeat-x;
-	border-left : 1px solid #9999CC;
-	color : #006699;
-}
-
-#members ul li a:link, #members ul li a:visited, #members ul li a:hover, #members ul li a:active, #members span.members {
-	padding : 4px;
-}
-
-#members ul li a:hover {
-}
-
-#members ul li a:hover, #members ul li a:active {
-	background-image : url(../../images/member-menu-background-hover.gif);
-	background-repeat : repeat-x;
-}
-
-#members ul li:last-child {
-}
-
-#members ul li:last-child a {
-	border-right : 1px solid #9999CC;
-}
-
 #opac-main-search {
 	background-image : url( ../../images/menu-background.gif);
 	background-repeat : repeat-x;
@@ -740,14 +694,23 @@ a.reserve {
 	line-height : 2em;
 }
 
-#corner a.cart {
-	background-image : url(../../images/cart-small.gif);
-	background-position: left;
-	background-repeat : no-repeat;
-	padding: 0 15px;
+#opac-main-search a.cart {
+	background : #FFC url(../../images/cart-small.gif) 7px center no-repeat;
+	border : 1px solid white;
+	color : #6699cc;
+	padding : 5px;
+	padding-left : 25px;
 	text-decoration: none;
 }
 
+#opac-main-search a.lists {
+	background : #FFC;
+	border : 1px solid white;
+	color : #6699cc;
+	padding : 5px;
+	text-decoration: none;	
+}
+
 .pages {
 	line-height : 1.8em;
 	text-align: center;
@@ -980,7 +943,7 @@ margin-top : .4em;
 #fluid-content-1 {
 margin : .3em -1px 0 2%;
 display: inline /* fix IE6 */;
-line-height : 40px;
+line-height : 15px;
 }
 
 .clearfix:after {
@@ -1026,4 +989,17 @@ div.message {
 	background : white url("../../images/message-bg.gif") repeat-x left 0;
    border : 1px solid #bcbcbc;
 	width : 55%;
+}
+
+#moresearches {
+	color : #000099;
+	font-size : 90%;
+	line-height : 110%;
+	margin : .6em 0 .3em 2%;
+}
+
+#moresearches a:link, #moresearches a:visited {
+	color : #e5ebff;
+	font-weight : normal;
+	text-decoration : none;
 }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index d8432a9b8b..cc7d29df95 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -1,33 +1,10 @@
-<div class="yui-g">
-<div id="libraryname"><h1 id="library"><a href="/cgi-bin/koha/opac-main.pl"><!-- TMPL_IF NAME="LibraryName" --><!-- TMPL_VAR NAME="LibraryName" --><!-- TMPL_ELSE -->Koha Online Catalog<!-- /TMPL_IF --></a></h1>
-</div>
-
-<div id="corner"><!-- TMPL_IF NAME="opacbookbag" --><a class="cart" 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><!-- /TMPL_IF --><!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="languages">
+<div class="yui-g"><div id="corner"><!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="languages">
 	<ul>
 		<!-- TMPL_LOOP NAME="languages" --><li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language" -->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
 	</ul></div><!-- /TMPL_IF --></div></div>
 
 <div id="members">
-	<ul>
-	<!-- TMPL_IF NAME="virtualshelves" -->
-		<li><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a>
-		<!-- TMPL_IF NAME="FIXME_barshelves" --><--! FIXME: Owen, you can take it from here!  Make it "barshelves" for proof/demo. -->
-			<ul>
-			<!-- TMPL_LOOP NAME="barshelvesloop" -->
-			<li><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->">
-				<!-- TMPL_VAR NAME="shelfname" -->
-			</a></li>
-			<!-- /TMPL_LOOP -->
-			</ul>
-		<!-- /TMPL_IF -->
-		</li>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="loggedinusername" --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="loggedinusername" -->
-	<li><span class="members">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></span></li>
-	<li><a class="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li>
-	<!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li>
-	<!-- /TMPL_IF -->
+	<ul><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></a></span></li><li><a class="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li><!-- /TMPL_IF -->
 	</ul>	
 </div>
 
@@ -57,7 +34,26 @@
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
         <input type="submit" value="Search" class="submit" />
     </form>
-     <a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a>
+
+	<!-- TMPL_IF NAME="opacbookbag" --><a class="cart" 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><!-- /TMPL_IF -->
+
+	<!--TMPL_IF NAME="virtualshelves" --><a class="lists" href="/cgi-bin/koha/opac-shelves.pl">Lists</a><!-- /TMPL_IF -->
+	
+		<!-- TMPL_IF NAME="virtualshelves" -->
+		<li><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a>
+		<!-- TMPL_IF NAME="barshelves" --><-- ! FIXME: Owen, you can take it from here!  Make it "barshelves" for proof/demo. -->
+			<ul>
+			<!-- TMPL_LOOP NAME="barshelvesloop" -->
+			<li><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->">
+				<!-- TMPL_VAR NAME="shelfname" -->
+			</a></li>
+			<!-- /TMPL_LOOP -->
+			</ul>
+		<!-- /TMPL_IF -->
+		</li>
+	<!-- /TMPL_IF -->
+	
+	<div id="moresearches"><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a><!-- TMPL_IF name="OpacBrowser" --> | <a href="/cgi-bin/koha/opac-browser.pl">Browse by Hierarchy</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacAuthorities" --> | <a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by Subject</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacCloud" --> | <a href="/cgi-bin/koha/opac-tags_subject.pl">Tag Cloud</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacTopissue" --> | <a href="/cgi-bin/koha/opac-topissues.pl">Most Popular</a><!-- /TMPL_IF --></div>
 
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index 6a287edbed..1b9a69ad6f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -1,23 +1,6 @@
 <div id="menu">
-            
             <ul>
             <!-- TMPL_VAR NAME="OpacNav" -->
-            <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
-            <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
-            <li>Browse catalogue: <ul> <!-- TMPL_IF name="OpacBrowser" -->
-                <li><a href="/cgi-bin/koha/opac-browser.pl">by hierarchy</a></li>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="OpacAuthorities" -->
-                <li><a href="/cgi-bin/koha/opac-authorities-home.pl">by headings</a></li>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="OpacTopissue" -->
-                <li><a href="/cgi-bin/koha/opac-topissues.pl">by top issues</a></li>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="OpacCloud" -->
-                <li><a href="/cgi-bin/koha/opac-tags_subject.pl">by cloud</a></li>
-            <!-- /TMPL_IF --></ul></li>
-			<!-- TMPL_IF name="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">lists</a></li><!-- /TMPL_IF -->
-        		<!-- TMPL_IF name="suggestion" --><!-- TMPL_IF NAME="AnonSuggestions" --><li><a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
+          	<!-- TMPL_IF name="suggestion" --><!-- TMPL_IF NAME="AnonSuggestions" --><li><a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
             </ul>
-            
- </div>
+ </div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/images/menu-background.gif b/koha-tmpl/opac-tmpl/prog/images/menu-background.gif
index c99af9fea2..7d0743f8a1 100644
Binary files a/koha-tmpl/opac-tmpl/prog/images/menu-background.gif and b/koha-tmpl/opac-tmpl/prog/images/menu-background.gif differ