diff --git a/templates/admin_edit-domain.tpl b/templates/admin_edit-domain.tpl
index e3a52e88..1bcfe9cf 100644
--- a/templates/admin_edit-domain.tpl
+++ b/templates/admin_edit-domain.tpl
@@ -2,61 +2,62 @@
 <form name="edit_domain" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pAdminEdit_domain_welcome}</h3></td>
+		<th colspan="3">{$PALANG.pAdminEdit_domain_welcome}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_domain}:</td>
-		<td>{$domain}</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_domain}:</label></td>
+		<td><em>{$domain}</em></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_description}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_description}:</label></td>
 		<td><input class="flat" type="text" name="fDescription" value="{$tDescription}" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_aliases}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_aliases}:</label></td>
 		<td><input class="flat" type="text" name="fAliases" value="{$tAliases}" /></td>
 		<td>{$PALANG.pAdminEdit_domain_aliases_text}</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_mailboxes}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_mailboxes}:</label></td>
 		<td><input class="flat" type="text" name="fMailboxes" value="{$tMailboxes}" /></td>
 		<td>{$PALANG.pAdminEdit_domain_mailboxes_text}</td>
 	</tr>
 {if $CONF.domain_quota===YES}
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_quota}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_quota}:</label></td>
 		<td><input class="flat" type="text" name="fDomainquota" value="{$tDomainquota}" /></td>
 		<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
 	</tr>
 {/if}
 {if $CONF.quota===YES}
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_maxquota}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_maxquota}:</label></td>
 		<td><input class="flat" type="text" name="fMaxquota" value="{$tMaxquota}" /></td>
 		<td>{$PALANG.pAdminEdit_domain_maxquota_text}</td>
 	</tr>
 {/if}
 {if $CONF.transport===YES}
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_transport}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_transport}:</label></td>
 		<td><select class="flat" name="fTransport">{$select_options}</select></td>
 		<td>{$PALANG.pAdminEdit_domain_transport_text}</td>
 	</tr>
 {/if}
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_backupmx}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_backupmx}:</label></td>
 		<td><input class="flat" type="checkbox" name="fBackupmx"{$tBackupmx}/></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pAdminEdit_domain_active}:</td>
+		<td class="label"><label>{$PALANG.pAdminEdit_domain_active}:</label></td>
 		<td><input class="flat" type="checkbox" name="fActive"{$tActive}/></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input type="submit" class="button" name="submit" value="{$PALANG.save}" /></td>
+		<td>&nbsp;</td>
+		<td colspan="2"><input type="submit" class="button" name="submit" value="{$PALANG.save}" /></td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout">{$tMessage}</td>
diff --git a/templates/create-alias-domain.tpl b/templates/create-alias-domain.tpl
index 415e8429..5def58eb 100644
--- a/templates/create-alias-domain.tpl
+++ b/templates/create-alias-domain.tpl
@@ -2,7 +2,7 @@
 <form name="alias_domain" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pCreate_alias_domain_welcome}</h3></td>
+		<th colspan="3">{$PALANG.pCreate_alias_domain_welcome}</th>
 	</tr>
 {if $alias_domains}
 	<tr>
@@ -26,7 +26,8 @@
 	</tr>
 {if $alias_domains}
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_alias_domain_button}" /></td>
+		<td>&nbsp;</td>
+		<td colspan="2"><input class="button" type="submit" name="submit" value="{$PALANG.pCreate_alias_domain_button}" /></td>
 	</tr>
 {/if}
 </table>
diff --git a/templates/edit-vacation.tpl b/templates/edit-vacation.tpl
index 5c54bc27..0ecdb7ab 100644
--- a/templates/edit-vacation.tpl
+++ b/templates/edit-vacation.tpl
@@ -1,28 +1,27 @@
 {literal}
-	<script type="text/javascript">
+	<script language="JavaScript" type="text/javascript">
 	function newLocation() {
 		window.location="{/literal}{$fCanceltarget}{literal}"
 	}
 	</script>
-	<script language="JavaScript" src="calendar.js"></script>
-	<link rel="stylesheet" href="css/calendar.css">
+	<script language="JavaScript" src="calendar.js" type="text/javascript"></script>
 {/literal}
 <div id="edit_form">
 <form name="edit-vacation" method="post" action=''>
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pUsersVacation_welcome}</h3></td>
+		<th colspan="3">{$PALANG.pUsersVacation_welcome}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersLogin_username}:</td>
-		<td>{$tUseremail}</td>
+		<td class="label"><label>{$PALANG.pUsersLogin_username}:</label></td>
+		<td><em>{$tUseremail}</em></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_activefrom}:</td>
-		<td><input name="activefrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/>
+		<td class="label"><label>{$PALANG.pUsersVacation_activefrom}:</label></td>
+		<td><input class="flat" name="activefrom" value="{$tActiveFrom}" readonly="readonly" style="background:#eee;"/>
 {literal}
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 	new tcal ({
 		'formname': 'edit-vacation',
 		'controlname': 'activefrom'
@@ -33,10 +32,10 @@
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_activeuntil}:</td>
-		<td><input name="activeuntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/>
+		<td class="label"><label>{$PALANG.pUsersVacation_activeuntil}:</label></td>
+		<td><input class="flat" name="activeuntil" value="{$tActiveUntil}" readonly="readonly" style="background:#eee;"/>
 {literal}
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 	new tcal ({
 		'formname': 'edit-vacation',
 		'controlname': 'activeuntil'
@@ -47,17 +46,18 @@
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_subject}:</td>
+		<td class="label"><label>{$PALANG.pUsersVacation_subject}:</label></td>
 		<td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pUsersVacation_body}:</td>
+		<td class="label"><label>{$PALANG.pUsersVacation_body}:</label></td>
 		<td><textarea class="flat" rows="10" cols="60" name="fBody" >{$tBody}</textarea></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center">
+		<td>&nbsp;</td>
+		<td colspan="2">
 			<input class="button" type="submit" name="fChange" value="{$PALANG.pEdit_vacation_set}" />
 			<input class="button" type="submit" name="fBack" value="{$PALANG.pEdit_vacation_remove}" />
 			<input class="button" type="button" name="fCancel" value="{$PALANG.exit}" onclick="newLocation()" />
diff --git a/templates/list-virtual_alias_domain.tpl b/templates/list-virtual_alias_domain.tpl
index fd00c392..67c042f8 100644
--- a/templates/list-virtual_alias_domain.tpl
+++ b/templates/list-virtual_alias_domain.tpl
@@ -1,7 +1,7 @@
 {*** Domain Aliases ***}
 <table id="alias_domain_table">
 	<tr>
-		<td colspan="5"><h3>{$PALANG.pOverview_alias_domain_title}</h3></td>
+		<th colspan="5">{$PALANG.pOverview_alias_domain_title}</th>
 	</tr>
 	{if $tAliasDomains|@count>0 || $tTargetDomain|@count>1}
 		{if $tAliasDomains|@count>0} {* -> HAT alias-domains *}
diff --git a/templates/password.tpl b/templates/password.tpl
index 5f1bdde1..d9c7ce02 100644
--- a/templates/password.tpl
+++ b/templates/password.tpl
@@ -2,30 +2,32 @@
 <form name="mailbox" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pPassword_welcome}</h3></td>
+		<th colspan="3">{$PALANG.pPassword_welcome}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_admin}:</td>
-		<td>{$SESSID_USERNAME}</td>
+		<td class="label"><label>{$PALANG.pPassword_admin}:</label></td>
+		<td><em>{$SESSID_USERNAME}</em></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_password_current}</td>
+		<td class="label"><label>{$PALANG.pPassword_password_current}:</label></td>
 		<td><input class="flat" type="password" name="fPassword_current" /></td>
-		<td>{$pPassword_password_current_text}</td>
+		<td class="error_msg">{$pPassword_password_current_text}</td>
 	</tr>
 	<tr>
-	<td>{$PALANG.pPassword_password}:</td>
+		<td class="label"><label>{$PALANG.pPassword_password}:</label></td>
 		<td><input class="flat" type="password" name="fPassword" /></td>
-		<td>{$pPassword_password_text}</td>
+		<td class="error_msg">{$pPassword_password_text}</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pPassword_password2}:</td>
+		<td class="label"><label>{$PALANG.pPassword_password2}:</label></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
+		<td class="label">&nbsp;</td>
+		<td><input class="button" type="submit" name="submit" value="{$PALANG.pPassword_button}" /></td>
+		<td>&nbsp;</td>
 	</tr>
 	<tr>
 		<td colspan="3" class="standout">{$tMessage}</td>