diff --git a/templates/Sparkle/admin/index/change_language.tpl b/templates/Sparkle/admin/index/change_language.tpl
index 77169651..b044c21f 100644
--- a/templates/Sparkle/admin/index/change_language.tpl
+++ b/templates/Sparkle/admin/index/change_language.tpl
@@ -10,17 +10,22 @@ $header
 		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
-				<p>
-					<label for="def_language">{$lng['login']['language']}:</label>&nbsp;
-					<select id="def_language" name="def_language">$language_options</select>
-				</p>
-				<p class="submit">
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<input type="submit" value="{$lng['menue']['main']['changelanguage']}" />
-				</p>
+					<table class="formtable tinyform">
+						<tr>
+							<td><label for="def_language">{$lng['login']['language']}:</label></td>
+							<td><select id="def_language" name="def_language">$language_options</select></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input type="submit" value="{$lng['menue']['main']['changelanguage']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
 				</fieldset>
 			</form>
 		</section>
diff --git a/templates/Sparkle/admin/index/change_password.tpl b/templates/Sparkle/admin/index/change_password.tpl
index e2dae3f9..06056f55 100644
--- a/templates/Sparkle/admin/index/change_password.tpl
+++ b/templates/Sparkle/admin/index/change_password.tpl
@@ -10,25 +10,30 @@ $header
 		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changepassword']}</legend>
-				<p>
-					<label for="old_password">{$lng['changepassword']['old_password']}:</label>&nbsp;
-					<input type="password" id="old_password" name="old_password" />
-				</p>
-				<p>
-					<label for="new_password">{$lng['changepassword']['new_password']}:</label>&nbsp;
-					<input type="password" id="new_password" name="new_password" />
-				</p>
-				<p>
-					<label for="new_password_confirm">{$lng['changepassword']['new_password_confirm']}:</label>&nbsp;
-					<input type="password" id="new_password_confirm" name="new_password_confirm" />
-				</p>
-				<p class="submit">
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<input type="submit" value="{$lng['menue']['main']['changepassword']}" />
-				</p>
+					<table class="formtable tinyform">
+						<tr>
+							<td><label for="old_password">{$lng['changepassword']['old_password']}:</label></td>
+							<td><input type="password" id="old_password" name="old_password" /></td>
+						</tr>
+						<tr>
+							<td><label for="new_password">{$lng['changepassword']['new_password']}:</label></td>
+							<td><input type="password" id="new_password" name="new_password" /></td>
+						</tr>
+						<tr>
+							<td><label for="new_password_confirm">{$lng['changepassword']['new_password_confirm']}:</label></td>
+							<td><input type="password" id="new_password_confirm" name="new_password_confirm" /></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input type="submit" value="{$lng['menue']['main']['changepassword']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
 				</fieldset>
 			</form>
 		</section>
diff --git a/templates/Sparkle/admin/index/change_theme.tpl b/templates/Sparkle/admin/index/change_theme.tpl
index c0c40eec..90bff518 100644
--- a/templates/Sparkle/admin/index/change_theme.tpl
+++ b/templates/Sparkle/admin/index/change_theme.tpl
@@ -10,17 +10,22 @@ $header
 		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changetheme']}</legend>
-				<p>
-					<label for="theme">{$lng['panel']['theme']}:</label>&nbsp;
-					<select id="theme" name="theme">$theme_options</select>
-				</p>
-				<p class="submit">
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" />
-				</p>
+					<table class="formtable tinyform">
+						<tr>
+							<td><label for="theme">{$lng['panel']['theme']}:</label></td>
+							<td><select id="theme" name="theme">$theme_options</select></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
 				</fieldset>
 			</form>
 		</section>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 64909218..31914c64 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -191,7 +191,7 @@ footer img {
 }
 
 .tinyform input {
-	width:50%;
+	/*width:50%;*/
 }
 
 .tinyform input[type="checkbox"] {
@@ -622,6 +622,8 @@ table tfoot td {
 	height:25px;
 	border-top: 1px solid #d1d5d8;
 	background-color: #f2f8fa;
+}
+.formtable tfoot td {
 	padding-right: 0px;
 }
 
@@ -636,8 +638,8 @@ table tfoot td {
 /* input elements */
 input {
 	background: #fff url(../img/icons/text_align_left.png) no-repeat 5px 4px;
-	padding:2px 4px 2px 24px;
-	height:22px;
+	padding:1px 4px 2px 24px;
+	height:23px;
 	border: 1px solid #d9d9d9;
 	margin-bottom: 5px;
 	border-radius: 3px;
diff --git a/templates/Sparkle/customer/index/change_language.tpl b/templates/Sparkle/customer/index/change_language.tpl
index 32c43f20..6c56e671 100644
--- a/templates/Sparkle/customer/index/change_language.tpl
+++ b/templates/Sparkle/customer/index/change_language.tpl
@@ -10,17 +10,22 @@ $header
 		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
-				<p>
-					<label for="def_language">{$lng['login']['language']}:</label>&nbsp;
-					<select id="def_language" name="def_language">$language_options</select>
-				</p>
-				<p class="submit">
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<input type="submit" value="{$lng['menue']['main']['changelanguage']}" />
-				</p>
+					<table class="formtable tinyform">
+						<tr>
+							<td width="50%"><label for="def_language">{$lng['login']['language']}:</label></td>
+							<td><select id="def_language" name="def_language">$language_options</select></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input type="submit" value="{$lng['menue']['main']['changelanguage']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
 				</fieldset>
 			</form>
 		</section>
diff --git a/templates/Sparkle/customer/index/change_password.tpl b/templates/Sparkle/customer/index/change_password.tpl
index 3598b701..9f99a39b 100644
--- a/templates/Sparkle/customer/index/change_password.tpl
+++ b/templates/Sparkle/customer/index/change_password.tpl
@@ -10,33 +10,38 @@ $header
 		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp{$lng['menue']['main']['changepassword']}</legend>
-				<p>
-					<label for="old_password">{$lng['changepassword']['old_password']}:</label>&nbsp;
-					<input type="password" id="old_password" name="old_password" />
-				</p>
-				<p>
-					<label for="new_password">{$lng['changepassword']['new_password']}:</label>&nbsp;
-					<input type="password" id="new_password" name="new_password" />
-				</p>
-				<p>
-					<label for="new_password_confirm">{$lng['changepassword']['new_password_confirm']}:</label>&nbsp;
-					<input type="password" id="new_password_confirm" name="new_password_confirm" />
-				</p>
-				<p>
-					<input type="checkbox" name="change_main_ftp" id="change_main_ftp" value="true" />&nbsp;
-					{$lng['changepassword']['also_change_ftp']}
-				</p>
-				<p>
-					<input type="checkbox" name="change_webalizer" id="change_webalizer" value="true" />&nbsp;
-					{$lng['changepassword']['also_change_webalizer']}
-				</p>
-				<p class="submit">
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<input type="submit" value="{$lng['menue']['main']['changepassword']}" />
-				</p>
+					<table class="formtable fullform">
+						<tr>
+							<td width="50%"><label for="old_password">{$lng['changepassword']['old_password']}:</label></td>
+							<td><input type="password" id="old_password" name="old_password" /></td>
+						</tr>
+						<tr>
+							<td><label for="new_password">{$lng['changepassword']['new_password']}:</label></td>
+							<td><input type="password" id="new_password" name="new_password" /></td>
+						</tr>
+						<tr>
+							<td><label for="new_password_confirm">{$lng['changepassword']['new_password_confirm']}:</label></td>
+							<td><input type="password" id="new_password_confirm" name="new_password_confirm" /></td>
+						</tr>
+						<tr>
+							<td><label for="change_main_ftp">{$lng['changepassword']['also_change_ftp']}:</label></td>
+							<td><input type="checkbox" name="change_main_ftp" id="change_main_ftp" value="true" /></td>
+						</tr>
+						<tr>
+							<td><label for="change_webalizer">{$lng['changepassword']['also_change_webalizer']}:</label></td>
+							<td><input type="checkbox" name="change_webalizer" id="change_webalizer" value="true" /></td>
+						</tr>
+						<tfoot>
+							<tr>
+								<td colspan="2" align="center">
+									<input type="submit" value="{$lng['menue']['main']['changepassword']}" />
+								</td>
+							</tr>
+						</tfoot>
+					</table>
 				</fieldset>
 			</form>
 		</section>
diff --git a/templates/Sparkle/customer/index/change_theme.tpl b/templates/Sparkle/customer/index/change_theme.tpl
index e2621fbf..b1c41e61 100644
--- a/templates/Sparkle/customer/index/change_theme.tpl
+++ b/templates/Sparkle/customer/index/change_theme.tpl
@@ -10,17 +10,22 @@ $header
 		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changetheme']}</legend>
-				<p>
-					<label for="theme">{$lng['panel']['theme']}:</label>&nbsp;
-					<select id="theme" name="theme">$theme_options</select>
-				</p>
-				<p class="submit">
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="send" value="send" />
-					<input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" />
-				</p>
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="send" value="send" />
+				<table class="formtable tinyform">
+					<tr>
+						<td width="50%"><label for="theme">{$lng['panel']['theme']}:</label></td>
+						<td><select id="theme" name="theme">$theme_options</select></td>
+					</tr>
+					<tfoot>
+						<tr>
+							<td colspan="2" align="center">					
+								<input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" />
+							</td>
+						</tr>
+					</tfoot>
+				</table>
 				</fieldset>
 			</form>
 		</section>