diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
index d860fed0c0..9b4fc9ff6c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
@@ -49,13 +49,12 @@ label {
 	text-align: center;
 	font-family: Arial;
 	font-size:12px;
-	padding: 0px 5px 0px 5px;
-	margin:2px;
+	padding: 2px 5px 2px 5px;
+	margin-top:5px;
+	margin-bottom:5px;
 	display:inline;
 	position:static;
 	border : 1px solid black;
-/*	border-width: 1px;
-	border-color: black;*/
 	text-decoration: none;
 	cursor:pointer;
 	vertical-align:middle;
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
index 22fdf6ee8b..641bd7d247 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
@@ -16,13 +16,11 @@ function Help() {
 	background-color: #86c268;
 	color:#FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 a.members:hover {
 	background-color: #86c268;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
 </head>
@@ -30,26 +28,9 @@ a.members:hover {
 <body>
 
 <!-- MENUS -->
-<div id="menubar">
-	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-	<a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-	<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-	<a class="about" href="/cgi-bin/koha/about.pl">About</a>
-	<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-<div id="submenu">
-	<span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/members/members-home.pl" class="submenu">Search</a>
-	<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="submenu2">Add member</a>
-	<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&amp;actionType=Add" class="submenu">Add organisation</a>
-</div>
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p class="user">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
 <!-- /TMPL_IF -->