diff --git a/trunk/style/structure/fake6.css b/trunk/style/structure/fake6.css
index 7d9db36..a8a8c96 100644
--- a/trunk/style/structure/fake6.css
+++ b/trunk/style/structure/fake6.css
@@ -289,7 +289,7 @@ ul
     ul#footer,
     ul#header
     {
-        clear:          both;
+        clear:          right;
         display:        block;
         height:         3em;
     }
diff --git a/trunk/xsl/xhtml/header.xsl b/trunk/xsl/xhtml/header.xsl
index 981a90e..32a4101 100644
--- a/trunk/xsl/xhtml/header.xsl
+++ b/trunk/xsl/xhtml/header.xsl
@@ -9,7 +9,15 @@
 
 <xsl:template name="header">
 
-    <ul id="header" role="navigation">
+<!--
+    <img>
+        <xsl:attribute name="src">
+            <xsl:value-of select="$site_strings[@id='path_root']" />/images/logo-small.png
+        </xsl:attribute>
+    </img>
+-->
+
+    <ul id="header" role="navigation" style="clear:right;">
 
         <xsl:choose>
             <xsl:when test="string-length(//@username)=0">
@@ -80,6 +88,35 @@
                     </a>
                 </li>
 
+                <li id="upload">
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="$site_strings[@id='path_upload']" />
+                        </xsl:attribute>
+                        <xsl:value-of select="$locale_strings[@id='header_upload-video']" />
+                    </a>
+                </li>
+
+<!--
+                <li id="">
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="$site_strings[@id='path_settings']" />
+                        </xsl:attribute>
+                        <xsl:value-of select="$locale_strings[@id='settings_details']" />
+                    </a>
+                </li>
+-->
+
+                <li id="logout">
+                    <a>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="$site_strings[@id='path_logout']" />
+                        </xsl:attribute>
+                        <xsl:value-of select="$locale_strings[@id='logout']" />
+                    </a>
+                </li>
+
             </xsl:otherwise>
         </xsl:choose>
 
diff --git a/trunk/xsl/xhtml/loginbox.xsl b/trunk/xsl/xhtml/loginbox.xsl
index 84530d9..361dee3 100644
--- a/trunk/xsl/xhtml/loginbox.xsl
+++ b/trunk/xsl/xhtml/loginbox.xsl
@@ -53,38 +53,6 @@
                 </a>
 -->
 
-                <ul id="account-actions" role="navigation">
-
-                    <li id="upload">
-                        <a>
-                            <xsl:attribute name="href">
-                                <xsl:value-of select="$site_strings[@id='path_upload']" />
-                            </xsl:attribute>
-                            <xsl:value-of select="$locale_strings[@id='header_upload-video']" />
-                        </a>
-                    </li>
-
-<!--
-                    <li id="">
-                        <a>
-                            <xsl:attribute name="href">
-                                <xsl:value-of select="$site_strings[@id='path_settings']" />
-                            </xsl:attribute>
-                            <xsl:value-of select="$locale_strings[@id='settings_details']" />
-                        </a>
-                    </li>
--->
-
-                    <li id="logout">
-                        <a>
-                            <xsl:attribute name="href">
-                                <xsl:value-of select="$site_strings[@id='path_logout']" />
-                            </xsl:attribute>
-                            <xsl:value-of select="$locale_strings[@id='logout']" />
-                        </a>
-                    </li>
-
-                </ul>
 
             </xsl:otherwise>
         </xsl:choose>
diff --git a/trunk/xsl/xhtml/xhtml-body.xsl b/trunk/xsl/xhtml/xhtml-body.xsl
index 32038cd..ad8d4e2 100644
--- a/trunk/xsl/xhtml/xhtml-body.xsl
+++ b/trunk/xsl/xhtml/xhtml-body.xsl
@@ -32,8 +32,11 @@
                 <xsl:call-template name="splashbox" />
             </xsl:when>
 
-            <xsl:when test="//video">
+            <xsl:when test="//page/video">
                 <xsl:call-template name="searchbar" />
+<!--
+                <xsl:call-template name="tagbar" />
+-->
 
                 <xsl:if test="//message">
                     <xsl:call-template name="message"/>
@@ -42,7 +45,7 @@
                 <xsl:call-template name="video"/>
             </xsl:when>
 
-            <xsl:when test="//search">
+            <xsl:when test="//page//results">
                 <xsl:call-template name="searchbar" />
                 <xsl:call-template name="results"/>
             </xsl:when>
diff --git a/trunk/xsl/xhtml/xhtml-head.xsl b/trunk/xsl/xhtml/xhtml-head.xsl
index ec5a4d2..ce2f8f8 100644
--- a/trunk/xsl/xhtml/xhtml-head.xsl
+++ b/trunk/xsl/xhtml/xhtml-head.xsl
@@ -9,113 +9,106 @@
 
 <xsl:template name="xhtml-head">
 
-        <head>
-            <meta
-                http-equiv="Content-Type"
-                content="application/xhtml+xml;charset=utf-8"
-            />
+    <head>
+        <meta
+            http-equiv="Content-Type"
+            content="application/xhtml+xml;charset=utf-8"
+        />
 
-            <xsl:choose>
+        <link
+            rel="shortcut icon"
+            type="image/x-icon"
+            href="/images/favicon.ico"
+        />
 
-                <xsl:when test="not(//@embed)">
-                    <link
-                        rel="shortcut icon"
-                        type="image/x-icon"
-                        href="/images/favicon.ico"
-                    />
-                    <link
-                        rel="stylesheet"
-                        type="text/css"
-                        media="screen"
-                        href="/style/default.css"
-                    />
-                </xsl:when>
+        <link
+            rel="stylesheet"
+            type="text/css"
+            media="screen"
+            href="/style/default.css"
+        />
 
-                <xsl:when test="//@embed='video'">
-                    <link
-                        rel="stylesheet"
-                        type="text/css"
-                        href="/style/embedded.css"
-                    />
-                </xsl:when>
+        <link
+            rel="search"
+            type="application/opensearchdescription+xml"
+        >
+            <xsl:attribute name="href">
+                <xsl:value-of select="$site_strings[@id='path_root']" />?xslt=opensearch
+            </xsl:attribute>
+            <xsl:attribute name="title">
+                <xsl:value-of select="$site_strings[@id='site_name']" />
+            </xsl:attribute>
+        </link>
 
-            </xsl:choose>
+        <xsl:choose>
+            <xsl:when test="//frontpage">
 
-            <xsl:if test="boolean(//results)">
-
-                <link
-                    rel="alternate"
-                    type="application/rss+xml"
-                >
-                    <xsl:attribute name="title">
-                        <xsl:value-of select="$locale_strings[@id='rss_title_results_this_page']" />
-                    </xsl:attribute>
-                    <xsl:attribute name="href">
-                        <xsl:value-of select="$site_strings[@id='path_root']" />
-                        <xsl:value-of select="$site_strings[@id='path_results']" />
-                        <xsl:value-of select="//results/@query" />
-                        &amp;pagesize=<xsl:value-of select="//results/@pagesize" />
-                        &amp;page=<xsl:value-of select="//results/@page" />
-                        &#38;xslt=rss
-                    </xsl:attribute>
-                </link>
-
-                <link
-                    rel="alternate"
-                    type="application/rss+xml"
-                >
-                    <xsl:attribute name="title">
-                        <xsl:value-of select="$locale_strings[@id='rss_title_results_all_pages']" />
-                    </xsl:attribute>
-                    <xsl:attribute name="href">
-                        <xsl:value-of select="$site_strings[@id='path_root']" />
-                        <xsl:value-of select="$site_strings[@id='path_results']" />
-                        <xsl:value-of select="//results/@query" />
-                        &amp;pagesize=99999
-                        &amp;page=1
-                        &#38;xslt=rss
-                    </xsl:attribute>
-                </link>
-
-            </xsl:if>
-
-            <link
-                rel="search"
-                type="application/opensearchdescription+xml"
-            >
-                <xsl:attribute name="href">
-                    <xsl:value-of select="$site_strings[@id='path_root']" />?xslt=opensearch
-                </xsl:attribute>
-                <xsl:attribute name="title">
+                <title>
                     <xsl:value-of select="$site_strings[@id='site_name']" />
-                </xsl:attribute>
-            </link>
+                    -
+                    <xsl:value-of select="$site_strings[@id='site_motto']" />
+                </title>
 
-            <title>
-                <xsl:choose>
-                    <xsl:when test="boolean(//frontpage)">
-                        <xsl:value-of select="$site_strings[@id='site_name']" />
-                        -
-                        <xsl:value-of select="$site_strings[@id='site_motto']" />
-                    </xsl:when>
-                    <xsl:when test="boolean(//resultspage)">
+            </xsl:when>
+
+            <xsl:when test="//page/video">
+
+                <title>
+                    <xsl:value-of select="$site_strings[@id='site_name']" />
+                    -
+                    <xsl:value-of select="//page/video/rdf:RDF/cc:Work/dc:title" />
+                </title>
+
+            </xsl:when>
+
+            <xsl:when test="//page//results">
+
+                    <link
+                        rel="alternate"
+                        type="application/rss+xml"
+                    >
+                        <xsl:attribute name="title">
+                            <xsl:value-of select="$locale_strings[@id='rss_title_results_this_page']" />
+                        </xsl:attribute>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="$site_strings[@id='path_root']" />
+                            <xsl:value-of select="$site_strings[@id='path_results']" />
+                            <xsl:value-of select="//results/@query" />
+                            &amp;pagesize=<xsl:value-of select="//results/@pagesize" />
+                            &amp;page=<xsl:value-of select="//results/@page" />
+                            &#38;xslt=rss
+                        </xsl:attribute>
+                    </link>
+
+                    <link
+                        rel="alternate"
+                        type="application/rss+xml"
+                    >
+                        <xsl:attribute name="title">
+                            <xsl:value-of select="$locale_strings[@id='rss_title_results_all_pages']" />
+                        </xsl:attribute>
+                        <xsl:attribute name="href">
+                            <xsl:value-of select="$site_strings[@id='path_root']" />
+                            <xsl:value-of select="$site_strings[@id='path_results']" />
+                            <xsl:value-of select="//results/@query" />
+                            &amp;pagesize=99999
+                            &amp;page=1
+                            &#38;xslt=rss
+                        </xsl:attribute>
+                    </link>
+
+                    <title>
                         <xsl:value-of select="$site_strings[@id='site_name']" />
                         -
                         <xsl:value-of select="$locale_strings[@id='results_for_query']" />
-                        "<xsl:value-of select="//resultspage/@query" />"
-                    </xsl:when>
-                    <xsl:otherwise>
-<!--
-                    this seems to be fail
-                    should be fixed somehow
--->
-                        <xsl:value-of select="$site_strings[@id='site_name']" />
-                        -
-                        <xsl:value-of select="$site_strings[@id='site_motto']" />
-                    </xsl:otherwise>
-                </xsl:choose>
-            </title>
-        </head>
+                        "<xsl:value-of select="//page/results/@query" />"
+                    </title>
+
+            </xsl:when>
+
+        </xsl:choose>
+
+    </head>
 
 </xsl:template>