diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index e6863db..772c6a5 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -92,9 +92,18 @@
 
 	<!-- upload page -->
 	<string id="file">file</string>
-	<string id="button_next_page">next page</string>
-	<string id="button_previous_page">previous page</string>
+	<string id="button_next_page">continue</string>
 	<string id="button_upload">upload</string>
+	<string id="title_page_1">Basic Information</string>
+	<string id="title_page_2">Similar Videos</string>
+	<string id="title_page_3">Additional Metainformation</string>
+	<string id="title_page_4">Licensing</string>
+	<string id="title_page_5">Summary / Upload</string>
+	<string id="instruction_page_1">Describe the video you want to upload.</string>
+	<string id="instruction_page_2">Similar videos have already been uploaded. If none of these videos matches yours, continue.</string>
+	<string id="instruction_page_3">Providing these infos helps us to put the video into context.</string>
+	<string id="instruction_page_4">Describe the video's license.</string>
+	<string id="instruction_page_5">Double-check the data and correct mistakes, if necessary.</string>
 	<string id="instruction_file">Specify the file you want to upload.</string>
 	<string id="instruction_title">State the title of the video.</string>
 	<string id="instruction_creator">Specify the creator of the video.</string>
@@ -103,27 +112,36 @@
 	<string id="instruction_source">Specify the source, preferably by URL.</string>
 	<string id="instruction_language">State the language of the video.</string>
 	<string id="instruction_coverage">Specify the time and location covered.</string>
-	<string id="this_is_page_1">This is page 1 of 6.</string>
-	<string id="this_is_page_2">This is page 2 of 6.</string>
-	<string id="this_is_page_3">This is page 3 of 6.</string>
-	<string id="this_is_page_4">This is page 4 of 6.</string>
-	<string id="this_is_page_5">This is page 5 of 6.</string>
-	<string id="this_is_page_6">This is page 6 of 6.</string>
-	<string id="button_page_1">Page 1</string>
-	<string id="button_page_3">Page 3</string>
-	<string id="button_page_4">Page 4</string>
+	<string id="instruction_license">Specify the license, preferably by URL.</string>
+	<string id="instruction_license_cc">Optionally, choose Creative Commons licensing.</string>
+	<string id="instruction_license_cc_remix">Permit modification.</string>
+	<string id="instruction_license_cc_sharealike">Permit modification, derivatives must use the same license.</string>
+	<string id="instruction_license_cc_noderivatives">Prohibit modification.</string>
+	<string id="instruction_license_cc_noncommercial">Prohibit commercial use.</string>
+	<string id="this_is_page_1">This is page 1 of 5.</string>
+	<string id="this_is_page_2">This is page 2 of 5.</string>
+	<string id="this_is_page_3">This is page 3 of 5.</string>
+	<string id="this_is_page_4">This is page 4 of 5.</string>
+	<string id="this_is_page_5">This is page 5 of 5.</string>
+	<string id="button_page_1">go to page 1</string>
+	<string id="button_page_3">go to page 3</string>
+	<string id="button_page_4">go to page 4</string>
+
+	<!-- languages -->
+	<string id="language_en-us">English</string>
+	<string id="language_de-de">German</string>
 
 	<!-- video page -->
-	<string id="download_video">Download</string>
+	<string id="download_video">download</string>
 	<string id="megabytes">MB</string>
 	<string id="watch_browserplugin">use browser plugin</string>
 	<string id="watch_cortadoapplet">use java applet</string>
-	<string id="edit_video">Edit</string>
-	<string id="bookmark_video">Bookmark</string>
-	<string id="license_conditions">License Conditions</string>
+	<string id="edit_video">edit</string>
+	<string id="bookmark_video">bookmark</string>
+	<string id="license_conditions">license conditions</string>
 	<string id="protip_embed">To embed the video on another web page, use the following HTML code:</string>
 	<string id="comment_on_video">Flamewar area below. Proceed with caution.</string>
-	<string id="comment_post">Post</string>
+	<string id="comment_post">post</string>
 
 	<!-- embedded video page-->
 	<string id="backlink">backlink</string>
diff --git a/trunk/site/main.xml b/trunk/site/main.xml
index 98d7a55..10eeffe 100755
--- a/trunk/site/main.xml
+++ b/trunk/site/main.xml
@@ -8,9 +8,6 @@
 	<str id="site_motto">WebTV free as in Speech</str>
 
 	<!-- invisible -->
-<!--	<str id=""></str>
-	<str id=""></str>
-	<str id=""></str>-->
 	<str id="page_account">/account.pl</str>
 	<str id="page_account_settings">/account.pl?show=settings</str>
 	<str id="page_account_uploads">/account.pl?show=uploads</str>
@@ -23,7 +20,7 @@
 	<str id="page_license">http://www.fsf.org/licensing/licenses/agpl-3.0.html</str>
 	<str id="page_source-code">http://yolanda.mister-muffin.de/trac/browser/trunk</str>
 	<str id="page_register">/register.pl</str>
-	<str id="page_report_bug">http://yolanda.mister-muffin.de/trac/ WHERE IS THE BUGTRACKER ?</str>
+	<str id="page_report_bug">http://yolanda.mister-muffin.de/trac/newticket</str>
 	<str id="page_results">search.pl?query=</str>
 	<str id="page_upload">/upload.pl</str>
 	<str id="page_uploader">uploader.pl</str>
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 462e473..5835a23 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -48,6 +48,16 @@ div
 			margin:			0.5em;
 		}
 
+	div.cc-license-chooser
+	{
+	}
+
+		div.cc-license-chooser img
+		{
+			margin:				0.25em;
+			vertical-align:		middle;
+		}
+
 	div.comments
 	{
 		display:		none;
@@ -199,6 +209,16 @@ span.code
 	font-family:	monospace;
 }
 
+span.heading
+{
+	font-size:			1.5em;
+}
+
+span.instruction
+{
+	color:				#606060;
+}
+
 span.protip
 {
 	color:				#606060;
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index 5d44b3f..d1214cf 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -11,8 +11,13 @@
 		<xsl:choose>
 
 			<xsl:when test="//uploadform/@page=1">
-				<h2>Basic Description</h2>
-				<p>These entries describe the very nature of your upload. All fields are required to be filled appropriately.</p>
+				<span class="heading">
+					<xsl:value-of select="$locale_strings[@id='title_page_1']" />
+				</span>
+				<br />
+				<span class="instruction">
+					<xsl:value-of select="$locale_strings[@id='instruction_page_1']" />
+				</span>
 				<form method="post">
 					<xsl:attribute name="action">
 						<xsl:value-of select="$site_strings[@id='page_upload']" />
@@ -78,9 +83,13 @@
 			</xsl:when>
 			
 			<xsl:when test="//uploadform/@page=2">
-				<h2>Uploads that match your description</h2>
-				<p>If the attributes you just entered is imilar to those of already uploaded videos you will see the results below.</p>
-				<p>Please check if your video is not among them and then click next to proceed.</p>
+				<span class="heading">
+					<xsl:value-of select="$locale_strings[@id='title_page_2']" />
+				</span>
+				<br />
+				<span class="instruction">
+					<xsl:value-of select="$locale_strings[@id='instruction_page_2']" />
+				</span>
 				<form method="post">
 					<xsl:attribute name="action">
 						<xsl:value-of select="$site_strings[@id='page_upload']" />
@@ -121,11 +130,6 @@
 						</xsl:attribute>
 					</input>
 					<fieldset>
-						<input type="submit" name="1">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
-							</xsl:attribute>
-						</input>
 						<input type="submit" name="3">
 							<xsl:attribute name="value">
 								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
@@ -141,8 +145,13 @@
 			</xsl:when>
 
 			<xsl:when test="//uploadform/@page=3">
-				<h2>Additional information</h2>
-				<p>The following fields are optional but recommended.</p>
+				<span class="heading">
+					<xsl:value-of select="$locale_strings[@id='title_page_3']" />
+				</span>
+				<br />
+				<span class="instruction">
+					<xsl:value-of select="$locale_strings[@id='instruction_page_3']" />
+				</span>
 				<form method="post">
 					<xsl:attribute name="action">
 						<xsl:value-of select="$site_strings[@id='page_upload']" />
@@ -163,38 +172,33 @@
 						</xsl:attribute>
 					</input>
 					<fieldset>
-						<div class="messagebox">
+						<div>
 							<xsl:value-of select="$locale_strings[@id='instruction_creator']" />
 							<br />
-							<input type="radio" name="creator" value="user" />myself
-							<br />
-							<input type="radio" name="creator" value="other" />other:
-							<br />
 							<input name="DC.Creator" type="text" size="30" />
 							</div>
-						<div class="messagebox">
+						<div>
 							<xsl:value-of select="$locale_strings[@id='instruction_source']" />
 							<br />
 							<input name="DC.Source" type="text" size="30" />
 						</div>
-						<div class="messagebox">
+						<div>
 							<xsl:value-of select="$locale_strings[@id='instruction_language']" />
 							<br />
 							<select name="DC.Language">
-								<option>English</option>
-								<option>German</option>
+								<option>
+									<xsl:value-of select="$locale_strings[@id='language_en-us']" />
+								</option>
+								<option>
+									<xsl:value-of select="$locale_strings[@id='language_de-de']" />
+								</option>
 							</select>
 						</div>
-						<div class="messagebox">
+						<div>
 							<xsl:value-of select="$locale_strings[@id='instruction_coverage']" />
 							<br />
 							<input name="DC.Coverage" type="text" size="30" />
 						</div>
-						<input type="submit" name="2">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
-							</xsl:attribute>
-						</input>
 						<input type="submit" name="4">
 							<xsl:attribute name="value">
 								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
@@ -209,8 +213,13 @@
 			</xsl:when>
 			
 			<xsl:when test="//uploadform/@page=4">
-				<h2>Licensing</h2>
-				<p>If you are the copyright holder feel free to use creative commons to license your work. If not, select the original license of your video.</p>
+				<span class="heading">
+					<xsl:value-of select="$locale_strings[@id='title_page_4']" />
+				</span>
+				<br />
+				<span class="instruction">
+					<xsl:value-of select="$locale_strings[@id='instruction_page_4']" />
+				</span>
 				<form method="post">
 					<xsl:attribute name="action">
 						<xsl:value-of select="$site_strings[@id='page_upload']" />
@@ -251,29 +260,48 @@
 						</xsl:attribute>
 					</input>
 					<fieldset>
-						<div class="messagebox">
-							<input type="radio" name="license" checked="checked" />none
+						<xsl:value-of select="$locale_strings[@id='instruction_license']" />
+						<br />
+						<input name="License" type="text" size="30" />
+						<br />
+						<xsl:value-of select="$locale_strings[@id='instruction_license_cc']" />
+						<br />
+						
+						<div class="cc-license-chooser">
+
+							<img src="./images/cc/cc-remix.png" />
+							<input type="radio" name="modification" value="remix" />
 							<br />
-							<input type="radio" name="license" />proprietary
+							<span class="protip">
+								<xsl:value-of select="$locale_strings[@id='instruction_license_cc_remix']" />
+							</span>
 							<br />
-							<input type="radio" name="license" />public domain
+
+							<img src="./images/cc/cc-sharealike.png" />
+							<input type="radio" name="modification" value="ShareAlike" />
 							<br />
-							<input type="radio" name="license" />creative commons
+							<span class="protip">
+								<xsl:value-of select="$locale_strings[@id='instruction_license_cc_sharealike']" />
+							</span>
 							<br />
-							<select>
-								<option>cc-by</option>
-								<option>cc-by-sa</option>
-								<option>cc-by-sa-nc</option>
-								<option>cc-by-nc</option>
-								<option>cc-by-nd</option>
-								<option>cc-by-nd-nc</option>
-							</select>
+
+							<img src="./images/cc/cc-noderivatives.png" />
+							<input type="radio" name="modification" value="noncommercial" />
+							<br />
+							<span class="protip">
+								<xsl:value-of select="$locale_strings[@id='instruction_license_cc_noderivatives']" />
+							</span>
+							<br />
+
+							<img src="./images/cc/cc-noncommercial.png" />
+							<input type="checkbox" name="noncommercial" value="CommercialUse" />
+							<br />
+							<span class="protip">
+								<xsl:value-of select="$locale_strings[@id='instruction_license_cc_noncommercial']" />
+							</span>
+
 						</div>
-						<input type="submit" name="3">
-							<xsl:attribute name="value">
-								<xsl:value-of select="$locale_strings[@id='button_previous_page']" />
-							</xsl:attribute>
-						</input>
+
 						<input type="submit" name="5">
 							<xsl:attribute name="value">
 								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
@@ -288,8 +316,13 @@
 			</xsl:when>
 			
 			<xsl:when test="//uploadform/@page=5">
-				<h2>Summary</h2>
-				<p>Please check everything for correctness and edit if neccessary.</p>
+				<span class="heading">
+					<xsl:value-of select="$locale_strings[@id='title_page_5']" />
+				</span>
+				<br />
+				<span class="instruction">
+					<xsl:value-of select="$locale_strings[@id='instruction_page_5']" />
+				</span>
 				<form method="post">
 					<xsl:attribute name="action">
 						<xsl:value-of select="$site_strings[@id='page_upload']" />
@@ -345,46 +378,91 @@
 							<xsl:value-of select="//uploadform/@DC.Coverage" />
 						</xsl:attribute>
 					</input>
-						<div class="messagebox">
-							title:
-							<br />
-							subject:
-							<br />
-							description:
-							<br />
-							<input type="submit" name="1">
-								<xsl:attribute name="value">
-									<xsl:value-of select="$locale_strings[@id='button_page_1']" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div class="messagebox">
-							creator:
-							<br />
-							source:
-							<br />
-							language:
-							<br />
-							coverage:
-							<br />
-							<input type="submit" name="3">
-								<xsl:attribute name="value">
-									<xsl:value-of select="$locale_strings[@id='button_page_3']" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div class="messagebox">
-							license:
-							<br />
-							<input type="submit" name="4">
-								<xsl:attribute name="value">
-									<xsl:value-of select="$locale_strings[@id='button_page_4']" />
-								</xsl:attribute>
-							</input>
-						</div>
+
+					<table class="videometadata">
+						<tr>
+							<td class="leftcell">
+								<xsl:value-of select="$locale_strings[@id='DC.Title']" />:
+							</td>
+							<td class="rightcell">
+								<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:title" />
+							</td>
+						</tr>
+						<tr>
+							<td class="leftcell">
+								<xsl:value-of select="$locale_strings[@id='DC.Subject']" />:
+							</td>
+							<td class="rightcell">
+								<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:subject" />
+							</td>
+						</tr>
+						<tr>
+							<td class="leftcell">
+								<xsl:value-of select="$locale_strings[@id='DC.Description']" />:
+							</td>
+							<td class="rightcell">
+								<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:description" />
+							</td>
+						</tr>
+					</table>
+
+					<input type="submit" name="1">
+						<xsl:attribute name="value">
+							<xsl:value-of select="$locale_strings[@id='button_page_1']" />
+						</xsl:attribute>
+					</input>
+
+					<table class="videometadata">
+						<tr>
+							<td class="leftcell">
+								<xsl:value-of select="$locale_strings[@id='DC.Creator']" />:
+							</td>
+							<td class="rightcell">
+								<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:creator" />
+							</td>
+						</tr>
+						<tr>
+							<td class="leftcell">
+								<xsl:value-of select="$locale_strings[@id='DC.Source']" />:
+							</td>
+							<td class="rightcell">
+								<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:source" />
+							</td>
+						</tr>
+						<tr>
+							<td class="leftcell">
+								<xsl:value-of select="$locale_strings[@id='DC.Language']" />:
+							</td>
+							<td class="rightcell">
+								<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:language" />
+							</td>
+						</tr>
+						<tr>
+							<td class="leftcell">
+								<xsl:value-of select="$locale_strings[@id='DC.Coverage']" />:
+							</td>
+							<td class="rightcell">
+								<xsl:value-of select="//video/rdf:RDF/cc:Work/dc:coverage" />
+							</td>
+						</tr>
+					</table>
+
+					<input type="submit" name="3">
+						<xsl:attribute name="value">
+							<xsl:value-of select="$locale_strings[@id='button_page_3']" />
+						</xsl:attribute>
+					</input>
+
+					<xsl:call-template name="cclicense"/>
+
+					<input type="submit" name="4">
+						<xsl:attribute name="value">
+							<xsl:value-of select="$locale_strings[@id='button_page_4']" />
+						</xsl:attribute>
+					</input>
+
 					</fieldset>
 				</form>
-				<p>If Everything is okay proceed below by uploading your video.</p>
 				<form method="post" enctype="multipart/form-data">
 					<xsl:attribute name="action">
 						<xsl:value-of select="$site_strings[@id='page_uploader']" />
@@ -425,11 +503,10 @@
 						</xsl:attribute>
 					</input>
 					<fieldset>
-						<div class="messagebox">
 						<xsl:value-of select="$locale_strings[@id='instruction_file']" />
 						<br />
 						<input name="file" type="file" size="13" />
-						</div>
+						<br />
 						<input type="submit">
 							<xsl:attribute name="value">
 								<xsl:value-of select="$locale_strings[@id='button_upload']" />
diff --git a/trunk/xsl/xhtml/video.xsl b/trunk/xsl/xhtml/video.xsl
index e61562e..9a97252 100644
--- a/trunk/xsl/xhtml/video.xsl
+++ b/trunk/xsl/xhtml/video.xsl
@@ -165,65 +165,8 @@
 				<xsl:value-of select="$locale_strings[@id='bookmark_video']" />
 			</a>
 		</div>
-		<div class="videoccdata">
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
-				</xsl:attribute>
-				<xsl:value-of select="$locale_strings[@id='license_conditions']" />:
-			</a>
-			<br />
-			<a>
-				<xsl:attribute name="href">
-					<xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
-				</xsl:attribute>
-	<!--
-				unfinished bizness
-				<xsl:value-of select="@rdf:about" />
-				<xsl:if test="true()">
-					<img src="./images/cc/somerights.png" />
-				</xsl:if>
-	-->
-				<xsl:for-each select="//video/rdf:RDF/cc:License/cc:permits">
-	<!--
-					since we are talking about digital media here, distribution actually /is/ reproduction
-					(also, i was too stupid to figure out how to test for both conditions).
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Reproduction'">
-						<img src="./images/cc/cc-share.png" />
-					</xsl:if>
-	-->
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
-						<img src="./images/cc/cc-share.png" />
-					</xsl:if>
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
-						<img src="./images/cc/cc-remix.png" />
-					</xsl:if>
-				</xsl:for-each>
-				<xsl:for-each select="rdf:RDF/cc:License/cc:requires">
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Notice'">
-						<img src="./images/cc/cc-by.png" />
-					</xsl:if>
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/ShareAlike'">
-						<img src="./images/cc/cc-sharealike.png" />
-					</xsl:if>
-	<!--
-					source code doesn't make much sense in video context.
-					still, this is preserved for potential future use.
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/SourceCode'">
-					SOURCE
-					</xsl:if>
-	-->
-				</xsl:for-each>
-				<xsl:for-each select="rdf:RDF/cc:License/cc:prohibits">		
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/CommercialUse'">
-						<img src="./images/cc/cc-noncommercial.png" />
-					</xsl:if>
-					<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
-						<img src="./images/cc/cc-noderivatives.png" />
-					</xsl:if>
-				</xsl:for-each>
-			</a>
-		</div>
+
+		<xsl:call-template name="cclicense"/>
 
 		<table class="videometadata">
 			<tr>
@@ -329,4 +272,68 @@
 
 </xsl:template>
 
+<xsl:template name="cclicense">
+
+	<div class="videoccdata">
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
+			</xsl:attribute>
+			<xsl:value-of select="$locale_strings[@id='license_conditions']" />:
+		</a>
+		<br />
+		<a>
+			<xsl:attribute name="href">
+				<xsl:value-of select="//video/rdf:RDF/cc:License/@rdf:about" />
+			</xsl:attribute>
+<!--
+			unfinished bizness
+			<xsl:value-of select="@rdf:about" />
+			<xsl:if test="true()">
+				<img src="./images/cc/somerights.png" />
+			</xsl:if>
+-->
+			<xsl:for-each select="//video/rdf:RDF/cc:License/cc:permits">
+<!--
+				since we are talking about digital media here, distribution actually /is/ reproduction
+				(also, i was too stupid to figure out how to test for both conditions).
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Reproduction'">
+					<img src="./images/cc/cc-share.png" />
+				</xsl:if>
+-->
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Distribution'">
+					<img src="./images/cc/cc-share.png" />
+				</xsl:if>
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
+					<img src="./images/cc/cc-remix.png" />
+				</xsl:if>
+			</xsl:for-each>
+			<xsl:for-each select="rdf:RDF/cc:License/cc:requires">
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/Notice'">
+					<img src="./images/cc/cc-by.png" />
+				</xsl:if>
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/ShareAlike'">
+					<img src="./images/cc/cc-sharealike.png" />
+				</xsl:if>
+<!--
+				source code doesn't make much sense in video context.
+				still, this is preserved for potential future use.
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/SourceCode'">
+				SOURCE
+				</xsl:if>
+-->
+			</xsl:for-each>
+			<xsl:for-each select="rdf:RDF/cc:License/cc:prohibits">		
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/CommercialUse'">
+					<img src="./images/cc/cc-noncommercial.png" />
+				</xsl:if>
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
+					<img src="./images/cc/cc-noderivatives.png" />
+				</xsl:if>
+			</xsl:for-each>
+		</a>
+	</div>
+
+</xsl:template>
+
 </xsl:stylesheet>