diff --git a/trunk/yolanda/public/css/layout/fake6.css b/trunk/yolanda/public/css/layout/fake6.css
index 90a553a..98fa365 100644
--- a/trunk/yolanda/public/css/layout/fake6.css
+++ b/trunk/yolanda/public/css/layout/fake6.css
@@ -152,6 +152,12 @@ ul
     text-align:             center;
 }
 
+    #content #messagebox
+    {
+        margin-right:           0em !important;
+        border-width:           0px;
+    }
+
 #heading,
 #login,
 #search,
diff --git a/trunk/yolanda/templates/xhtml/base.mako b/trunk/yolanda/templates/xhtml/base.mako
index 55c0dc1..10d70e6 100644
--- a/trunk/yolanda/templates/xhtml/base.mako
+++ b/trunk/yolanda/templates/xhtml/base.mako
@@ -64,6 +64,11 @@
 
 
 <%def name="tagcloud()">
+
+    <a href="#content" style="display:none;">
+        Skip tagcloud.
+    </a>
+
     <div id="tagcloud">
 
         <h1>Popular tags</h1>
@@ -121,6 +126,10 @@
 
 <body>
 
+    <a href="#content" style="display:none;">
+        Skip menu.
+    </a>
+
     ${self.login()}
 
     ${self.search()}
@@ -128,12 +137,6 @@
     ${self.tagcloud()}
 
     <div id="header">
-        <h1>
-            <img src="${h.url_for('logo')}" alt="${g.platform_name} logo"/>
-        </h1>
-    </div>
-
-    <div id="heading">
         <h1>
             ${self.heading()}
         </h1>
diff --git a/trunk/yolanda/templates/xhtml/upload.mako b/trunk/yolanda/templates/xhtml/upload.mako
index 949ed6f..d1dba66 100644
--- a/trunk/yolanda/templates/xhtml/upload.mako
+++ b/trunk/yolanda/templates/xhtml/upload.mako
@@ -5,7 +5,7 @@
 </%def>
 
 <%def name="heading()">
-    Upload Video
+    upload video
 </%def>
 
 
diff --git a/trunk/yolanda/templates/xhtml/video.mako b/trunk/yolanda/templates/xhtml/video.mako
index 51d5a53..e43b184 100644
--- a/trunk/yolanda/templates/xhtml/video.mako
+++ b/trunk/yolanda/templates/xhtml/video.mako
@@ -14,12 +14,22 @@
     poster="${h.url_for('/dummy/poster.png')}"
     src="${h.url_for('http://127.0.0.1:5000/dummy/video.ogv')}"
 >
-Sorry, your browser does not support the &lt;video&gt; element. <a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox 3.1 nightly builds</a>, <a href="http://labs.opera.com/news/2008/07/18/">Opera experimental builds</a> and <a href="http://www.apple.com/safari/">Safari</a> with <a href="http://xiph.org/quicktime/">XiphQT</a> installed can playback videos with varying degrees of success.
-</video>
 
-<a href="">download file</a>
+    <div id="messagebox" class="error">
+        <span id="message">
+            Your browser does not support the &lt;video&gt; element.
+<!--
+<a href="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/">Firefox 3.1 nightly builds</a>, <a href="http://labs.opera.com/news/2008/07/18/">Opera experimental builds</a> and <a href="http://www.apple.com/safari/">Safari</a> with <a href="http://xiph.org/quicktime/">XiphQT</a> installed can playback videos with varying degrees of success.
+-->
+        </span>
+    </div>
+
+</video>
 
-<a href="">download in HD resolution</a>
+<div id="download">
+    <a href="">Download (http)</a>
+    <a href="">Download (bittorrent)</a>
+</div>
 
 <!--
 <img
