Index: /branches/website/forumTheme/Templates/forumTheme/template/overall_header.html
===================================================================
--- /branches/website/forumTheme/Templates/forumTheme/template/overall_header.html	(revision 2425)
+++ /branches/website/forumTheme/Templates/forumTheme/template/overall_header.html	(revision 2426)
@@ -102,82 +102,64 @@
 <div id="wrap">
 	<div id="banner">
-		<a href="../index.php"><img src="../images/header.jpg" class="banner_img" alt="Eraser v6" /></a>
+		<div id="header"><a href="../index.php"><img src="../images/header.jpg" class="banner_img" alt="Eraser v6" /></a></div>
+		
+<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
+		<div id="search-box">
+			<form action="{U_SEARCH}" method="get" id="search">
+			<fieldset>
+				<input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
+				<input class="button2" value="{L_SEARCH}" type="submit" /><br />
+				<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS}
+			</fieldset>
+			</form>
+		</div>
+<!-- ENDIF -->
+
+		<div id="header-navbar" class="navbar">
+			<div id="inner">
+			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
+			<ul class="linklist leftside">
+				<li class="icon-ucp">
+					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
+						<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF -->
+					<!-- IF S_DISPLAY_SEARCH --> &bull;
+					<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
+					<!-- ENDIF -->
+					<!-- IF U_RESTORE_PERMISSIONS --> &bull;
+					<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
+					<!-- ENDIF -->
+					<!-- IF U_USER_FLAG_NEW --> &bull;
+					<a href="{U_USER_FLAG_NEW}" style="color: red; font-weight: bold;">{L_USER_FLAG_NEW}</a>
+					<!-- ENDIF -->
+				</li>
+			</ul>
+			<!-- ENDIF -->
+
+			<ul class="linklist rightside">
+				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
+				<!-- IF not S_IS_BOT -->
+					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
+					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
+					<li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
+				<!-- ENDIF -->
+			</ul>
+			</div>
+		</div>
 	</div>
 	<div id="content">
 		<a id="top" name="top" accesskey="t"></a>
-		<div id="page-header">
-			<div class="headerbar">
-				<div class="inner"><span class="corners-top"><span></span></span>
-	
-				<div id="site-description">
-					<a href="{U_INDEX}" title="{L_INDEX}" id="logo">{SITE_LOGO_IMG}</a>
-					<h1>{SITENAME}</h1>
-					<p>{SITE_DESCRIPTION}</p>
-					<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p>
-				</div>
-	
-			<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
-				<div id="search-box">
-					<form action="{U_SEARCH}" method="get" id="search">
-					<fieldset>
-						<input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
-						<input class="button2" value="{L_SEARCH}" type="submit" /><br />
-						<a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS}
-					</fieldset>
-					</form>
-				</div>
-			<!-- ENDIF -->
-	
-				<span class="corners-bottom"><span></span></span></div>
-			</div>
-	
-			<div class="navbar">
-				<div class="inner"><span class="corners-top"><span></span></span>
-	
-				<ul class="linklist navlinks">
-					<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
-	
-					<li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="return fontsizeup(event);" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li>
-	
-					<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
-					<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
-					<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
-					<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF -->
-				</ul>
-	
-				<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-				<ul class="linklist leftside">
-					<li class="icon-ucp">
-						<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
-							<!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF -->
-						<!-- IF S_DISPLAY_SEARCH --> &bull;
-						<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
-						<!-- ENDIF -->
-						<!-- IF U_RESTORE_PERMISSIONS --> &bull;
-						<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
-						<!-- ENDIF -->
-						<!-- IF U_USER_FLAG_NEW --> &bull;
-						<a href="{U_USER_FLAG_NEW}" style="color: red; font-weight: bold;">{L_USER_FLAG_NEW}</a>
-						<!-- ENDIF -->
-					</li>
-				</ul>
-				<!-- ENDIF -->
-	
-				<ul class="linklist rightside">
-					<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
-					<!-- IF not S_IS_BOT -->
-						<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
-						<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
-						<li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
-					<!-- ENDIF -->
-				</ul>
-	
-				<span class="corners-bottom"><span></span></span></div>
-			</div>
-	
-		</div>
-	
 		<a name="start_here"></a>
 		<div id="page-body">
+			<ul class="linklist navlinks">
+				<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
+
+				<li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="return fontsizeup(event);" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li>
+
+				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
+				<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF -->
+			</ul>
+			
 			<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
 			<div id="information" class="rules">
Index: /branches/website/forumTheme/Templates/forumTheme/theme/eraser.css
===================================================================
--- /branches/website/forumTheme/Templates/forumTheme/theme/eraser.css	(revision 2425)
+++ /branches/website/forumTheme/Templates/forumTheme/theme/eraser.css	(revision 2426)
@@ -88,4 +88,18 @@
 }
 
+	#header {
+		height: 115px;
+	}
+	
+	#header-nav a:link {
+		color: #BD3738;
+	}
+	
+	#search-box {
+		float: none;
+		margin: 0;
+		font-size: 75%;
+	}
+
 	.banner_img {
 		border: 0;
@@ -112,5 +126,4 @@
 	padding: 0 20px 0 20px;
 	font-size: .9em;
-	line-height: 1.7em;
 	text-align: justify;
 }