diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index d802048..1af2ff3 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -59,9 +59,9 @@
 	<str id="information_logged_out">You are now logged out.</str>
 	<str id="information_metainformation_needed">To put the video into context, additional metainformation is needed.</str>
 	<str id="information_metainformation_rights"></str>
-	<str id="information_comment_created">Your comment has been created.</str>
-	<str id="information_registered">You successfully created yourself an account</str>
-	<str id="information_uploaded">You succcessfully uploaded your file</str>
+	<str id="information_comment_created">Your comment has been submitted.</str>
+	<str id="information_registered">Your account has been created.</str>
+	<str id="information_uploaded">Your file has been uploaded.</str>
 
 	<!-- warnings -->
 
@@ -113,10 +113,10 @@
 	<str id="button_page_4">Page 4</str>
 
 	<!-- video page -->
-	<str id="download_video">download video</str>
-	<str id="license_conditions">license conditions</str>
-	<str id="comment_on_video">Flamewar area below. Proceed with Caution.</str>
-	<str id="comment_post">post comment</str>
+	<str id="download_video">Download</str>
+	<str id="license_conditions">License Conditions</str>
+	<str id="comment_on_video">Flamewar area below. Proceed with caution.</str>
+	<str id="comment_post">Post</str>
 
 	<!-- dublin core entities -->
 	<str id="DC.Title">title</str>
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 1bc249e..35f98c9 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -96,7 +96,7 @@ div
 
 	div.search-small
 	{
-		clear:			none;
+		clear:			both;
 		float:			right;
 		text-align:		right;
 		padding-top:	1em;
@@ -154,8 +154,6 @@ img
 
 	img.logo-small
 	{
-		display:		inline-block;
-		float:			left;
 	}
 
 span.protip
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index f4d589e..0ea3558 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -156,11 +156,15 @@
 				</xsl:choose>
 
 				<hr />
-						
-				<xsl:if test="not(//frontpage)">
+
+				<xsl:if test="//search">
 					<xsl:call-template name="searchbar"/>
 				</xsl:if>
-			
+
+				<xsl:if test="not(//frontpage)">
+					<xsl:call-template name="logo-small"/>
+				</xsl:if>
+
 				<xsl:if test="//message">
 					<xsl:call-template name="message"/>
 				</xsl:if>
@@ -277,12 +281,16 @@
 	<xsl:call-template name="results"/>
 </xsl:template>
 
-<xsl:template name="searchbar">
+<xsl:template name="logo-small">
 
 	<a href="/">
 		<img class="logo-small" src="/images/logo-small.png" alt="Yolanda logo top (160x25)" />
 	</a>
 
+</xsl:template>
+
+<xsl:template name="searchbar">
+
 	<div class="search-small">
 		<form method="get" enctype="text/plain">
 			<xsl:attribute name="action">
@@ -290,7 +298,7 @@
 			</xsl:attribute>
 			<fieldset>
 				<xsl:value-of select="$locale_strings[@id='search']" />:
-				<input type="text" name="query" size="30">
+				<input type="text" name="query" size="20">
 					<xsl:attribute name="value">
 						<xsl:value-of select="//results/@value" />
 					</xsl:attribute>