diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index 2e5e4ec..01d0634 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -14,7 +14,7 @@
 
 	<string id="upload_video">upload video</string>
 	<string id="bookmarks">bookmarks</string>
-	<string id="account_details">account details</string>
+	<string id="settings_details">settings details</string>
 
 	<string id="logged_in_as">logged in as&#160;</string>
 	<string id="logout">logout</string>
@@ -177,13 +177,10 @@
 	<string id="duration">duration</string>
 	<string id="viewcount">viewcount</string>
 	
-	<!-- account page -->
-	<string id="account_uploads">my uploads</string>
-	<string id="account_settings">edit my settings</string>
-	<string id="account_bookmarks">my bookmarks</string>
-	<string id="account_locale">locale</string>
-	<string id="account_pagesize">pagesize</string>
-	<string id="account_cortado">cortado</string>
+	<!-- settings page -->
+	<string id="settings_locale">locale</string>
+	<string id="settings_pagesize">pagesize</string>
+	<string id="settings_cortado">cortado</string>
 
 	<!-- rss feed -->
 	<string id="rss_separator">&#160;-&#160;</string>
diff --git a/trunk/settings.pl b/trunk/settings.pl
index 19780a1..d9ce101 100644
--- a/trunk/settings.pl
+++ b/trunk/settings.pl
@@ -21,10 +21,10 @@ if($userinfo->{'username'})
 	
 if($userinfo->{'username'})
 {
-	$page->{'account'}->{'show'} = 'settings';
-	$page->{'account'}->{'locale'} = $userinfo->{'locale'};
-	$page->{'account'}->{'pagesize'} = $userinfo->{'pagesize'};
-	$page->{'account'}->{'cortado'} = $userinfo->{'cortado'}
+	$page->{'settings'}->{'show'} = 'settings';
+	$page->{'settings'}->{'locale'} = $userinfo->{'locale'};
+	$page->{'settings'}->{'pagesize'} = $userinfo->{'pagesize'};
+	$page->{'settings'}->{'cortado'} = $userinfo->{'cortado'}
 }
 else
 {
diff --git a/trunk/site/main.xml b/trunk/site/main.xml
index 9a171ee..de0d1ff 100755
--- a/trunk/site/main.xml
+++ b/trunk/site/main.xml
@@ -8,10 +8,7 @@
 	<string id="site_motto">WebTV free as in Speech</string>
 
 	<!-- invisible -->
-	<string id="page_account">/account.pl</string>
-	<string id="page_account_settings">/account.pl?show=settings</string>
-	<string id="page_account_uploads">/account.pl?show=uploads</string>
-	<string id="page_account_bookmarks">/account.pl?show=bookmarks</string>
+	<string id="page_account">/settings.pl</string>
 	<string id="page_login">/login.pl</string>
 	<string id="page_login-openid">/login.pl?action=openid</string>
 	<string id="page_logout">/login.pl?action=logout</string>
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index ffb48ab..19f7094 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -23,7 +23,7 @@
 <xsl:include href="./xhtml/upload.xsl"/>
 <xsl:include href="./xhtml/video.xsl"/>
 <xsl:include href="./xhtml/register.xsl"/>
-<xsl:include href="./xhtml/account.xsl"/>
+<xsl:include href="./xhtml/settings.xsl"/>
 
 <xsl:variable name="locale">
 	<xsl:choose>
@@ -164,16 +164,9 @@
 							<xsl:value-of select="$locale_strings[@id='separator']" />
 							<a>
 								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_account_bookmarks']" />
+									<xsl:value-of select="$site_strings[@id='page_settings']" />
 								</xsl:attribute>
-								<xsl:value-of select="$locale_strings[@id='bookmarks']" />
-							</a>
-							<xsl:value-of select="$locale_strings[@id='separator']" />
-							<a>
-								<xsl:attribute name="href">
-									<xsl:value-of select="$site_strings[@id='page_account']" />
-								</xsl:attribute>
-								<xsl:value-of select="$locale_strings[@id='account_details']" />
+								<xsl:value-of select="$locale_strings[@id='settings_details']" />
 							</a>
 						</div>
 						<div class="header2">
@@ -230,8 +223,8 @@
 				<xsl:when test="//video">
 					<xsl:call-template name="video"/>
 				</xsl:when>
-				<xsl:when test="//account">
-					<xsl:call-template name="account"/>
+				<xsl:when test="//settings">
+					<xsl:call-template name="settings"/>
 				</xsl:when>
 			</xsl:choose>
 
diff --git a/trunk/xsl/xhtml/account.xsl b/trunk/xsl/xhtml/account.xsl
index ffc7261..087ae82 100644
--- a/trunk/xsl/xhtml/account.xsl
+++ b/trunk/xsl/xhtml/account.xsl
@@ -7,180 +7,121 @@
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 >
 
-<xsl:template name="account">
-	<div>
-		<xsl:choose>
-			<xsl:when test="//account/@show='uploads'">
-				<xsl:value-of select="$locale_strings[@id='account_uploads']" />
-			</xsl:when>
-			<xsl:otherwise>
-				<a>
-					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_account_uploads']" />
+<xsl:template name="settings">
+	<h2><xsl:value-of select="$locale_strings[@id='account_settings']" /></h2>
+	<form method="POST">
+		<xsl:attribute name="action">
+			<xsl:value-of select="$site_strings[@id='page_account']" />
+		</xsl:attribute>
+		<input type="hidden" name="show" value="settings" />
+		<div>
+			<h3><xsl:value-of select="$locale_strings[@id='account_locale']" /></h3>
+			<br />
+			<select name="locale" size="2">
+				<option value="en-us">
+					<xsl:if test="//account/@locale='en-us'">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					<xsl:value-of select="$locale_strings[@id='language_en-us']" />
+				</option>
+				<option value="de-de">
+					<xsl:if test="//account/@locale='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>
+			<h3><xsl:value-of select="$locale_strings[@id='account_pagesize']" /></h3>
+			<br />
+			<select name="pagesize" size="7">
+				<option>
+					<xsl:if test="//account/@pagesize=1">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					1
+				</option>
+				<option>
+					<xsl:if test="//account/@pagesize=2">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					2
+				</option>
+				<option>
+					<xsl:if test="//account/@pagesize=5">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					5
+				</option>
+				<option>
+					<xsl:if test="//account/@pagesize=10">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					10
+				</option>
+				<option>
+					<xsl:if test="//account/@pagesize=20">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					20
+				</option>
+				<option>
+					<xsl:if test="//account/@pagesize=50">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					50
+				</option>
+				<option>
+					<xsl:if test="//account/@pagesize=100">
+						<xsl:attribute name="selected">
+							selected
+						</xsl:attribute>
+					</xsl:if>
+					100
+				</option>
+			</select>
+		</div>
+		<div>
+			<h3><xsl:value-of select="$locale_strings[@id='account_cortado']" /></h3>
+			<input type="radio" name="cortado" value="1">
+				<xsl:if test="//account/@cortado=1">
+					<xsl:attribute name="checked">
+						checked
 					</xsl:attribute>
-					<xsl:value-of select="$locale_strings[@id='account_uploads']" />
-				</a>
-			</xsl:otherwise>
-		</xsl:choose>
-		<xsl:value-of select="$locale_strings[@id='separator']" />
-		<xsl:choose>
-			<xsl:when test="//account/@show='settings'">
-				<xsl:value-of select="$locale_strings[@id='account_settings']" />
-			</xsl:when>
-			<xsl:otherwise>
-				<a>
-					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_account_settings']" />
+				</xsl:if>
+			</input>
+			<xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
+			<br />
+			<input type="radio" name="cortado" value="0">
+				<xsl:if test="//account/@cortado=0">
+					<xsl:attribute name="checked">
+						checked
 					</xsl:attribute>
-					<xsl:value-of select="$locale_strings[@id='account_settings']" />
-				</a>
-			</xsl:otherwise>
-		</xsl:choose>
-		<xsl:value-of select="$locale_strings[@id='separator']" />
-		<xsl:choose>
-			<xsl:when test="//account/@show='bookmarks'">
-				<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
-			</xsl:when>
-			<xsl:otherwise>
-				<a>
-					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_account_bookmarks']" />
-					</xsl:attribute>
-					<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
-				</a>
-			</xsl:otherwise>
-		</xsl:choose>
-	</div>
-	
-	<xsl:choose>
-		<xsl:when test="//account/@show='uploads'">
-			<h2><xsl:value-of select="$locale_strings[@id='account_uploads']" /></h2>
-			<xsl:call-template name="results"/>
-		</xsl:when>
-		<xsl:when test="//account/@show='settings'">
-			<h2><xsl:value-of select="$locale_strings[@id='account_settings']" /></h2>
-			<form method="POST">
-				<xsl:attribute name="action">
-					<xsl:value-of select="$site_strings[@id='page_account_settings']" />
-				</xsl:attribute>
-				<input type="hidden" name="show" value="settings" />
-				<div>
-					<h3><xsl:value-of select="$locale_strings[@id='account_locale']" /></h3>
-					<br />
-					<select name="locale" size="2">
-						<option value="en-us">
-							<xsl:if test="//account/@locale='en-us'">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							<xsl:value-of select="$locale_strings[@id='language_en-us']" />
-						</option>
-						<option value="de-de">
-							<xsl:if test="//account/@locale='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>
-					<h3><xsl:value-of select="$locale_strings[@id='account_pagesize']" /></h3>
-					<br />
-					<select name="pagesize" size="7">
-						<option>
-							<xsl:if test="//account/@pagesize=1">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							1
-						</option>
-						<option>
-							<xsl:if test="//account/@pagesize=2">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							2
-						</option>
-						<option>
-							<xsl:if test="//account/@pagesize=5">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							5
-						</option>
-						<option>
-							<xsl:if test="//account/@pagesize=10">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							10
-						</option>
-						<option>
-							<xsl:if test="//account/@pagesize=20">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							20
-						</option>
-						<option>
-							<xsl:if test="//account/@pagesize=50">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							50
-						</option>
-						<option>
-							<xsl:if test="//account/@pagesize=100">
-								<xsl:attribute name="selected">
-									selected
-								</xsl:attribute>
-							</xsl:if>
-							100
-						</option>
-					</select>
-				</div>
-				<div>
-					<h3><xsl:value-of select="$locale_strings[@id='account_cortado']" /></h3>
-					<input type="radio" name="cortado" value="1">
-						<xsl:if test="//account/@cortado=1">
-							<xsl:attribute name="checked">
-								checked
-							</xsl:attribute>
-						</xsl:if>
-					</input>
-					<xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
-					<br />
-					<input type="radio" name="cortado" value="0">
-						<xsl:if test="//account/@cortado=0">
-							<xsl:attribute name="checked">
-								checked
-							</xsl:attribute>
-						</xsl:if>
-					</input>
-					<xsl:value-of select="$locale_strings[@id='watch_browserplugin']" />
-				</div>
-				<div>
-					<input name="submit" type="submit" />
-				</div>
-			</form>
-		</xsl:when>
-		<xsl:when test="//account/@show='bookmarks'">
-			<h2><xsl:value-of select="$locale_strings[@id='account_bookmarks']" /></h2>
-			<p>coming soon...</p>
-		</xsl:when>
-		<xsl:otherwise>
-			<p></p>
-		</xsl:otherwise>
-	</xsl:choose>
+				</xsl:if>
+			</input>
+			<xsl:value-of select="$locale_strings[@id='watch_browserplugin']" />
+		</div>
+		<div>
+			<input name="submit" type="submit" />
+		</div>
+	</form>
 </xsl:template>
 
 </xsl:stylesheet>