diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 01d0634..1f63ac1 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -173,14 +173,15 @@
 	<string id="DC.Language">language</string>
 	<string id="DC.Coverage">coverage</string>
 	<string id="DC.Rights">righs holder</string>
-	
+
 	<string id="duration">duration</string>
 	<string id="viewcount">viewcount</string>
-	
+
 	<!-- settings page -->
-	<string id="settings_locale">locale</string>
-	<string id="settings_pagesize">pagesize</string>
-	<string id="settings_cortado">cortado</string>
+	<string id="settings_heading">account settings</string>
+	<string id="settings_instruction_locale">locale</string>
+	<string id="settings_instruction_pagesize">choose pagesize</string>
+	<string id="settings_instruction_method">choose your preferred method of video playback.</string>
 
 	<!-- rss feed -->
 	<string id="rss_separator">&#160;-&#160;</string>
diff --git a/trunk/style/default.css b/trunk/style/default.css
index 3201af1..5e17971 100755
--- a/trunk/style/default.css
+++ b/trunk/style/default.css
@@ -91,7 +91,7 @@ div
 		vertical-align:	bottom;
 	}
 
-	div.loginform, div.registerform, div.uploadform
+	div.loginform, div.registerform, div.uploadform, div.settingsform
 	{
 		line-height:	2.5em;
 		margin:			1.5em;
diff --git a/trunk/xsl/xhtml/settings.xsl b/trunk/xsl/xhtml/settings.xsl
index f8fc70b..9b6a5a3 100644
--- a/trunk/xsl/xhtml/settings.xsl
+++ b/trunk/xsl/xhtml/settings.xsl
@@ -8,16 +8,23 @@
 >
 
 <xsl:template name="settings">
-	<h2><xsl:value-of select="$locale_strings[@id='settings_settings']" /></h2>
-	<form method="POST">
-		<xsl:attribute name="action">
-			<xsl:value-of select="$site_strings[@id='page_settings']" />
-		</xsl:attribute>
-		<input type="hidden" name="show" value="settings" />
-		<div>
-			<h3><xsl:value-of select="$locale_strings[@id='settings_locale']" /></h3>
+
+	<div class="settingsform">
+
+		<span class="heading">
+			<xsl:value-of select="$locale_strings[@id='settings_heading']" />
+		</span>
+
+		<form method="POST">
+			<xsl:attribute name="action">
+				<xsl:value-of select="$site_strings[@id='page_settings']" />
+			</xsl:attribute>
+
+			<xsl:value-of select="$locale_strings[@id='settings_instruction_locale']" />
 			<br />
+
 			<select name="locale" size="2">
+
 				<option value="en-us">
 					<xsl:if test="//settings/@locale='en-us'">
 						<xsl:attribute name="selected">
@@ -26,6 +33,7 @@
 					</xsl:if>
 					<xsl:value-of select="$locale_strings[@id='language_en-us']" />
 				</option>
+
 				<option value="de-de">
 					<xsl:if test="//settings/@locale='de-de'">
 						<xsl:attribute name="selected">
@@ -34,72 +42,23 @@
 					</xsl:if>
 					<xsl:value-of select="$locale_strings[@id='language_de-de']" />
 				</option>
+
 			</select>
-		</div>
-		<div>
-			<h3><xsl:value-of select="$locale_strings[@id='settings_pagesize']" /></h3>
 			<br />
-			<select name="pagesize" size="7">
-				<option>
-					<xsl:if test="//settings/@pagesize=1">
-						<xsl:attribute name="selected">
-							selected
-						</xsl:attribute>
-					</xsl:if>
-					1
-				</option>
-				<option>
-					<xsl:if test="//settings/@pagesize=2">
-						<xsl:attribute name="selected">
-							selected
-						</xsl:attribute>
-					</xsl:if>
-					2
-				</option>
-				<option>
-					<xsl:if test="//settings/@pagesize=5">
-						<xsl:attribute name="selected">
-							selected
-						</xsl:attribute>
-					</xsl:if>
-					5
-				</option>
-				<option>
-					<xsl:if test="//settings/@pagesize=10">
-						<xsl:attribute name="selected">
-							selected
-						</xsl:attribute>
-					</xsl:if>
-					10
-				</option>
-				<option>
-					<xsl:if test="//settings/@pagesize=20">
-						<xsl:attribute name="selected">
-							selected
-						</xsl:attribute>
-					</xsl:if>
-					20
-				</option>
-				<option>
-					<xsl:if test="//settings/@pagesize=50">
-						<xsl:attribute name="selected">
-							selected
-						</xsl:attribute>
-					</xsl:if>
-					50
-				</option>
-				<option>
-					<xsl:if test="//settings/@pagesize=100">
-						<xsl:attribute name="selected">
-							selected
-						</xsl:attribute>
-					</xsl:if>
-					100
-				</option>
-			</select>
-		</div>
-		<div>
-			<h3><xsl:value-of select="$locale_strings[@id='settings_cortado']" /></h3>
+
+			<xsl:value-of select="$locale_strings[@id='settings_instruction_pagesize']" />
+			<br />
+
+			<input name="pagesize" type="text" size="7">
+				<xsl:attribute name="value">
+					<xsl:value-of select="//settings/@pagesize" />
+				</xsl:attribute>
+			</input>
+			<br />
+
+			<xsl:value-of select="$locale_strings[@id='settings_instruction_method']" />
+			<br />
+
 			<input type="radio" name="cortado" value="1">
 				<xsl:if test="//settings/@cortado=1">
 					<xsl:attribute name="checked">
@@ -107,6 +66,7 @@
 					</xsl:attribute>
 				</xsl:if>
 			</input>
+
 			<xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
 			<br />
 			<input type="radio" name="cortado" value="0">
@@ -116,12 +76,15 @@
 					</xsl:attribute>
 				</xsl:if>
 			</input>
+
 			<xsl:value-of select="$locale_strings[@id='watch_browserplugin']" />
-		</div>
-		<div>
+			<br />
 			<input name="submit" type="submit" />
-		</div>
-	</form>
+
+		</form>
+
+	</div>
+
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index 1d2c3e5..565d6ec 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -8,218 +8,266 @@
 >
 <xsl:template name="uploadform">
 	<div class="uploadform">
+
 		<xsl:choose>
 
 			<xsl:when test="//uploadform/@page=1">
+
 				<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>
+				<br />
+
 				<form method="post">
+
 					<xsl:attribute name="action">
 						<xsl:value-of select="$site_strings[@id='page_upload']" />
 					</xsl:attribute>
+
 					<input name="DC.Creator" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Creator" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Source" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Source" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Language" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Language" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Coverage" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Coverage" />
 						</xsl:attribute>
 					</input>
+
 					<fieldset>
-						<div>
-							<xsl:value-of select="$locale_strings[@id='instruction_title']" />
-							<br />
-							<input name="DC.Title" type="text" size="30">
-								<xsl:attribute name="value">
-									<xsl:value-of select="//uploadform/@DC.Title" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div>
-							<xsl:value-of select="$locale_strings[@id='instruction_subject']" />
-							<br />
-							<input name="DC.Subject" type="text" size="30">
-								<xsl:attribute name="value">
-									<xsl:value-of select="//uploadform/@DC.Subject" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div>
-							<xsl:value-of select="$locale_strings[@id='instruction_description']" />
-							<br />
-							<textarea name="DC.Description" cols="60" rows="2">
-								<xsl:value-of select="//uploadform/@DC.Description" />
-							</textarea>
-						</div>
+
+						<xsl:value-of select="$locale_strings[@id='instruction_title']" />
+						<br />
+
+						<input name="DC.Title" type="text" size="30">
+							<xsl:attribute name="value">
+								<xsl:value-of select="//uploadform/@DC.Title" />
+							</xsl:attribute>
+						</input>
+						<br />
+
+						<xsl:value-of select="$locale_strings[@id='instruction_subject']" />
+						<br />
+
+						<input name="DC.Subject" type="text" size="30">
+							<xsl:attribute name="value">
+								<xsl:value-of select="//uploadform/@DC.Subject" />
+							</xsl:attribute>
+						</input>
+						<br />
+
+						<xsl:value-of select="$locale_strings[@id='instruction_description']" />
+						<br />
+
+						<textarea name="DC.Description" cols="60" rows="2">
+							<xsl:value-of select="//uploadform/@DC.Description" />
+						</textarea>
+						<br />
+
 						<input type="submit" name="2">
 							<xsl:attribute name="value">
 								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
 							</xsl:attribute>
 						</input>
 						<br />
+
 						<span class="protip">
 							<xsl:value-of select="$locale_strings[@id='this_is_page_1']" />
 						</span>
+
 					</fieldset>
 				</form>
+
 			</xsl:when>
 			
 			<xsl:when test="//uploadform/@page=2">
+
 				<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']" />
 					</xsl:attribute>
+
 					<input name="DC.Title" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Title" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Subject" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Subject" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Description" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Description" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Creator" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Creator" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Source" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Source" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Language" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Language" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Coverage" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Coverage" />
 						</xsl:attribute>
 					</input>
+
 					<fieldset>
+
 						<input type="submit" name="3">
 							<xsl:attribute name="value">
 								<xsl:value-of select="$locale_strings[@id='button_next_page']" />
 							</xsl:attribute>
 						</input>
 						<br />
+
 						<span class="protip">
 							<xsl:value-of select="$locale_strings[@id='this_is_page_2']" />
 						</span>
+
 					</fieldset>
 				</form>
+
 				<xsl:call-template name="innerresults"/>
+
 			</xsl:when>
 
 			<xsl:when test="//uploadform/@page=3">
+
 				<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']" />
 					</xsl:attribute>
+
 					<input name="DC.Title" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Title" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Subject" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Subject" />
 						</xsl:attribute>
 					</input>
+
 					<input name="DC.Description" type="hidden">
 						<xsl:attribute name="value">
 							<xsl:value-of select="//uploadform/@DC.Description" />
 						</xsl:attribute>
 					</input>
+
 					<fieldset>
-						<div>
-							<xsl:value-of select="$locale_strings[@id='instruction_creator']" />
-							<br />
-							<input name="DC.Creator" type="text" size="30">
-								<xsl:attribute name="value">
-									<xsl:value-of select="//uploadform/@DC.Creator" />
-								</xsl:attribute>
-							</input>
-							</div>
-						<div>
-							<xsl:value-of select="$locale_strings[@id='instruction_source']" />
-							<br />
-							<input name="DC.Source" type="text" size="30">
-								<xsl:attribute name="value">
-									<xsl:value-of select="//uploadform/@DC.Source" />
-								</xsl:attribute>
-							</input>
-						</div>
-						<div>
-							<xsl:value-of select="$locale_strings[@id='instruction_language']" />
-							<br />
-							<select name="DC.Language" size="2">
-								<option>
-									<xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_en-us']">
-										<xsl:attribute name="selected">
-											selected
-										</xsl:attribute>
-									</xsl:if>
-									<xsl:value-of select="$locale_strings[@id='language_en-us']" />
-								</option>
-								<option>
-									<xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_de-de']">
-										<xsl:attribute name="selected">
-											selected
-										</xsl:attribute>
-									</xsl:if>
-									<xsl:value-of select="$locale_strings[@id='language_de-de']" />
-								</option>
-							</select>
-						</div>
-						<div>
-							<xsl:value-of select="$locale_strings[@id='instruction_coverage']" />
-							<br />
-							<input name="DC.Coverage" type="text" size="30">
-								<xsl:attribute name="value">
-									<xsl:value-of select="//uploadform/@DC.Coverage" />
-								</xsl:attribute>
-							</input>
-						</div>
+
+						<xsl:value-of select="$locale_strings[@id='instruction_creator']" />
+						<br />
+
+						<input name="DC.Creator" type="text" size="30">
+							<xsl:attribute name="value">
+								<xsl:value-of select="//uploadform/@DC.Creator" />
+							</xsl:attribute>
+						</input>
+						<br />
+
+						<xsl:value-of select="$locale_strings[@id='instruction_source']" />
+						<br />
+
+						<input name="DC.Source" type="text" size="30">
+							<xsl:attribute name="value">
+								<xsl:value-of select="//uploadform/@DC.Source" />
+							</xsl:attribute>
+						</input>
+						<br />
+
+						<xsl:value-of select="$locale_strings[@id='instruction_language']" />
+						<br />
+
+						<select name="DC.Language" size="2">
+							<option>
+								<xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_en-us']">
+									<xsl:attribute name="selected">
+										selected
+									</xsl:attribute>
+								</xsl:if>
+								<xsl:value-of select="$locale_strings[@id='language_en-us']" />
+							</option>
+							<option>
+								<xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_de-de']">
+									<xsl:attribute name="selected">
+										selected
+									</xsl:attribute>
+								</xsl:if>
+								<xsl:value-of select="$locale_strings[@id='language_de-de']" />
+							</option>
+						</select>
+						<br />
+
+						<xsl:value-of select="$locale_strings[@id='instruction_coverage']" />
+						<br />
+
+						<input name="DC.Coverage" type="text" size="30">
+							<xsl:attribute name="value">
+								<xsl:value-of select="//uploadform/@DC.Coverage" />
+							</xsl:attribute>
+						</input>
+						<br />
+
 						<input type="submit" name="4">
 							<xsl:attribute name="value">
 								<xsl:value-of select="$locale_strings[@id='button_next_page']" />