diff --git a/trunk/yolanda/public/css/colors/tango.css b/trunk/yolanda/public/css/colors/tango.css
index 5b300f4..b4fa2c1 100644
--- a/trunk/yolanda/public/css/colors/tango.css
+++ b/trunk/yolanda/public/css/colors/tango.css
@@ -22,12 +22,13 @@ body
     color:              #E5E5E5;
 }
 
-input
+input,
+textarea
 {
     background-color:       #E5E5E5;
-    color:                  #131313;
     border-color:           #363636;
     border-style:           solid;
+    color:                  #131313;
 }
 
     input#query
diff --git a/trunk/yolanda/public/css/fonts/hurrdurr.css b/trunk/yolanda/public/css/fonts/hurrdurr.css
index 8a1b425..3b91ca3 100644
--- a/trunk/yolanda/public/css/fonts/hurrdurr.css
+++ b/trunk/yolanda/public/css/fonts/hurrdurr.css
@@ -67,9 +67,10 @@ blockquote:after
 }
 */
 
+*,
 body
 {
-    font-size:          12px;
+    font-size:          10pt;
     font-family:        sans-serif;
 }
 
diff --git a/trunk/yolanda/public/css/layout/fake6.css b/trunk/yolanda/public/css/layout/fake6.css
index 98fa365..4b8344f 100644
--- a/trunk/yolanda/public/css/layout/fake6.css
+++ b/trunk/yolanda/public/css/layout/fake6.css
@@ -40,7 +40,54 @@ h3
     margin-bottom:      0.38em; /* roughly 0.5em relative to base */
 }
 
-input
+form ol
+{
+    display:            inline-block;
+    text-align:         center;
+}
+
+    form li
+    {
+        list-style:         none;
+    }
+
+        form li input,
+        form li select,
+        form li textarea
+        {
+            width:              15em !important;
+        }
+
+        form li label
+        {
+            display:                inline-block;
+            margin:                 0.5em;
+            width:                  15em;
+        }
+
+        form li fieldset
+        {
+            border:             none;
+            margin-bottom:      0.5em;
+            margin-right:       0px;        
+            margin-left:        0px;
+            margin-top:         0.5em;
+            padding:            0px;
+        }
+
+        form li fieldset label
+        {
+            display:            block;
+            margin:             0px;
+            /* padding of outer fieldset needs to be substracted */
+            margin-left:        14.5em;
+            padding:            0px;
+            width:              auto;
+        }
+
+input,
+fieldset,
+textarea
 {
     padding:            0.5em;
 }
@@ -167,6 +214,14 @@ ul
     padding-bottom:         0.5em;
 }
 
+#login h1,
+#messagebox h1,
+#search h1,
+#tagcloud h1
+{
+    display:                none;
+}
+
 #content,
 #header
 {
diff --git a/trunk/yolanda/templates/xhtml/base.mako b/trunk/yolanda/templates/xhtml/base.mako
index 10d70e6..6f18531 100644
--- a/trunk/yolanda/templates/xhtml/base.mako
+++ b/trunk/yolanda/templates/xhtml/base.mako
@@ -5,6 +5,8 @@
 <%def name="search()">
     <div id="search">
 
+        <h1>Search</h1>
+
         ${h.form(h.url_for('search_results'), method='get')}
 
             ${h.text_field('query')}
@@ -40,6 +42,8 @@
 <%def name="login()">
     <div id="login">
 
+        <h1>Login</h1>
+
         ${h.form(h.url_for('account/login'), method='post')}
 
             ${h.text_field('username')}
@@ -54,9 +58,8 @@
 
 %if c.message:
     <div id="messagebox" class="${c.message['type']}">
-        <span id="message">
-            ${c.message['text']}
-        </span>
+        <h1>Message (${c.message['type']})</h1>
+        <span id="message">${c.message['text']}</span>
     </div>
 %endif
 
@@ -71,7 +74,7 @@
 
     <div id="tagcloud">
 
-        <h1>Popular tags</h1>
+        <h1>Tagcloud</h1>
 
         <a href="" class="tag6">Proin</a>
         <a href="" class="tag5">lectus</a>
diff --git a/trunk/yolanda/templates/xhtml/upload.mako b/trunk/yolanda/templates/xhtml/upload.mako
index d1dba66..077c51d 100644
--- a/trunk/yolanda/templates/xhtml/upload.mako
+++ b/trunk/yolanda/templates/xhtml/upload.mako
@@ -8,10 +8,126 @@
     upload video
 </%def>
 
+<form
+    action="/upload/upload"
+    enctype="multipart/form-data"
+    method="POST"
+>
 
-        ${h.form(h.url_for(action='upload'), multipart=True)}
-            ${h.file_field('file')}<br />
-            ${h.text_field('title')}<br />
-            ${h.submit('Upload')}
+    <ol>
 
-        ${h.end_form()}
+        <li id="title">
+            <label for="title">title</label>
+            <input name="title" type="text"/>
+        </li>
+
+        <li id="alternative">
+            <label for="alternative">alternative title</label>
+            <input name="alternative" type="text"/>
+        </li>
+
+        <li id="abstract">
+            <label for="abstract">abstract</label>
+            <textarea name="abstract"/>
+        </li>
+
+        <li id="spatial">
+            <label for="spatial">spatial</label>
+            <input name="spatial" type="text"/>
+        </li>
+
+        <li id="subject">
+            <label for="subject">subject</label>
+            <input name="subject" type="text"/>
+        </li>
+
+        <li id="temporal">
+            <label for="temporal">temporal</label>
+            <input name="temporal" type="datetime"/>
+        </li>
+
+        <li id="language">
+            <label for="language">language</label>
+            <select name="language">
+                <option value="de">German</option>
+                <option value="en">English</option>
+            </select>
+        </li>
+
+        <li>
+            <label for="creator">creator</label>
+            <input id="creator" name="creator" type="text"/>
+        </li>
+
+        <li>
+            <div id="contributor" repeat="template">
+                <label for="contributor">Contributor</label>
+                <input name="contributor.[contributor]" type="text"/>
+                <button type="remove">Remove</button>
+            </div>
+            <button type="add" template="contributor">Add contributor</button>
+        </li>
+
+<!--
+$video->appendChild( getElementDC( "contributor", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "created", "xsd:date") );
+
+$video->appendChild( getElementDC( "hasFormat", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "hasPart", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "isFormatOf", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "isPartOf", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "references", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "replaces", "xsd:normalizedString") );
+
+$video->appendChild( getElementDC( "rightsHolder", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "source", "xsd:normalizedString") );
+$video->appendChild( getElementDC( "license", "xsd:normalizedString") );
+-->
+        <li>
+            <fieldset>
+                <legend>
+                    Remix ?
+                </legend>
+                <label for="remix">
+                    <input id="remix" type="radio" name="modification" value="remix" />
+                    remix
+                </label>
+                <label for="sharealike">
+                    <input id="sharealike" type="radio" name="modification" value="sharealike" />
+                    sharealike
+                </label>
+                <label for="noderivatives">
+                    <input id="noderivatives" type="radio" name="modification" value="noderivatives" />
+                    noderivatives
+                </label>
+            </fieldset>
+        </li>
+
+        <li>
+            <fieldset>
+                <legend>
+                    Commercial ?
+                </legend>
+                <label for="commercial">
+                    <input id="commercial" type="radio" name="commercial" value="commercial" />
+                    commercial
+                </label>
+                <label for="noncommercial">
+                    <input id="noncommercial" type="radio" name="commercial" value="noncommercial" />
+                    noncommercial
+                </label>
+            </fieldset>
+        </li>
+
+        <li>
+            <label for="file">file</label>
+            <input id="file" name="file" type="file"/>
+        </li>
+
+        <li>
+            <input name="commit" type="submit" value="Upload"/>
+        </li>
+
+    </ol>
+
+</form>
diff --git a/trunk/yolanda/templates/xhtml/video.mako b/trunk/yolanda/templates/xhtml/video.mako
index e43b184..1fcfb8a 100644
--- a/trunk/yolanda/templates/xhtml/video.mako
+++ b/trunk/yolanda/templates/xhtml/video.mako
@@ -16,6 +16,7 @@
 >
 
     <div id="messagebox" class="error">
+        <h1>Message (error)</h1>
         <span id="message">
             Your browser does not support the &lt;video&gt; element.
 <!--
@@ -26,11 +27,49 @@
 
 </video>
 
-<div id="download">
+<div id="downloads">
+    <h1>Downloads</h1>
     <a href="">Download (http)</a>
     <a href="">Download (bittorrent)</a>
 </div>
 
+<h1>Embedding</h1>
+
+<table id="embed">
+    <tr>
+        <td>
+            HTML 4.01
+        </td>
+        <td>
+            <code>&lt;object data="http://example.org/download/foobar/" type="video/ogg"&gt;&lt;/object&gt;</code>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            XHTML 1.1
+        </td>
+        <td>
+            <code>&lt;object data="http://example.org/download/foobar/" type="video/ogg"/&gt;</code>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            HTML 5
+        </td>
+        <td>
+            <code>&lt;video src="http://example.org/download/foobar/"&gt;&lt;/video&gt;</code>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            XHTML 5
+        </td>
+        <td>
+            <code>&lt;video src="http://example.org/download/foobar/"/&gt;</code>
+        </td>
+    </tr>
+</table>
+
 <!--
 <img
     id="video"