diff --git a/trunk/images/bka.png b/trunk/images/bka.png
deleted file mode 100644
index 6223cf3..0000000
Binary files a/trunk/images/bka.png and /dev/null differ
diff --git a/trunk/images/logo-small.png b/trunk/images/logo-small.png
index 147e125..12132b2 100644
Binary files a/trunk/images/logo-small.png and b/trunk/images/logo-small.png differ
diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index ed336ad..5b63eb0 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -6,13 +6,13 @@
 	<string id="separator">&#160;|&#160;</string>
 
 	<!-- header -->
-	<string id="login_to_upload">to upload videos, log in first.</string>
+	<string id="header_login-to-upload">to upload videos, log in first.</string>
 
 	<string id="register">register</string>
 	<string id="login">login</string>
 	<string id="login_openid">login with OpenID</string>
 
-	<string id="upload_video">upload video</string>
+	<string id="header_upload-video">upload video</string>
 	<string id="settings_details">settings details</string>
 
 	<string id="logged_in_as">logged in as&#160;</string>
diff --git a/trunk/style/default.css b/trunk/style/default.css
index d28eb29..3de5beb 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -1,8 +1,43 @@
+/*
+Yolanda default stylesheet
+(c) 2007-2008 Nils Dagsson Moskopp 
+*/
+
+/* global default */
+
 *
 {
 	clear:			both;
 }
 
+
+body
+{
+	font-family:		sans-serif;
+	font-size:			8pt;
+	font-weight:		bold;
+	margin:				1.5em;
+	min-height:			100%;
+	text-align:			center;
+}
+
+div
+{
+	border-width:		0px;
+}
+
+input
+{
+	text-align:		left;
+}
+
+img
+{
+	border-width:		0;
+}
+
+/* links */
+
 a
 {
 	color:				#3f3fff;
@@ -26,20 +61,101 @@ a
 		margin-right:		0.25em;
 	}
 
-body
-{
-	font-family:		sans-serif;
-	font-size:			8pt;
-	font-weight:		bold;	
-	min-width:			550px;
-	margin:				2em;
-	text-align:			center;
-}
+/* header, footer */
+
+	a.footer,
+	a.header,
+	div.footer,
+	div.header
+	{
+		background-color:	#f0f0f0;
+		border-color:		#f0f0f0;
+		border-style:		solid;
+		clear:				none;
+		font-size:			1em;
+		line-height:		3em;
+		height:				3em;
+	}
+
+	a.footer,
+	a.header
+	{
+		border-bottom-width:	0px;
+		border-top-width:	0px;
+		border-left-width:	1px;
+		border-right-width:	1px;
+		display:			block;
+		padding-left:		1em;
+		padding-right:		1em;
+	}
+
+		a.footer:hover,
+		a.header:hover
+		{
+			background-color:	#ffffff;
+			border-color:		#c0c0c0;
+		}
+
+	a.latest-additions,
+	a.view-license
+	{
+		border-left-width:	0px;
+	}
+
+	a.register,
+	a.upload-video,
+	a.view-xml
+	{
+		border-right-width:	0px;
+	}
+
+	a.latest-additions,
+	a.most-downloads,
+	a.most-views,
+	a.report-bug,
+	a.view-license,
+	a.view-source-code
+	{
+		float:			left;
+	}
+
+	a.login,
+	a.login-openid,
+	a.logout,
+	a.preferences,
+	a.register,
+	a.upload-video,
+	a.view-xml
+	{
+		float:			right;
+	}
+
+	div.footer,
+	div.header
+	{
+		border-color:		#c0c0c0;
+		border-width:		1px;
+	}
+
+	div.footer
+	{
+		position:			absolute;
+		bottom:				1.5em;
+		margin-right:		1.5em;
+	}
+
+	img.logo-header
+	{
+		display:		none;
+		border:			1px black solid;
+		clear:			none;
+		float:			left;
+		margin-left:	1.5em;
+		margin-right:	0.5em;
+	}
+
+/* content */
 
-div
-{
-	border-width:		0px;
-}
 
 	div.button-download,
 	div.button-edit,
@@ -81,30 +197,6 @@ div
 	{
 	}
 
-	div.footer
-	{
-		line-height:	2.5em;
-		padding:		0.75em;
-	}
-
-	div.header1
-	{
-		color:			#525252;
-		float:			left;
-		text-align:		left;
-		width:			50%;
-		vertical-align:	bottom;
-	}
-
-	div.header2
-	{
-		clear:			none;
-		float:			right;
-		text-align:		right;
-		width:			50%;
-		vertical-align:	bottom;
-	}
-
 	div.messagebox
 	{
 		border-color:		#606060;
@@ -226,41 +318,11 @@ fieldset
 	border-width:		0px;
 }
 
-hr
-{
-	background-color:	#c0c0c0;
-	position:			relative;
-	top:				0.25em;
-	margin-bottom:		1.5em;
-}
-
-input
-{
-	text-align:		left;
-}
-
-img
-{
-	border-width:		0;
-}
-
-img.bka
-{
-	bottom:				0px;
-	left:				0px;
-	position:			fixed;
-	z-index:			1;
-}
-
 	img.logo-big
 	{
 		padding-bottom:		0.5em;
 	}
 
-	img.logo-small
-	{
-	}
-
 	img.openid-icon
 	{
 		padding-left:		0.2em;
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 454c4ad..0d90b87 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -147,81 +147,110 @@
 		</head>
 
 		<body>
-
-		<!-- crime detection -->
-		<img class="bka" src="/images/bka.png" />
-			
+	
 			<xsl:if test="not(//@embed='true')">
-				<xsl:choose>
-					<xsl:when test="string-length(//@username)=0">
-						<div class="header1">
-							<a>
+
+<!--
+				<a href="/">
+					<img class="logo-header" src="/images/logo-small.png" alt="Yolanda logo top (160x25)" />
+				</a>
+-->
+
+				<div class="header">
+	
+					<a class="header latest-additions">
+						<xsl:attribute name="href">
+							<xsl:value-of select="$site_strings[@id='page_query_latestadditions']" />
+						</xsl:attribute>
+						<xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
+					</a>
+
+					<a class="header most-views">
+						<xsl:attribute name="href">
+							<xsl:value-of select="$site_strings[@id='page_query_mostviews']" />
+						</xsl:attribute>
+						<xsl:value-of select="$locale_strings[@id='query_mostviews']" />
+					</a>
+
+					<a class="header most-downloads">
+						<xsl:attribute name="href">
+							<xsl:value-of select="$site_strings[@id='page_query_mostdownloads']" />
+						</xsl:attribute>
+						<xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
+					</a>
+
+					<xsl:choose>
+						<xsl:when test="string-length(//@username)=0">
+	
+	<!--
+							<a class="header">
 								<xsl:attribute name="href">
 									<xsl:value-of select="$site_strings[@id='page_login']" />
 								</xsl:attribute>
-								<xsl:value-of select="$locale_strings[@id='login_to_upload']" />
+								<xsl:value-of select="$locale_strings[@id='header_login-to-upload']" />
 							</a>
-						</div>
-						<div class="header2">
-							<a>
+	-->
+							<a class="header register">
 								<xsl:attribute name="href">
 									<xsl:value-of select="$site_strings[@id='page_register']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='register']" />
 							</a>
-							<xsl:value-of select="$locale_strings[@id='separator']" />
-							<a>
+	
+							<a class="header login">
 								<xsl:attribute name="href">
 									<xsl:value-of select="$site_strings[@id='page_login']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='login']" />
 							</a>
-							<xsl:value-of select="$locale_strings[@id='separator']" />
-							<img class="openid-icon" src="/images/openid-icon.png" alt="open id logo" />
-							<a>
+	
+							<a class="header login-openid">
 								<xsl:attribute name="href">
 									<xsl:value-of select="$site_strings[@id='page_login-openid']" />
 								</xsl:attribute>
+								<img class="openid-icon" src="/images/openid-icon.png" alt="open id logo" />
 								<xsl:value-of select="$locale_strings[@id='login_openid']" />
 							</a>
-						</div>
-					</xsl:when>
-					<xsl:otherwise>
-						<div class="header1">
-							<a>
+	
+						</xsl:when>
+						<xsl:otherwise>
+
+							<a class="header upload-video">
 								<xsl:attribute name="href">
 									<xsl:value-of select="$site_strings[@id='page_upload']" />
 								</xsl:attribute>
-								<xsl:value-of select="$locale_strings[@id='upload_video']" />
+								<xsl:value-of select="$locale_strings[@id='header_upload-video']" />
 							</a>
-							<xsl:value-of select="$locale_strings[@id='separator']" />
-							<a>
+
+							<a class="header preferences">
 								<xsl:attribute name="href">
 									<xsl:value-of select="$site_strings[@id='page_settings']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='settings_details']" />
 							</a>
-						</div>
-						<div class="header2">
+
+<!--
 							<xsl:value-of select="$locale_strings[@id='logged_in_as']" />
-							<a>
+
+							<a class="header">
 								<xsl:attribute name="href">
 									user/<xsl:value-of select="//@username" />
 								</xsl:attribute>
 								<xsl:value-of select="//@username" />
 							</a>
-							<xsl:value-of select="$locale_strings[@id='separator']" />
-							<a>
+-->
+
+							<a class="header logout">
 								<xsl:attribute name="href">
 									<xsl:value-of select="$site_strings[@id='page_logout']" />
 								</xsl:attribute>
 								<xsl:value-of select="$locale_strings[@id='logout']" />
 							</a>
-						</div>
-					</xsl:otherwise>
-				</xsl:choose>
 
-				<hr />
+						</xsl:otherwise>
+					</xsl:choose>
+
+				</div>
 
 				<xsl:if test="//message">
 					<xsl:call-template name="message"/>
@@ -236,7 +265,7 @@
 				</xsl:if>
 			
 			</xsl:if>
-			
+
 			<xsl:choose>
 				<xsl:when test="//frontpage">
 					<xsl:call-template name="frontpage"/>
@@ -265,29 +294,31 @@
 			</xsl:choose>
 
 			<xsl:if test="not(//@embed='true')">
+
 				<div class="footer">
-					<a>
+
+					<a class="footer view-license">
 						<xsl:attribute name="href">
 							<xsl:value-of select="$site_strings[@id='page_license']" />
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='footer_license']" />
 					</a>
-					<xsl:value-of select="$locale_strings[@id='separator']" />
-					<a>
+
+					<a class="footer view-source-code">
 						<xsl:attribute name="href">
 							<xsl:value-of select="$site_strings[@id='page_source-code']" />
 						</xsl:attribute>
 					<xsl:value-of select="$locale_strings[@id='footer_source_code']" />
 					</a>
-					<xsl:value-of select="$locale_strings[@id='separator']" />
-					<a>
+
+					<a class="footer report-bug">
 						<xsl:attribute name="href">
 							<xsl:value-of select="$site_strings[@id='page_report_bug']" />
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='footer_report_bug']" />
 					</a>
-					<xsl:value-of select="$locale_strings[@id='separator']" />
-					<a>
+
+					<a class="footer view-xml">
 						<xsl:attribute name="href">
 <!--
 					caveat: this currently does not work on root level
@@ -297,15 +328,20 @@
 						</xsl:attribute>
 						<xsl:value-of select="$locale_strings[@id='footer_view_xml']" />
 					</a>
-					<br />
-					<xsl:value-of select="$locale_strings[@id='footer_copyright']" />
-					<br />
-
-					<span class="protip">
-						<xsl:value-of select="$locale_strings[@id='footer_warranty']" />
-					</span>
 
 				</div>
+
+<!--
+				<br />
+				<xsl:value-of select="$locale_strings[@id='footer_copyright']" />
+-->
+
+				<br />
+
+				<span class="protip">
+					<xsl:value-of select="$locale_strings[@id='footer_warranty']" />
+				</span>
+
 			</xsl:if>
 
 		</body>
@@ -315,9 +351,9 @@
 
 <xsl:template name="logo-small">
 
-	<a href="/">
+<!--	<a href="/">
 		<img class="logo-small" src="/images/logo-small.png" alt="Yolanda logo top (160x25)" />
-	</a>
+	</a>-->
 
 </xsl:template>