From eee4c4ff0fdf96fa4014189a3fb9eaff4b0f735e Mon Sep 17 00:00:00 2001
From: Luzifr <szekely@woltlab.com>
Date: Tue, 9 Aug 2011 19:33:42 +0200
Subject: [PATCH] Code format, removed one div level (container-1), system
 notifications styled, some other improvements

---
 wcfsetup/install/files/acp/style/testing.css  |  95 ++--
 .../files/acp/templates/acpSessionLog.tpl     |   3 +
 .../files/acp/templates/acpSessionLogList.tpl |   3 +
 .../install/files/acp/templates/cacheList.tpl |   3 +
 .../files/acp/templates/cronjobAdd.tpl        | 191 ++++----
 .../files/acp/templates/cronjobList.tpl       |   3 +
 .../files/acp/templates/cronjobLogList.tpl    |   7 +-
 .../files/acp/templates/masterPassword.tpl    |  41 +-
 .../acp/templates/masterPasswordInit.tpl      |  79 ++--
 .../install/files/acp/templates/option.tpl    |  42 +-
 .../files/acp/templates/optionImport.tpl      |  71 ++-
 .../files/acp/templates/optionTypeText.tpl    |   2 +-
 .../acp/templates/packageAutoUpdateList.tpl   |  18 +-
 .../templates/packageInstallationConfirm.tpl  |  50 ++-
 .../files/acp/templates/packageList.tpl       |   3 +
 .../acp/templates/packageStartInstall.tpl     |  83 ++--
 .../packageUninstallationDependencies.tpl     |   3 +
 .../files/acp/templates/packageUpdate.tpl     |  34 +-
 .../files/acp/templates/packageUpdateAuth.tpl | 101 +++--
 .../acp/templates/packageUpdateSearch.tpl     | 117 +++--
 .../templates/packageUpdateSearchResult.tpl   |  27 +-
 .../files/acp/templates/packageView.tpl       |   4 +
 .../files/acp/templates/updateServerAdd.tpl   |  75 ++--
 .../files/acp/templates/updateServerList.tpl  |   7 +-
 .../install/files/acp/templates/userAdd.tpl   | 300 +++++++------
 .../files/acp/templates/userAssignToGroup.tpl |  44 +-
 .../acp/templates/userEmailAddressExport.tpl  |  86 ++--
 .../files/acp/templates/userException.tpl     |   2 +-
 .../files/acp/templates/userGroupAdd.tpl      | 122 +++---
 .../files/acp/templates/userGroupList.tpl     |   3 +
 .../install/files/acp/templates/userList.tpl  |   7 +-
 .../install/files/acp/templates/userMail.tpl  | 160 +++----
 .../files/acp/templates/userSearch.tpl        | 293 +++++++------
 .../acp/templates/usersMassProcessing.tpl     | 410 +++++++++---------
 34 files changed, 1273 insertions(+), 1216 deletions(-)

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 4fbb2ae718..48f725b3ec 100644
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -141,10 +141,12 @@ header.pageHeader div#logo a {
 nav.mainMenu {
 	margin: 0 30px;
 	background-color: rgba(0, 0, 0, .4);
-	border-radius: 5px 5px 0 0;
 	display: table;
 	position: relative;
 	bottom: -5px;
+	
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
 }
 
 nav.mainMenu:after {
@@ -249,6 +251,11 @@ section.content {
 	z-index: 100;
 }
 
+section.content .content {
+	border: 1px solid #ccc;
+	padding: 13px 23px;
+}
+
 div.main > div section:only-child {
 	display: block !important;
 	width: auto;
@@ -407,7 +414,7 @@ footer nav.footerNavigation ul li {
 }
 
 .mainHeading > hgroup {
-	height: 48px;
+	min-height: 48px;
 	padding-left: 60px;
 	margin-bottom: 30px;
 }
@@ -450,11 +457,19 @@ footer nav.footerNavigation ul li {
 fieldset {
 	border: 1px solid #ccc;
 	border-radius: 7px;
-	background-color: rgba(230, 230, 230, .1);
+	background-color: rgba(0, 0, 0, .015);
 	margin: 15px 0;
 	padding: 15px;
 }
+/*
+fieldset:first-child {
+	margin-top: 0;
+}
 
+fieldset:last-child {
+	margin-bottom: 0;
+}
+*/
 fieldset legend {
 	color: #999;
 	padding: 0 7px 0;
@@ -1181,27 +1196,61 @@ p.success,
 p.warning {
 	border-radius: 7px;
 	margin-bottom: 14px;
-	padding: 7px 14px;
+	padding: 7px 14px 7px 50px;
+	line-height: 1.5;
+	text-shadow: 0 1px 0 #fff;
+	
+	-webkit-box-shadow: 0 0 7px rgba(0, 0, 0, .1);
+	-moz-box-shadow: 0 0 7px rgba(0, 0, 0, .1);
+	-ms-box-shadow: 0 0 7px rgba(0, 0, 0, .1);
+	-o-box-shadow: 0 0 7px rgba(0, 0, 0, .1);
+	box-shadow: 0 0 7px rgba(0, 0, 0, .1);
+	
+	-webkit-transition: all .1s linear;
+	-moz-transition: all .1s linear;
+	-ms-transition: all .1s linear;
+	-o-transition: all .1s linear;
+	transition: all .1s linear;
 }
 
 p.info {
+	color: #68b;
+	border: 1px solid #9be;
 	background-color: #def;
-	border: 1px solid #06f;
+	background-image: url("../../icon/systemInfo.svg");
+	background-size: 24px;
+	background-position: 13px center;
+	background-repeat: no-repeat;
 }
 
 p.success {
+	color: #090;
+	border: 1px solid #0c0;
 	background-color: #efe;
-	border: 1px solid #090;
-}
-
-p.error {
-	background-color: #fee;
-	border: 1px solid #c00;
+	background-image: url("../../icon/systemSuccess.svg");
+	background-size: 24px;
+	background-position: 13px center;
+	background-repeat: no-repeat;
 }
 
 p.warning {
+	color: #990;
+	border: 1px solid #cc0;
 	background-color: #ffd;
-	border: 1px solid #660;
+	background-image: url("../../icon/systemWarning.svg");
+	background-size: 24px;
+	background-position: 13px center;
+	background-repeat: no-repeat;
+}
+
+p.error {
+	color: #c00;
+	border: 1px solid #f99;
+	background-color: #fee;
+	background-image: url("../../icon/systemError.svg");
+	background-size: 24px;
+	background-position: 13px center;
+	background-repeat: no-repeat;
 }
 
 
@@ -1334,7 +1383,7 @@ div.ui-widget-overlay {
 
 
 /* -- -- -- -- -- Tab Menu -- -- -- -- -- */
-/* -- -- -- -- -- Parts taken from jQuery UI @ themes/base/jquery.ui.tabs.css -- -- -- -- -- */
+/* Parts taken from jQuery UI @ themes/base/jquery.ui.tabs.css */
 
 /* Tab Menu */
 
@@ -1392,18 +1441,18 @@ div.ui-widget-overlay {
 .tabMenu li.ui-state-active a {
 	color: #333 !important;
 	font-weight: bold;
-	background-color: rgba(230, 230, 230, .15);
+	background-color: rgba(255, 255, 255, .015);
 }
 
 .tabMenu li.ui-tabs-selected a {
 	background-color: #fefefe;	
-	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(230, 230, 230, .15)));
-	background-image: -moz-linear-gradient(0% 0% 270deg, rgba(255, 255, 255, 1), rgba(230, 230, 230, .15));
-	background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(230, 230, 230, .15)));
-	background-image: -o-linear-gradient(rgba(255, 255, 255, 1), rgba(230, 230, 230, .15));
-	background-image: linear-gradient(rgba(255, 255, 255, 1), rgba(230, 230, 230, .15));
+	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(253, 253, 253, 1)));
+	background-image: -moz-linear-gradient(0% 0% 270deg, rgba(255, 255, 255, 1), rgba(253, 253, 253, 1));
+	background-image: -ms-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, 1)), to(rgba(253, 253, 253, 1)));
+	background-image: -o-linear-gradient(rgba(255, 255, 255, 1), rgba(253, 253, 253, 1));
+	background-image: linear-gradient(rgba(255, 255, 255, 1), rgba(253, 253, 253, 1));
 	
-	border-bottom: 1px solid rgba(230, 230, 230, .15);
+	border-bottom: 1px solid rgba(253, 253, 253, 1);
 }
 
 .tabMenu li.ui-tabs-selected a,
@@ -1420,18 +1469,14 @@ div.ui-widget-overlay {
 /* Tab Menu Content */
 
 .tabMenuContent {
-	background-color: rgba(230, 230, 230, .15);
 	border: 1px solid #ccc !important;
+	background-color: rgba(253, 253, 253, 1);
 	z-index: 89; /* Prevents border overlay during transition */
 	display: block;
 	margin: -2px 0 0;
 	padding: 15px 23px;
 }
 
-.content {
-	border-width: 0 !important;
-}
-
 /* ToDo: 2x hidden? */
 
 .ui-tabs .ui-tabs-hide {
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index 1e8803b83b..2f7af69574 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -18,6 +18,7 @@
 		<hgroup>
 			<h1>{lang}wcf.acp.sessionLog.access.view.count{/lang} <span class="badge" title="{lang}wcf.acp.sessionLog.access.view.count{/lang}">{#$items}</span></h1>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr>
@@ -32,6 +33,7 @@
 					{if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$sessionAccessLogs item=sessionAccessLog}
 				<tr>
@@ -48,6 +50,7 @@
 			{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 
 	<div class="contentFooter">
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index 600c04a0dc..f55951151f 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -18,6 +18,7 @@
 		<hgroup>
 			<h1>{lang}wcf.acp.sessionLog.view.count{/lang} <span class="badge" title="{lang}wcf.acp.sessionLog.view.count{/lang}">{#$items}</span></h1>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr>
@@ -32,6 +33,7 @@
 					{if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$sessionLogs item=sessionLog}
 				<tr class="{if $sessionLog->active} activeContainer{/if}">
@@ -48,6 +50,7 @@
 			{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 
 	<div class="contentFooter">
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 503a8bc105..0cc40fa1ff 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -52,6 +52,7 @@
 			<hgroup>
 				<h1>{$cache} <span class="badge" title="{$cache}">{#$files|count}</span></h1>
 			</hgroup>
+			
 			<table id="{$cache}">
 				<thead>
 					<tr>
@@ -63,6 +64,7 @@
 						{/if}
 					</tr>
 				</thead>
+				
 				<tbody>
 				{foreach from=$files item=file}
 					<tr>
@@ -76,6 +78,7 @@
 				{/foreach}
 				</tbody>
 			</table>
+			
 		</div>
 		<script type="text/javascript">
 			//<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index cd4d99c94e..ab185a3fa5 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -29,104 +29,103 @@
 
 <form method="post" action="index.php?form=Cronjob{$action|ucfirst}">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.cronjob.edit.data{/lang}</legend>
-				
-				<dl id="classNameDiv"{if $errorField == 'className'} class="formError"{/if}>
-					<dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
-					<dd class="formField">
-						<input type="text" id="className" name="className" value="{$className}" class="long" />
-						{if $errorField == 'className'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.acp.cronjob.error.empty{/lang}{/if}
-								{if $errorType == 'doesNotExist'}{lang}wcf.acp.cronjob.error.doesNotExist{/lang}{/if}
-							</small>
-						{/if}
-						<small id="classNameHelpMessage">{lang}wcf.acp.cronjob.className.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="descriptionDiv">
-					<dt><label for="description">{lang}wcf.acp.cronjob.description{/lang}</label></dt>
-					<dd>
-						<input type="text" id="description" name="description" value="{$description}" class="long" />
-						<small id="descriptionHelpMessage">{lang}wcf.acp.cronjob.description.description{/lang}</small>
-					</dd>
-				</dl>
-			</fieldset>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.cronjob.edit.data{/lang}</legend>
 			
-			<fieldset>
-				<legend>{lang}wcf.acp.cronjob.edit.timing{/lang}</legend>
-				
-				<dl id="startMinuteDiv"{if $errorField == 'startMinute'} class="formError"{/if}>
-					<dt><label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label></dt>
-					<dd>
-						<input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short" />
-						{if $errorField == 'startMinute'}
-							<small class="innerError">
-								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</small>
-						{/if}
-						<small id="startMinuteHelpMessage">{lang}wcf.acp.cronjob.startMinute.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="startHourDiv"{if $errorField == 'startHour'} class="formError"{/if}>
-					<dt><label for="startHour">{lang}wcf.acp.cronjob.startHour{/lang}</label></dt>
-					<dd>
-						<input type="text" id="startHour" name="startHour" value="{$startHour}" class="short" />
-						{if $errorField == 'startHour'}
-							<small class="innerError">
-								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</small>
-						{/if}
-						<small id="startHourHelpMessage">{lang}wcf.acp.cronjob.startHour.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="startDomDiv"{if $errorField == 'startDom'} class="formError"{/if}>
-					<dt><label for="startDom">{lang}wcf.acp.cronjob.startDom{/lang}</label></dt>
-					<dd>
-						<input type="text" id="startDom" name="startDom" value="{$startDom}" class="short" />
-						{if $errorField == 'startDom'}
-							<small class="innerError">
-								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</small>
-						{/if}
-						<small id="startDomHelpMessage">{lang}wcf.acp.cronjob.startDom.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="startMonthDiv"{if $errorField == 'startMonth'} class="formError"{/if}>
-					<dt><label for="startMonth">{lang}wcf.acp.cronjob.startMonth{/lang}</label></dt>
-					<dd>
-						<input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short" />
-						{if $errorField == 'startMonth'}
-							<small class="innerError">
-								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</small>
-						{/if}
-						<small id="startMonthHelpMessage">{lang}wcf.acp.cronjob.startMonth.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="startDowDiv"{if $errorField == 'startDow'} class="formError"{/if}>
-					<dt><label for="startDow">{lang}wcf.acp.cronjob.startDow{/lang}</label></dt>
-					<dd>
-						<input type="text" id="startDow" name="startDow" value="{$startDow}" class="short" />
-						{if $errorField == 'startDow'}
-							<small class="innerError">
-								{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
-							</small>
-						{/if}
-						<small id="startDowHelpMessage">{lang}wcf.acp.cronjob.startDow.description{/lang}</small>
-					</dd>
-				</dl>
-			</fieldset>
+			<dl id="classNameDiv"{if $errorField == 'className'} class="formError"{/if}>
+				<dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
+				<dd class="formField">
+					<input type="text" id="className" name="className" value="{$className}" class="long" />
+					{if $errorField == 'className'}
+						<small class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.acp.cronjob.error.empty{/lang}{/if}
+							{if $errorType == 'doesNotExist'}{lang}wcf.acp.cronjob.error.doesNotExist{/lang}{/if}
+						</small>
+					{/if}
+					<small id="classNameHelpMessage">{lang}wcf.acp.cronjob.className.description{/lang}</small>
+				</dd>
+			</dl>
 			
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-		</div>
+			<dl id="descriptionDiv">
+				<dt><label for="description">{lang}wcf.acp.cronjob.description{/lang}</label></dt>
+				<dd>
+					<input type="text" id="description" name="description" value="{$description}" class="long" />
+					<small id="descriptionHelpMessage">{lang}wcf.acp.cronjob.description.description{/lang}</small>
+				</dd>
+			</dl>
+		</fieldset>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.cronjob.edit.timing{/lang}</legend>
+			
+			<dl id="startMinuteDiv"{if $errorField == 'startMinute'} class="formError"{/if}>
+				<dt><label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label></dt>
+				<dd>
+					<input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short" />
+					{if $errorField == 'startMinute'}
+						<small class="innerError">
+							{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+						</small>
+					{/if}
+					<small id="startMinuteHelpMessage">{lang}wcf.acp.cronjob.startMinute.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="startHourDiv"{if $errorField == 'startHour'} class="formError"{/if}>
+				<dt><label for="startHour">{lang}wcf.acp.cronjob.startHour{/lang}</label></dt>
+				<dd>
+					<input type="text" id="startHour" name="startHour" value="{$startHour}" class="short" />
+					{if $errorField == 'startHour'}
+						<small class="innerError">
+							{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+						</small>
+					{/if}
+					<small id="startHourHelpMessage">{lang}wcf.acp.cronjob.startHour.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="startDomDiv"{if $errorField == 'startDom'} class="formError"{/if}>
+				<dt><label for="startDom">{lang}wcf.acp.cronjob.startDom{/lang}</label></dt>
+				<dd>
+					<input type="text" id="startDom" name="startDom" value="{$startDom}" class="short" />
+					{if $errorField == 'startDom'}
+						<small class="innerError">
+							{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+						</small>
+					{/if}
+					<small id="startDomHelpMessage">{lang}wcf.acp.cronjob.startDom.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="startMonthDiv"{if $errorField == 'startMonth'} class="formError"{/if}>
+				<dt><label for="startMonth">{lang}wcf.acp.cronjob.startMonth{/lang}</label></dt>
+				<dd>
+					<input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short" />
+					{if $errorField == 'startMonth'}
+						<small class="innerError">
+							{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+						</small>
+					{/if}
+					<small id="startMonthHelpMessage">{lang}wcf.acp.cronjob.startMonth.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="startDowDiv"{if $errorField == 'startDow'} class="formError"{/if}>
+				<dt><label for="startDow">{lang}wcf.acp.cronjob.startDow{/lang}</label></dt>
+				<dd>
+					<input type="text" id="startDow" name="startDow" value="{$startDow}" class="short" />
+					{if $errorField == 'startDow'}
+						<small class="innerError">
+							{if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
+						</small>
+					{/if}
+					<small id="startDowHelpMessage">{lang}wcf.acp.cronjob.startDow.description{/lang}</small>
+				</dd>
+			</dl>
+		</fieldset>
+		
+		{if $additionalFields|isset}{@$additionalFields}{/if}
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 8ab9f527fc..9d282af66f 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -57,6 +57,7 @@
 		<hgroup>
 			<h1>{lang}wcf.acp.cronjob.list.count{/lang} <span class="badge" title="{lang}wcf.acp.cronjob.list.count{/lang}">{#$items}</span></h1>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr>
@@ -72,6 +73,7 @@
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$cronjobs item=cronjob}
 				<tr class="cronjobRow">
@@ -126,6 +128,7 @@
 			{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 	
 	<div class="contentFooter">
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 75d4061591..665b7ff502 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -20,6 +20,7 @@
 			<hgroup>
 				<h1>{lang}wcf.acp.cronjob.log.data{/lang}</h1>
 			</hgroup>
+			
 			<table>
 				<thead>
 					<tr>
@@ -31,6 +32,7 @@
 						{if $additionalColumns|isset}{@$additionalColumns}{/if}
 					</tr>
 				</thead>
+				
 				<tbody>
 				{content}
 					{foreach from=$cronjobLogs item=cronjobLog}
@@ -55,6 +57,7 @@
 				{/content}
 				</tbody>
 			</table>
+			
 		</div>
 		
 		<div class="formSubmit">
@@ -68,9 +71,7 @@
 	</div>
 {hascontentelse}
 	<div class="border content">
-		<div class="container-1">
-			<p class="info">{lang}wcf.acp.cronjob.log.noEntries{/lang}</p>
-		</div>
+		<p class="info">{lang}wcf.acp.cronjob.log.noEntries{/lang}</p>
 	</div>
 {/hascontent}
 
diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index 5486696bf1..9a6aa4c392 100644
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -13,27 +13,26 @@
 
 <form method="post" action="index.php?form=MasterPassword">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.masterPassword.enter{/lang}</legend>
-			
-				<dl id="masterPasswordDiv"{if $errorField == 'masterPassword'} class="formError"{/if}>
-					<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
-					<dd class="formField">
-						<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
-						{if $errorField == 'masterPassword'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								{if $errorType == 'invalid'}{lang}wcf.acp.masterPassword.error.invalid{/lang}{/if}
-							</small>
-						{/if}
-						<small id="masterPasswordHelpMessage">{lang}wcf.acp.masterPassword.enter.description{/lang}</small>
-					</dd>
-				</dl>
-			</fieldset>
-			
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-		</div>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.masterPassword.enter{/lang}</legend>
+		
+			<dl id="masterPasswordDiv"{if $errorField == 'masterPassword'} class="formError"{/if}>
+				<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
+				<dd class="formField">
+					<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
+					{if $errorField == 'masterPassword'}
+						<small class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							{if $errorType == 'invalid'}{lang}wcf.acp.masterPassword.error.invalid{/lang}{/if}
+						</small>
+					{/if}
+					<small id="masterPasswordHelpMessage">{lang}wcf.acp.masterPassword.enter.description{/lang}</small>
+				</dd>
+			</dl>
+		</fieldset>
+		
+		{if $additionalFields|isset}{@$additionalFields}{/if}
 	</div>
 
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index a5e2184ea2..0442ae1fa5 100644
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -25,48 +25,47 @@
 
 <form method="post" action="index.php?form=MasterPasswordInit">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.masterPassword.init{/lang}</legend>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.masterPassword.init{/lang}</legend>
+		
+			<dl id="masterPasswordDiv"{if $errorField == 'masterPassword'} class="formError{/if}">
+				<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
+				<dd>
+					<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
+					{if $errorField == 'masterPassword'}
+						<small class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							{if $errorType == 'notSecure'}{lang}wcf.acp.masterPassword.error.notSecure{/lang}{/if}
+						</small>
+					{/if}
+					<small id="masterPasswordHelpMessage">{lang}wcf.acp.masterPassword.init.description{/lang}</small>
+				</dd>
+			</dl>
 			
-				<dl id="masterPasswordDiv"{if $errorField == 'masterPassword'} class="formError{/if}">
-					<dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
-					<dd>
-						<input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
-						{if $errorField == 'masterPassword'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								{if $errorType == 'notSecure'}{lang}wcf.acp.masterPassword.error.notSecure{/lang}{/if}
-							</small>
-						{/if}
-						<small id="masterPasswordHelpMessage">{lang}wcf.acp.masterPassword.init.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
-					<dt><label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label></dt>
-					<dd>
-						<input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
-						{if $errorField == 'confirmMasterPassword'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								{if $errorType == 'notEqual'}{lang}wcf.acp.masterPassword.error.notEqual{/lang}{/if}
-							</small>
-						{/if}
-					</dd>
-				</dl>
-				
-				<dl>
-					<dt><label for="exampleMasterPassword">{lang}wcf.acp.masterPassword.example{/lang}</label></dt>
-					<dd>
-						<p><a href="#" id="setPassword" title="{lang}wcf.acp.masterPassword.example.set{/lang}">{@$exampleMasterPassword}</a></p>
-						<input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}" />
-					</dd>
-				</dl>
-			</fieldset>
+			<dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
+				<dt><label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label></dt>
+				<dd>
+					<input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
+					{if $errorField == 'confirmMasterPassword'}
+						<small class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							{if $errorType == 'notEqual'}{lang}wcf.acp.masterPassword.error.notEqual{/lang}{/if}
+						</small>
+					{/if}
+				</dd>
+			</dl>
 			
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-		</div>
+			<dl>
+				<dt><label for="exampleMasterPassword">{lang}wcf.acp.masterPassword.example{/lang}</label></dt>
+				<dd>
+					<p><a href="#" id="setPassword" title="{lang}wcf.acp.masterPassword.example.set{/lang}">{@$exampleMasterPassword}</a></p>
+					<input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}" />
+				</dd>
+			</dl>
+		</fieldset>
+		
+		{if $additionalFields|isset}{@$additionalFields}{/if}
 	</div>
 
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index 41ca027bba..a6bed80f45 100644
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -37,30 +37,28 @@
 		
 		{foreach from=$optionTree item=categoryLevel1}
 			<div class="border tabMenuContent hidden" id="{@$categoryLevel1[object]->categoryName}">
-				<div class="container-1">
-					<hgroup class="subHeading">
-						<h1>{lang}wcf.acp.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h1>
-						<h2>{lang}wcf.acp.option.category.{$categoryLevel1[object]->categoryName}.description{/lang}</h2>
-					</hgroup>
-					
-					{if $categoryLevel1[options]|count}
+				<hgroup class="subHeading">
+					<h1>{lang}wcf.acp.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h1>
+					<h2>{lang}wcf.acp.option.category.{$categoryLevel1[object]->categoryName}.description{/lang}</h2>
+				</hgroup>
+				
+				{if $categoryLevel1[options]|count}
+					<fieldset>
+						<legend>{lang}wcf.acp.option.category.{$categoryLevel1[object]->categoryName}{/lang}</legend>
+						{include file='optionFieldList' options=$categoryLevel1[options] langPrefix='wcf.acp.option.'}
+					</fieldset>
+				{/if}
+				
+				{if $categoryLevel1[categories]|count}
+					{foreach from=$categoryLevel1[categories] item=categoryLevel2}
 						<fieldset>
-							<legend>{lang}wcf.acp.option.category.{$categoryLevel1[object]->categoryName}{/lang}</legend>
-							{include file='optionFieldList' options=$categoryLevel1[options] langPrefix='wcf.acp.option.'}
+							<legend>{lang}wcf.acp.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
+							<p class="description">{lang}wcf.acp.option.category.{$categoryLevel2[object]->categoryName}.description{/lang}</p>
+							
+							{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.option.'}
 						</fieldset>
-					{/if}
-					
-					{if $categoryLevel1[categories]|count}
-						{foreach from=$categoryLevel1[categories] item=categoryLevel2}
-							<fieldset>
-								<legend>{lang}wcf.acp.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
-								<p class="description">{lang}wcf.acp.option.category.{$categoryLevel2[object]->categoryName}.description{/lang}</p>
-								
-								{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.option.'}
-							</fieldset>
-						{/foreach}
-					{/if}
-				</div>
+					{/foreach}
+				{/if}
 			</div>
 		{/foreach}
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index 700a15f3f2..1d206772af 100644
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -17,28 +17,27 @@
 
 <form method="post" action="index.php?form=OptionImport" enctype="multipart/form-data">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.option.import{/lang}</legend>
-			
-				<dl id="optionImportDiv"{if $errorField == 'optionImport'} class="formError"{/if}>
-					<dt><label for="optionImport">{lang}wcf.acp.option.import.upload{/lang}</label></dt>
-					<dd>
-						<input type="file" id="optionImport" name="optionImport" value="" />
-						{if $errorField == 'optionImport'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								{if $errorType == 'importFailed'}{lang}wcf.acp.option.import.error.importFailed{/lang}{/if}
-								{if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if}
-							</small>
-						{/if}
-						<small id="optionImportHelpMessage">{lang}wcf.acp.option.import.upload.description{/lang}</small>
-					</dd>
-				</dl>
-			</fieldset>
-			
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-		</div>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.option.import{/lang}</legend>
+		
+			<dl id="optionImportDiv"{if $errorField == 'optionImport'} class="formError"{/if}>
+				<dt><label for="optionImport">{lang}wcf.acp.option.import.upload{/lang}</label></dt>
+				<dd>
+					<input type="file" id="optionImport" name="optionImport" value="" />
+					{if $errorField == 'optionImport'}
+						<small class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							{if $errorType == 'importFailed'}{lang}wcf.acp.option.import.error.importFailed{/lang}{/if}
+							{if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if}
+						</small>
+					{/if}
+					<small id="optionImportHelpMessage">{lang}wcf.acp.option.import.upload.description{/lang}</small>
+				</dd>
+			</dl>
+		</fieldset>
+		
+		{if $additionalFields|isset}{@$additionalFields}{/if}
 	</div>
 
 	<div class="formSubmit">
@@ -49,22 +48,18 @@
 </form>
 
 <div class="border content">
-	<div class="container-1">
-		<fieldset>
-			<legend>{lang}wcf.acp.option.export{/lang}</legend>
-		
-			<dl id="optionExportDiv">
-				<dt><label><!-- ToDo: Download label --></label></dt>
-				<dd><p><a href="index.php?action=OptionExport{@SID_ARG_2ND}" id="optionExport" class="largeButton">{lang}wcf.acp.option.export.download{/lang}</a></p></dd>
-				<small>{lang}wcf.acp.option.export.download.description{/lang}</small>
-			</dl>
-			<script type="text/javascript">//<![CDATA[
-				inlineHelp.register('optionExport');
-			//]]></script>
-		</fieldset>
-		
-		{if $additionalFields|isset}{@$additionalFields}{/if}
-	</div>
+	
+	<fieldset>
+		<legend>{lang}wcf.acp.option.export{/lang}</legend>
+	
+		<dl id="optionExportDiv">
+			<dt><label><!-- ToDo: Download label --></label></dt>
+			<dd><p><a href="index.php?action=OptionExport{@SID_ARG_2ND}" id="optionExport" class="largeButton">{lang}wcf.acp.option.export.download{/lang}</a></p></dd>
+			<small>{lang}wcf.acp.option.export.download.description{/lang}</small>
+		</dl>
+	</fieldset>
+	
+	{if $additionalFields|isset}{@$additionalFields}{/if}
 </div>
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/optionTypeText.tpl b/wcfsetup/install/files/acp/templates/optionTypeText.tpl
index 7052b00487..f1e93baec2 100644
--- a/wcfsetup/install/files/acp/templates/optionTypeText.tpl
+++ b/wcfsetup/install/files/acp/templates/optionTypeText.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" class="long" value="{$value}" />
\ No newline at end of file
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}" class="long" />
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
index 663b71539c..9c7ab1c33f 100644
--- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
@@ -34,20 +34,20 @@
 	
 	{if !$availableUpdates|count}
 		<div class="border content">
-			<div class="container-1">
-				<p class="info">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
-			</div>
+			<p class="info">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
 		</div>
 	{else}
 		{foreach from=$availableUpdates item=availableUpdate}
 			<article class="message content"{if $availableUpdate.version.updateType == 'security'} style="border-color: #c00"{/if}>
 				<div class="messageInner container-{cycle name='styles' values='1,2'}">
-					<h1 class="subHeading">
-						<label>
-							<input type="checkbox" name="updates[{@$availableUpdate.packageID}]" onclick="enableFormElements(document.getElementById('version-{@$availableUpdate.packageID}Div'), this.checked)" value="{$availableUpdate.version.packageVersion}" />
-							{$availableUpdate.packageName}{if $availableUpdate.instanceNo > 1} (#{#$availableUpdate.instanceNo}){/if}
-						</label>
-					</h1>
+					<hgroup class="subHeading">
+						<h1>
+							<label>
+								<input type="checkbox" name="updates[{@$availableUpdate.packageID}]" onclick="enableFormElements(document.getElementById('version-{@$availableUpdate.packageID}Div'), this.checked)" value="{$availableUpdate.version.packageVersion}" />
+								{$availableUpdate.packageName}{if $availableUpdate.instanceNo > 1} (#{#$availableUpdate.instanceNo}){/if}
+							</label>
+						</h1>
+					<hgroup>
 
 					<div class="messageBody">
 						<dl>
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 9a8f5f9c33..a556182012 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -81,6 +81,7 @@
 			<h1>{lang}wcf.acp.package.install.updatableInstances{/lang}</h1>
 			<h2>{lang}wcf.acp.package.install.updatableInstances.description{/lang}</h2>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr class="tableHead">
@@ -88,6 +89,7 @@
 					<th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$updatableInstances item=$package}
 				<tr>
@@ -101,34 +103,34 @@
 {/if}
 
 {if $requiredPackages|count > 0}
-	<div class="border titleBarPanel">
-		<div class="containerHead">
-			<h3>{lang}wcf.acp.package.view.requiredPackages{/lang}</h3>
-			<p class="smallFont light">{lang}wcf.acp.package.view.requiredPackages.description{/lang}</p>
-		</div>
-	</div>
-	<div class="border borderMarginRemove">
-		<table class="tableList">
-			<thead>
-				<tr class="tableHead">
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
-					<th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
-				</tr>
-			</thead>
-			<tbody>
-			{foreach from=$requiredPackages item=$package}
-				<tr>
-					<td class="columnText"><p>{lang}wcf.acp.package.install.packageName{/lang}</p></td>
-					<td class="columnText"><p>{if $package.minversion|isset}{$package.minversion}{/if}</p></td>
-				</tr>
-			{/foreach}
-			</tbody>
-		</table>
+	<div class="border boxTitle">
+		<hgroup>
+			<h1>{lang}wcf.acp.package.view.requiredPackages{/lang}</h1>
+			<h2>{lang}wcf.acp.package.view.requiredPackages.description{/lang}</h2>
+		</hgroup>
 	</div>
+	
+	<table>
+		<thead>
+			<tr>
+				<th><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
+				<th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
+			</tr>
+		</thead>
+		
+		<tbody>
+		{foreach from=$requiredPackages item=$package}
+			<tr>
+				<td class="columnText"><p>{lang}wcf.acp.package.install.packageName{/lang}</p></td>
+				<td class="columnText"><p>{if $package.minversion|isset}{$package.minversion}{/if}</p></td>
+			</tr>
+		{/foreach}
+		</tbody>
+	</table>
 {/if}
 
 <div class="formSubmit">
-	<input type="button" onclick="document.location.href=fixURL('index.php?page=Package&amp;action={@$action}&amp;queueID={@$queueID}&amp;step=cancel{@SID_ARG_2ND}')" accesskey="c" value="{lang}wcf.global.button.back{/lang}" />
+	<input type="button" onclick="document.location.href=fixURL('index.php?page=Package&amp;action={@$action}&amp;queueID={@$queueID}&amp;step=cancel{@SID_ARG_2ND}')" value="{lang}wcf.global.button.back{/lang}" accesskey="c" />
 	{if $missingPackages == 0 && $excludingPackages|count == 0 && $excludedPackages|count == 0}
 		<input type="button" id="submitButton" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
 	{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index e97e2474d3..475e7e515e 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -36,6 +36,7 @@
 		<hgroup>
 			<h1><a href="#">{lang}wcf.acp.package.list{/lang} <span class="badge" title="{lang}wcf.acp.package.list.count{/lang}">{#$items}</span></a></h1>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr>
@@ -48,6 +49,7 @@
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 				{foreach from=$packages item=$package}
 					<tr class="packageRow">
@@ -87,6 +89,7 @@
 				{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 27b4a4ac9f..13f23d49d7 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -29,49 +29,48 @@
 
 <form method="post" action="index.php?form=PackageStartInstall" enctype="multipart/form-data">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.package.startInstall.source{/lang}</legend>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.package.startInstall.source{/lang}</legend>
+		
+			<dl id="uploadPackageDiv"{if $errorField == 'uploadPackage'} class="formError"{/if}>
+				<dt><label for="uploadPackage">{lang}wcf.acp.package.startInstall.source.upload{/lang}</label></dt>
+				<dd>
+					<input type="file" id="uploadPackage" name="uploadPackage" value="" />
+					{if $errorField == 'uploadPackage'}
+						<small class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							{if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if}
+							{if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if}
+							{if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if}
+							{if $errorType == 'uploadFailed'}{lang}wcf.acp.package.startInstall.error.uploadFailed{/lang}{/if}
+							{if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if}
+							{if $errorType == 'phpRequirements'}<pre>{$phpRequirements|print_r}</pre>{/if}
+						</small>
+					{/if}
+					<small id="uploadPackageHelpMessage">{lang}wcf.acp.package.startInstall.source.upload.description{/lang}</small>
+				</dd>
+			</dl>
 			
-				<dl id="uploadPackageDiv"{if $errorField == 'uploadPackage'} class="formError"{/if}>
-					<dt><label for="uploadPackage">{lang}wcf.acp.package.startInstall.source.upload{/lang}</label></dt>
-					<dd>
-						<input type="file" id="uploadPackage" name="uploadPackage" value="" />
-						{if $errorField == 'uploadPackage'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								{if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if}
-								{if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if}
-								{if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if}
-								{if $errorType == 'uploadFailed'}{lang}wcf.acp.package.startInstall.error.uploadFailed{/lang}{/if}
-								{if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if}
-								{if $errorType == 'phpRequirements'}<pre>{$phpRequirements|print_r}</pre>{/if}
-							</small>
-						{/if}
-						<small id="uploadPackageHelpMessage">{lang}wcf.acp.package.startInstall.source.upload.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="downloadPackageDiv"{if $errorField == 'downloadPackage'} class="formError"{/if}>
-					<dt><label for="downloadPackage">{lang}wcf.acp.package.startInstall.source.download{/lang}</label></dt>
-					<dd>
-						<input type="text" id="downloadPackage" name="downloadPackage" value="" class="long" />
-						{if $errorField == 'downloadPackage'}
-							<small class="innerError">
-								{if $errorType == 'notFound'}{lang}wcf.acp.package.startInstall.error.notFound{/lang}{/if}
-								{if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if}
-								{if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if}
-								{if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if}
-								{if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if}
-							</small>
-						{/if}
-						<small id="downloadPackageHelpMessage">{lang}wcf.acp.package.startInstall.source.download.description{/lang}</small>
-					</dd>
-				</dl>
-			</fieldset>
-			
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-		</div>
+			<dl id="downloadPackageDiv"{if $errorField == 'downloadPackage'} class="formError"{/if}>
+				<dt><label for="downloadPackage">{lang}wcf.acp.package.startInstall.source.download{/lang}</label></dt>
+				<dd>
+					<input type="text" id="downloadPackage" name="downloadPackage" value="" class="long" />
+					{if $errorField == 'downloadPackage'}
+						<small class="innerError">
+							{if $errorType == 'notFound'}{lang}wcf.acp.package.startInstall.error.notFound{/lang}{/if}
+							{if $errorType == 'noValidPackage'}{lang}wcf.acp.package.startInstall.error.noValidPackage{/lang}{/if}
+							{if $errorType == 'noValidUpdate'}{lang}wcf.acp.package.startInstall.error.noValidUpdate{/lang}{/if}
+							{if $errorType == 'noValidInstall'}{lang}wcf.acp.package.startInstall.error.noValidInstall{/lang}{/if}
+							{if $errorType == 'uniqueAlreadyInstalled'}{lang}wcf.acp.package.startInstall.error.uniqueAlreadyInstalled{/lang}{/if}
+						</small>
+					{/if}
+					<small id="downloadPackageHelpMessage">{lang}wcf.acp.package.startInstall.source.download.description{/lang}</small>
+				</dd>
+			</dl>
+		</fieldset>
+		
+		{if $additionalFields|isset}{@$additionalFields}{/if}
 	</div>
 
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index b96f756509..953c7d9a22 100644
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -73,6 +73,7 @@
 		<hgroup>
 			<h1>{lang}wcf.acp.package.view.dependentPackages{/lang}</h1>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr>
@@ -85,6 +86,7 @@
 					{if $additionalColumns|isset}{@$additionalColumns}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$dependentPackages item=package}
 				<tr>
@@ -122,6 +124,7 @@
 			{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 6e08a94712..56282b41b1 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -29,23 +29,23 @@
 {if $packageInstallationStack|count}
 	<form method="post" action="index.php?form=PackageUpdate">
 		<div class="border content">
-			<div class="container-1">
-				<fieldset>
-					<legend>{lang}wcf.acp.packageUpdate.updates{/lang}</legend>
-					
-					<ul>
-						{foreach from=$packageInstallationStack item=package}
-							<li>
-								{if $package.action == 'install'}
-									{lang}wcf.acp.packageUpdate.install{/lang}
-								{else}
-									{lang}wcf.acp.packageUpdate.update{/lang}
-								{/if}
-							</li>
-						{/foreach}
-					</ul>
-				</fieldset>
-			</div>
+			
+			<fieldset>
+				<legend>{lang}wcf.acp.packageUpdate.updates{/lang}</legend>
+				
+				<ul>
+					{foreach from=$packageInstallationStack item=package}
+						<li>
+							{if $package.action == 'install'}
+								{lang}wcf.acp.packageUpdate.install{/lang}
+							{else}
+								{lang}wcf.acp.packageUpdate.update{/lang}
+							{/if}
+						</li>
+					{/foreach}
+				</ul>
+			</fieldset>
+			
 		</div>
 		
 		<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index 905f672fdc..6486042e30 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -13,61 +13,60 @@
 
 <form method="{$requestMethod}" action="index.php{if $getParameters}?{@$getParameters}{/if}">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.packageUpdate.auth.data{/lang}</legend>
-				
-				<dl>
-					<dt>{lang}wcf.acp.packageUpdate.auth.url{/lang}</dt>
-					<dd>{$url}</dd>
-				</dl>
-				{if $realm}
-					<dl>
-						<dt>{lang}wcf.acp.packageUpdate.auth.realm{/lang}</dt>
-						<dd>{$realm}</dd>
-					</dl>
-				{/if}
-				{if $message}
-					<dl>
-						<dt>{lang}wcf.acp.packageUpdate.auth.message{/lang}</dt>
-						<dd>{@$message}</dd>
-					</dl>
-				{/if}
-			</fieldset>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.packageUpdate.auth.data{/lang}</legend>
 			
-			<fieldset>
-				<legend>{lang}wcf.acp.packageUpdate.auth.input{/lang}</legend>
-				
-				<dl id="loginUsernameDiv"{if $errorField == 'loginPassword'} class="formError"{/if}>
-					<dt><label for="loginUsername">{lang}wcf.acp.packageUpdate.auth.loginUsername{/lang}</label></dt>
-					<dd>
-						<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="long" />
-						<small id="loginUsernameHelpMessage"><p>{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}</p></small>
-					</dd>
-				</dl>
-				
-				<dl id="loginPasswordDiv"{if $errorField == 'loginPassword'} class="formError"{/if}>
-					<dt><label for="loginPassword">{lang}wcf.acp.packageUpdate.auth.loginPassword{/lang}</label></dt>
-					<dd>
-						<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" />
-						{if $errorField == 'loginPassword'}
-							<small class="innerError">
-								{if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if}
-							</small>
-						{/if}
-						<small id="loginPasswordHelpMessage">{lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang}</small>
-					</dd>
+			<dl>
+				<dt>{lang}wcf.acp.packageUpdate.auth.url{/lang}</dt>
+				<dd>{$url}</dd>
+			</dl>
+			{if $realm}
+				<dl>
+					<dt>{lang}wcf.acp.packageUpdate.auth.realm{/lang}</dt>
+					<dd>{$realm}</dd>
 				</dl>
-				
-				<dl id="saveAuthDataDiv">
-					<dt>
-						<label><input type="checkbox" id="saveAuthData" name="saveAuthData" value="1" {if $saveAuthData == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.auth.save{/lang}</label>
-					</dt>
-					<dd id="saveAuthDataHelpMessage"><small>{lang}wcf.acp.packageUpdate.auth.save.description{/lang}</small></dd>
+			{/if}
+			{if $message}
+				<dl>
+					<dt>{lang}wcf.acp.packageUpdate.auth.message{/lang}</dt>
+					<dd>{@$message}</dd>
 				</dl>
-			</fieldset>
+			{/if}
+		</fieldset>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.packageUpdate.auth.input{/lang}</legend>
+			
+			<dl id="loginUsernameDiv"{if $errorField == 'loginPassword'} class="formError"{/if}>
+				<dt><label for="loginUsername">{lang}wcf.acp.packageUpdate.auth.loginUsername{/lang}</label></dt>
+				<dd>
+					<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="long" />
+					<small id="loginUsernameHelpMessage"><p>{lang}wcf.acp.packageUpdate.auth.loginUsername.description{/lang}</p></small>
+				</dd>
+			</dl>
+			
+			<dl id="loginPasswordDiv"{if $errorField == 'loginPassword'} class="formError"{/if}>
+				<dt><label for="loginPassword">{lang}wcf.acp.packageUpdate.auth.loginPassword{/lang}</label></dt>
+				<dd>
+					<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" />
+					{if $errorField == 'loginPassword'}
+						<small class="innerError">
+							{if $errorType == 'invalid'}{lang}wcf.acp.packageUpdate.auth.error{/lang}{/if}
+						</small>
+					{/if}
+					<small id="loginPasswordHelpMessage">{lang}wcf.acp.packageUpdate.auth.loginPassword.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="saveAuthDataDiv">
+				<dt>
+					<label><input type="checkbox" id="saveAuthData" name="saveAuthData" value="1" {if $saveAuthData == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.auth.save{/lang}</label>
+				</dt>
+				<dd id="saveAuthDataHelpMessage"><small>{lang}wcf.acp.packageUpdate.auth.save.description{/lang}</small></dd>
+			</dl>
+		</fieldset>
 			
-		</div>
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index 1599928fbc..f0399b011b 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -53,69 +53,68 @@
 {else}
 	<form method="post" action="index.php?form=PackageUpdateSearch">
 		<div class="border content">
-			<div class="container-1">
 			
-				<fieldset>
-					<legend>{lang}wcf.acp.packageUpdate.search.server{/lang}</legend>
-					
-					<dl>
-						<dt></dt>
-						<dd>
-							<label><input type="checkbox" name="checkUncheck" value="" /> {lang}wcf.acp.packageUpdate.search.server.all{/lang}</label> 
-						</dd>
-					</dl>
-					
-					<dl id="updateServerList">
-						<dt></dt>
-						{foreach from=$updateServers item=updateServer}
-							<dd>
-								<label><input type="checkbox" name="packageUpdateServerIDs[]" value="{@$updateServer->packageUpdateServerID}" {if $updateServer->packageUpdateServerID|in_array:$packageUpdateServerIDs}checked="checked" {/if}/> {$updateServer->serverURL}</label>
-							</dd>
-						{/foreach}
-					</dl>
-				</fieldset>
+			<fieldset>
+				<legend>{lang}wcf.acp.packageUpdate.search.server{/lang}</legend>
 				
-				<fieldset>
-					<legend>{lang}wcf.acp.packageUpdate.search.conditions{/lang}</legend>
-					
-					<dl>
-						<dt><label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label></dt>
-						<dd>
-							<input type="text" id="packageName" name="packageName" value="{$packageName}" class="long" />
-						</dd>
-						<dd>
-							<label><input type="checkbox" name="searchDescription" value="1" {if $searchDescription == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}</label>
-						</dd>
-					</dl>
-					
-					<dl>
-						<dt><label for="author">{lang}wcf.acp.packageUpdate.search.author{/lang}</label></dt>
-						<dd>
-							<input type="text" id="author" name="author" value="{$author}" class="medium" />
-						</dd>
-					</dl>
-					
-					<dl>
-						<dt>{lang}wcf.acp.packageUpdate.search.type{/lang}</dt>
-						<dd>
-							<label><input type="checkbox" name="standalone" value="1" {if $standalone == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.standalone{/lang}</label> 
-						</dd>
-						<dd>
-							<label><input type="checkbox" name="plugin" value="1" {if $plugin == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.plugin{/lang}</label> 
-						</dd>
-						<dd>
-							<label><input type="checkbox" name="other" value="1" {if $other == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.other{/lang}</label> 
-						</dd>
-					</dl>
-					
-					<dl>
-						<dt></dt>
+				<dl>
+					<dt></dt>
+					<dd>
+						<label><input type="checkbox" name="checkUncheck" value="" /> {lang}wcf.acp.packageUpdate.search.server.all{/lang}</label> 
+					</dd>
+				</dl>
+				
+				<dl id="updateServerList">
+					<dt></dt>
+					{foreach from=$updateServers item=updateServer}
 						<dd>
-							<label><input type="checkbox" name="ignoreUniques" value="1" {if $ignoreUniques == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.ignoreUniques{/lang}</label>
+							<label><input type="checkbox" name="packageUpdateServerIDs[]" value="{@$updateServer->packageUpdateServerID}" {if $updateServer->packageUpdateServerID|in_array:$packageUpdateServerIDs}checked="checked" {/if}/> {$updateServer->serverURL}</label>
 						</dd>
-					</dl>
-				</fieldset>
-			</div>
+					{/foreach}
+				</dl>
+			</fieldset>
+			
+			<fieldset>
+				<legend>{lang}wcf.acp.packageUpdate.search.conditions{/lang}</legend>
+				
+				<dl>
+					<dt><label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label></dt>
+					<dd>
+						<input type="text" id="packageName" name="packageName" value="{$packageName}" class="long" />
+					</dd>
+					<dd>
+						<label><input type="checkbox" name="searchDescription" value="1" {if $searchDescription == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}</label>
+					</dd>
+				</dl>
+				
+				<dl>
+					<dt><label for="author">{lang}wcf.acp.packageUpdate.search.author{/lang}</label></dt>
+					<dd>
+						<input type="text" id="author" name="author" value="{$author}" class="medium" />
+					</dd>
+				</dl>
+				
+				<dl>
+					<dt>{lang}wcf.acp.packageUpdate.search.type{/lang}</dt>
+					<dd>
+						<label><input type="checkbox" name="standalone" value="1" {if $standalone == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.standalone{/lang}</label> 
+					</dd>
+					<dd>
+						<label><input type="checkbox" name="plugin" value="1" {if $plugin == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.plugin{/lang}</label> 
+					</dd>
+					<dd>
+						<label><input type="checkbox" name="other" value="1" {if $other == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.other{/lang}</label> 
+					</dd>
+				</dl>
+				
+				<dl>
+					<dt></dt>
+					<dd>
+						<label><input type="checkbox" name="ignoreUniques" value="1" {if $ignoreUniques == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.ignoreUniques{/lang}</label>
+					</dd>
+				</dl>
+			</fieldset>
+			
 		</div>
 		
 		<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
index d90cc2aac2..bb65b63a6e 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
@@ -17,21 +17,22 @@
 	{foreach from=$packages item=package}
 		<article class="message content">
 			<div class="messageInner container-{cycle name='styles' values='1,2'}">
-				<h3 class="subHeading">
-					{if $package.standalone == 1}
-						<img src="{@RELATIVE_WCF_DIR}icon/packageTypeStandaloneS.png" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" />
-					{elseif $package.plugin != ''}
-						<img src="{@RELATIVE_WCF_DIR}icon/packageTypePluginS.png" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" />
-					{else}
-						<img src="{@RELATIVE_WCF_DIR}icon/packageS.png" alt="" title="{lang}wcf.acp.package.list.other{/lang}" />
-					{/if}
-					{$package.packageName}
-				</h3>
+				<hgroup class="subHeading">
+					<h1>
+						{if $package.standalone == 1}
+							<img src="{@RELATIVE_WCF_DIR}icon/packageTypeStandaloneS.png" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" />
+						{elseif $package.plugin != ''}
+							<img src="{@RELATIVE_WCF_DIR}icon/packageTypePluginS.png" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" />
+						{else}
+							<img src="{@RELATIVE_WCF_DIR}icon/packageS.png" alt="" title="{lang}wcf.acp.package.list.other{/lang}" />
+						{/if}
+						{$package.packageName}
+					</h1>
+				<hgroup>
 
 				<div class="messageBody">
 					<dl>
-						<dt><label for="packageVersion-{$package.package}">{lang}wcf.acp.package.list.version{/lang}</label>
-						</dt>
+						<dt><label for="packageVersion-{$package.package}">{lang}wcf.acp.package.list.version{/lang}</label></dt>
 						<dd>
 							<select id="packageVersion-{$package.package}">
 								{foreach from=$package.packageVersions item=$packageVersion}
@@ -96,8 +97,8 @@
 							</<ul>
   						</div>
 					</fieldset>
+					
 				</div>
-
 				<hr />
 			</div>
 		</article>			
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 36b595757e..05f7d062ec 100644
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -101,6 +101,7 @@
 			<h1><a onclick="openList('requiredPackages')">{lang}wcf.acp.package.view.requiredPackages{/lang}</a></h1>
 			<h2>{lang}wcf.acp.package.view.requiredPackages.description{/lang}</h2>
 		</hgroup>
+		
 		<table id="requiredPackages">
 			<thead>
 				<tr class="tableHead">
@@ -113,6 +114,7 @@
 					{if $additionalColumns|isset}{@$additionalColumns}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$requiredPackages item=$package}
 				<tr>
@@ -179,6 +181,7 @@
 					{if $additionalColumns|isset}{@$additionalColumns}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$dependentPackages item=$package}
 				<tr>
@@ -216,6 +219,7 @@
 			{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 	
 	<script type="text/javascript">
diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
index 3e244fdbbe..366c6f2c59 100644
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -27,44 +27,43 @@
 
 <form method="post" action="index.php?form=UpdateServer{@$action|ucfirst}{if $packageUpdateServerID|isset}&amp;packageUpdateServerID={@$packageUpdateServerID}{/if}">
 	<div class="border content">
-		<div class="container-1">
-	
-			<fieldset>
-				<legend>{lang}wcf.acp.updateServer.data{/lang}</legend>
-				
-				<dl id="serverURLDiv"{if $errorField == 'serverURL'} class="formError"{/if}>
-					<dt><label for="serverURL">{lang}wcf.acp.updateServer.serverURL{/lang}</label></dt>
-					<dd>
-						<input type="text" id="serverURL" name="serverURL" value="{$serverURL}" class="long" />
-						{if $errorField == 'serverURL'}
-							<small class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								{if $errorType == 'notValid'}{lang}wcf.acp.updateServer.serverURL.error.notValid{/lang}{/if}
-							</small>
-						{/if}
-						<small id="serverURLHelpMessage">{lang}wcf.acp.updateServer.serverURL.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="loginUsernameDiv">
-					<dt><label for="loginUsername">{lang}wcf.acp.updateServer.loginUsername{/lang}</label></dt>
-					<dd>
-						<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="long" />
-						<small id="loginUsernameHelpMessage">{lang}wcf.acp.updateServer.loginUsername.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				<dl id="loginPasswordDiv">
-					<dt><label for="loginPassword">{lang}wcf.acp.updateServer.loginPassword{/lang}</label></dt>
-					<dd>
-						<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="long" />
-						<small id="loginPasswordHelpMessage" class="formFieldDesc hidden"><p>{lang}wcf.acp.updateServer.loginPassword.description{/lang}</p></small>
-					</dd>
-				</dl>
-				
-				{if $additionalFields|isset}{@$additionalFields}{/if}
-			</fieldset>
-		</div>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.updateServer.data{/lang}</legend>
+			
+			<dl id="serverURLDiv"{if $errorField == 'serverURL'} class="formError"{/if}>
+				<dt><label for="serverURL">{lang}wcf.acp.updateServer.serverURL{/lang}</label></dt>
+				<dd>
+					<input type="text" id="serverURL" name="serverURL" value="{$serverURL}" class="long" />
+					{if $errorField == 'serverURL'}
+						<small class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							{if $errorType == 'notValid'}{lang}wcf.acp.updateServer.serverURL.error.notValid{/lang}{/if}
+						</small>
+					{/if}
+					<small id="serverURLHelpMessage">{lang}wcf.acp.updateServer.serverURL.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="loginUsernameDiv">
+				<dt><label for="loginUsername">{lang}wcf.acp.updateServer.loginUsername{/lang}</label></dt>
+				<dd>
+					<input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="long" />
+					<small id="loginUsernameHelpMessage">{lang}wcf.acp.updateServer.loginUsername.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="loginPasswordDiv">
+				<dt><label for="loginPassword">{lang}wcf.acp.updateServer.loginPassword{/lang}</label></dt>
+				<dd>
+					<input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="long" />
+					<small id="loginPasswordHelpMessage" class="formFieldDesc hidden"><p>{lang}wcf.acp.updateServer.loginPassword.description{/lang}</p></small>
+				</dd>
+			</dl>
+			
+			{if $additionalFields|isset}{@$additionalFields}{/if}
+		</fieldset>
+		
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index 3a5f326c31..ad578282ba 100644
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -28,15 +28,14 @@
 
 {if !$updateServers|count}
 	<div class="border content">
-		<div class="container-1">
-			<p class="warning">{lang}wcf.acp.updateServer.view.noneAvailable{/lang}</p>
-		</div>
+		<p class="warning">{lang}wcf.acp.updateServer.view.noneAvailable{/lang}</p>
 	</div>
 {else}
 	<div class="border boxTitle">
 		<hgroup>
 			<h1>{lang}wcf.acp.updateServer.list.available{/lang} <span class="badge" title="{lang}wcf.acp.updateServer.list.count{/lang}">{#$items}</span></h1>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr>
@@ -50,6 +49,7 @@
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 				{foreach from=$updateServers item=updateServer}
 					<tr class="updateServerRow">
@@ -72,6 +72,7 @@
 				{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 	
 	<div class="contentFooter">
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 0b947ecbdf..702096bf17 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -81,168 +81,166 @@
 
 <form method="post" action="index.php?form=User{@$action|ucfirst}">
 	<div class="border content">
-		<div class="container-1">
-			<dl{if $errorType.username|isset} class="formError"{/if}>
-				<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+		<dl{if $errorType.username|isset} class="formError"{/if}>
+			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+			<dd>
+				<input type="text" id="username" name="username" value="{$username}" class="medium" />
+				{if $errorType.username|isset}
+					<small class="innerError">
+						{if $errorType.username == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+						{if $errorType.username == 'notValid'}{lang}wcf.user.error.username.notValid{/lang}{/if}
+						{if $errorType.username == 'notUnique'}{lang}wcf.user.error.username.notUnique{/lang}{/if}
+					</small>
+				{/if}
+			</dd>
+		</dl>
+		
+		{if $availableGroups|count}
+			<dl>
+				<dt>
+					<label>{lang}wcf.acp.user.groups{/lang}</label>
+				</dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" class="medium" />
-					{if $errorType.username|isset}
-						<small class="innerError">
-							{if $errorType.username == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-							{if $errorType.username == 'notValid'}{lang}wcf.user.error.username.notValid{/lang}{/if}
-							{if $errorType.username == 'notUnique'}{lang}wcf.user.error.username.notUnique{/lang}{/if}
-						</small>
-					{/if}
+					<fieldset>
+						<legend>{lang}wcf.acp.user.groups{/lang}</legend>
+						
+						<dl>
+							<dd>
+								{htmlCheckboxes options=$availableGroups name=groupIDs selected=$groupIDs}
+							</dd>
+						</dl>
+					</fieldset>
 				</dd>
 			</dl>
-			
-			{if $availableGroups|count}
-				<dl>
-					<dt>
-						<label>{lang}wcf.acp.user.groups{/lang}</label>
-					</dt>
+		{/if}
+		
+		{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
+			<fieldset>
+				<legend>{lang}wcf.user.email{/lang}</legend>
+				
+				<dl{if $errorType.email|isset} class="formError"{/if}>
+					<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+					<dd>	
+						<input type="email" id="email" name="email" value="{$email}" class="medium" />
+						{if $errorType.email|isset}
+							<small class="innerError">
+								{if $errorType.email == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+								{if $errorType.email == 'notValid'}{lang}wcf.user.error.email.notValid{/lang}{/if}
+								{if $errorType.email == 'notUnique'}{lang}wcf.user.error.email.notUnique{/lang}{/if}
+							</small>
+						{/if}
+					</dd>
+				</dl>
+				
+				<dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
+					<dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
 					<dd>
-						<fieldset>
-							<legend>{lang}wcf.acp.user.groups{/lang}</legend>
-							
-							<dl>
-								<dd>
-									{htmlCheckboxes options=$availableGroups name=groupIDs selected=$groupIDs}
-								</dd>
-							</dl>
-						</fieldset>
+						<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium" />
+						{if $errorType.confirmEmail|isset}
+							<small class="innerError">
+								{if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.error.confirmEmail.notEqual{/lang}{/if}
+							</small>
+						{/if}
 					</dd>
 				</dl>
-			{/if}
-			
-			{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-				<fieldset>
-					<legend>{lang}wcf.user.email{/lang}</legend>
-					
-					<dl{if $errorType.email|isset} class="formError"{/if}>
-						<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
-						<dd>	
-							<input type="email" id="email" name="email" value="{$email}" class="medium" />
-							{if $errorType.email|isset}
-								<small class="innerError">
-									{if $errorType.email == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-									{if $errorType.email == 'notValid'}{lang}wcf.user.error.email.notValid{/lang}{/if}
-									{if $errorType.email == 'notUnique'}{lang}wcf.user.error.email.notUnique{/lang}{/if}
-								</small>
-							{/if}
-						</dd>
-					</dl>
-					
-					<dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
-						<dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
-						<dd>
-							<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium" />
-							{if $errorType.confirmEmail|isset}
-								<small class="innerError">
-									{if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.error.confirmEmail.notEqual{/lang}{/if}
-								</small>
-							{/if}
-						</dd>
-					</dl>
-				</fieldset>
-			{/if}
+			</fieldset>
+		{/if}
+		
+		{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditPassword')}
+			<fieldset>
+				<legend>{lang}wcf.user.password{/lang}</legend>
+				
+				<dl{if $errorType.password|isset} class="formError"{/if}>
+					<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+					<dd>
+						<input type="password" id="password" name="password" value="{$password}" class="medium" />
+						{if $errorType.password|isset}
+							<small class="innerError">
+								{if $errorType.password == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							</small>
+						{/if}
+					</dd>
+				</dl>
+				
+				<dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
+					<dt><label for="confirmPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
+					<dd>
+						<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" class="medium" />
+						{if $errorType.confirmPassword|isset}
+							<small class="innerError">
+								{if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.error.confirmPassword.notEqual{/lang}{/if}
+							</small>
+						{/if}
+					</dd>
+				</dl>
+			</fieldset>
+		{/if}
+	
+		{if $additionalFields|isset}{@$additionalFields}{/if}
+		
+		{if $optionTree|count || $additionalTabs|isset}
+			<nav>
+				<div class="tabMenu">
+					<ul>
+						{foreach from=$optionTree item=categoryLevel1}
+							<li id="{@$categoryLevel1[object]->categoryName}"><a onclick="tabMenu.showSubTabMenu('{@$categoryLevel1[object]->categoryName}');"><span>{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</span></a></li>
+						{/foreach}
+						
+						{if $additionalTabs|isset}{@$additionalTabs}{/if}
+					</ul>
+				</div>
+			<nav>
+			<div class="menu">
+				<div class="containerHead"><div> </div></div>
+			</div>
 			
-			{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditPassword')}
-				<fieldset>
-					<legend>{lang}wcf.user.password{/lang}</legend>
-					
-					<dl{if $errorType.password|isset} class="formError"{/if}>
-						<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
-						<dd>
-							<input type="password" id="password" name="password" value="{$password}" class="medium" />
-							{if $errorType.password|isset}
-								<small class="innerError">
-									{if $errorType.password == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								</small>
-							{/if}
-						</dd>
-					</dl>
+			{foreach from=$optionTree item=categoryLevel1}
+				<div id="{@$categoryLevel1[object]->categoryName}-content" class="border tabMenuContent hidden">
+					<hgroup class="subHeading">
+						<h1>{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h1>
+					</hgroup>
 					
-					<dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
-						<dt><label for="confirmPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
-						<dd>
-							<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" class="medium" />
-							{if $errorType.confirmPassword|isset}
-								<small class="innerError">
-									{if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.error.confirmPassword.notEqual{/lang}{/if}
-								</small>
+					{foreach from=$categoryLevel1[categories] item=categoryLevel2}
+						<fieldset>
+							<legend>{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
+							
+							{if $categoryLevel2[object]->categoryName == 'settings.general' && $availableLanguages|count > 1}
+								<dl>
+									<dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+									<dd>
+										{htmlOptions options=$availableLanguages selected=$languageID name=languageID id=languageID disableEncoding=true}
+									</dd>
+								</dl>
+									
+								{if $availableContentLanguages|count > 1}
+									<dl>
+										<dt>
+											{lang}wcf.user.visibleLanguages{/lang}
+										</dt>
+										<dd>
+											<fieldset>
+												<legend>{lang}wcf.user.visibleLanguages{/lang}</legend>
+												<dl>
+													<dd>
+														{foreach from=$availableContentLanguages key=availableLanguageID item=availableLanguage}
+															<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked="checked"{/if} /> {@$availableLanguage}</label>
+														{/foreach}
+													</dd>
+												</dl>
+											</fieldset>
+										</dd>
+									</dl>
+								{/if}
 							{/if}
-						</dd>
-					</dl>
-				</fieldset>
-			{/if}
-		
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-			
-			{if $optionTree|count || $additionalTabs|isset}
-				<nav>
-					<div class="tabMenu">
-						<ul>
-							{foreach from=$optionTree item=categoryLevel1}
-								<li id="{@$categoryLevel1[object]->categoryName}"><a onclick="tabMenu.showSubTabMenu('{@$categoryLevel1[object]->categoryName}');"><span>{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</span></a></li>
-							{/foreach}
 							
-							{if $additionalTabs|isset}{@$additionalTabs}{/if}
-						</ul>
-					</div>
-				<nav>
-				<div class="subTabMenu">
-					<div class="containerHead"><div> </div></div>
+							{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.user.option.'}
+						</fieldset>
+					{/foreach}
 				</div>
-				
-				{foreach from=$optionTree item=categoryLevel1}
-					<div id="{@$categoryLevel1[object]->categoryName}-content" class="border tabMenuContent hidden">
-						<div class="container-1">
-							<h3 class="subHeading">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h3>
-							
-							{foreach from=$categoryLevel1[categories] item=categoryLevel2}
-								<fieldset>
-									<legend>{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
-									
-									{if $categoryLevel2[object]->categoryName == 'settings.general' && $availableLanguages|count > 1}
-										<dl>
-											<dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
-											<dd>
-												{htmlOptions options=$availableLanguages selected=$languageID name=languageID id=languageID disableEncoding=true}
-											</dd>
-										</dl>
-											
-										{if $availableContentLanguages|count > 1}
-											<dl>
-												<dt>
-													{lang}wcf.user.visibleLanguages{/lang}
-												</dt>
-												<dd>
-													<fieldset>
-														<legend>{lang}wcf.user.visibleLanguages{/lang}</legend>
-														<dl>
-															<dd>
-																{foreach from=$availableContentLanguages key=availableLanguageID item=availableLanguage}
-																	<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked="checked"{/if} /> {@$availableLanguage}</label>
-																{/foreach}
-															</dd>
-														</dl>
-													</fieldset>
-												</dd>
-											</dl>
-										{/if}
-									{/if}
-									
-									{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.user.option.'}
-								</fieldset>
-							{/foreach}
-						</div>
-					</div>
-				{/foreach}
-			{/if}
-			
-			{if $additionalTabContents|isset}{@$additionalTabContents}{/if}
-		</div>
+			{/foreach}
+		{/if}
+		
+		{if $additionalTabContents|isset}{@$additionalTabContents}{/if}
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 191202a4a5..cccd421402 100644
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -14,30 +14,30 @@
 <form method="post" action="index.php?form=UserAssignToGroup">
 
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</legend>
-				
-				<div>
-					{implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
-				</div>
-			</fieldset>	
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</legend>
+			
+			<div>
+				{implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
+			</div>
+		</fieldset>	
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.groups{/lang}</legend>
 			
-			<fieldset>
-				<legend>{lang}wcf.acp.user.groups{/lang}</legend>
-				
-				<div>
-					<div class="formField{if $errorField == 'groupIDs'} formError{/if}">
-						{htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
-						{if $errorField == 'groupIDs'}
-							<p class="innerError">
-								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-							</p>
-						{/if}
-					</div>
+			<div>
+				<div class="formField{if $errorField == 'groupIDs'} formError{/if}">
+					{htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
+					{if $errorField == 'groupIDs'}
+						<p class="innerError">
+							{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+						</p>
+					{/if}
 				</div>
-			</fieldset>
-		</div>
+			</div>
+		</fieldset>
+		
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 0f98825e71..f4bd98f5ac 100644
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -26,52 +26,50 @@
 <form method="post" action="index.php?form=UserEmailAddressExport">
 
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
-				
-				<div>
-					{implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
-				</div>
-			</fieldset>	
+		<fieldset>
+			<legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
 			
-			<fieldset>
-				<legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
-				
-				<dl>
-					<dt>
-						<label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label>
-					</dt>
-					<dd>
-						<fieldset>
-							<legend>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</legend>
-							
-							<dl>
-								<dd>
-									<li><label><input type="radio" onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
-									<li><label><input type="radio" onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
-								</dd>
-							</dl>
-						</fieldset>
-					</dd>
-				</dl>
+			<div>
+				{implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
+			</div>
+		</fieldset>	
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
 			
-				<dl id="separatorDiv">
-					<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
-					<dd>
-						<textarea id="separator" name="separator" rows="2" cols="40">{$separator}</textarea>
-					</dd>
-				</dl>
-				
-				<dl id="textSeparatorDiv">
-					<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
-					<dd class="formField">
-						<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
-					</dd>
-				</dl>
-			</fieldset>
-	
-		</div>
+			<dl>
+				<dt>
+					<label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label>
+				</dt>
+				<dd>
+					<fieldset>
+						<legend>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</legend>
+						
+						<dl>
+							<dd>
+								<li><label><input type="radio" onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></li>
+								<li><label><input type="radio" onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></li>
+							</dd>
+						</dl>
+					</fieldset>
+				</dd>
+			</dl>
+		
+			<dl id="separatorDiv">
+				<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
+				<dd>
+					<textarea id="separator" name="separator" rows="2" cols="40">{$separator}</textarea>
+				</dd>
+			</dl>
+			
+			<dl id="textSeparatorDiv">
+				<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
+				<dd class="formField">
+					<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
+				</dd>
+			</dl>
+		</fieldset>
+		
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/userException.tpl b/wcfsetup/install/files/acp/templates/userException.tpl
index 79cefc0439..d11ac39fac 100644
--- a/wcfsetup/install/files/acp/templates/userException.tpl
+++ b/wcfsetup/install/files/acp/templates/userException.tpl
@@ -1,6 +1,6 @@
 {include file='header' templateName='userException'}
 
-<p class="error" id="errorMessage">
+<p id="errorMessage" class="error">
 	{@$message}
 </p>
 
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index ff05a841b7..10fef626a5 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -38,76 +38,74 @@
 
 <form method="post" action="index.php?form=UserGroup{@$action|ucfirst}">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.group.data{/lang}</legend>
-				
-				<dl id="groupNameDiv"{if $errorType.groupName|isset} class="formError"{/if}>
-					<dt><label for="groupName">{lang}wcf.acp.group.groupName{/lang}</label></dt>
-					<dd>
-						<input type="text" id="groupName" name="groupName" value="{$groupName}" class="medium" />
-						{if $errorType.groupName|isset}
-							<small class="innerError">
-								{if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-							</small>
-						{/if}
-						<small id="groupNameHelpMessage">{lang}wcf.acp.group.groupName.description{/lang}</small>
-					</dd>
-				</dl>
-				
-				{if $additionalFields|isset}{@$additionalFields}{/if}
-			</fieldset>
 		
-			{if $additionalFieldSets|isset}{@$additionalFieldSets}{/if}
+		<fieldset>
+			<legend>{lang}wcf.acp.group.data{/lang}</legend>
 			
-			<nav>
-				<ul class="tabMenu">
-					{foreach from=$optionTree item=categoryLevel1}
-						<li id="{@$categoryLevel1[object]->categoryName}"><a onclick="tabMenu.showSubTabMenu('{@$categoryLevel1[object]->categoryName}');"><span>{lang}wcf.acp.group.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</span></a></li>
-					{/foreach}
-				</ul>
-			</nav>
+			<dl id="groupNameDiv"{if $errorType.groupName|isset} class="formError"{/if}>
+				<dt><label for="groupName">{lang}wcf.acp.group.groupName{/lang}</label></dt>
+				<dd>
+					<input type="text" id="groupName" name="groupName" value="{$groupName}" class="medium" />
+					{if $errorType.groupName|isset}
+						<small class="innerError">
+							{if $errorType.groupName == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+						</small>
+					{/if}
+					<small id="groupNameHelpMessage">{lang}wcf.acp.group.groupName.description{/lang}</small>
+				</dd>
+			</dl>
 			
-			<nav class="menu"><!-- ToDo: Border missing -->
+			{if $additionalFields|isset}{@$additionalFields}{/if}
+		</fieldset>
+	
+		{if $additionalFieldSets|isset}{@$additionalFieldSets}{/if}
+		
+		<nav>
+			<ul class="tabMenu">
 				{foreach from=$optionTree item=categoryLevel1}
-					<ul id="{@$categoryLevel1[object]->categoryName}-categories" class="hidden">
-						{foreach from=$categoryLevel1[categories] item=categoryLevel2}
-							<li id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}"><a onclick="tabMenu.showTabMenuContent('{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}');"><span>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</span></a></li>
-						{/foreach}
-					</ul>
+					<li id="{@$categoryLevel1[object]->categoryName}"><a onclick="tabMenu.showSubTabMenu('{@$categoryLevel1[object]->categoryName}');"><span>{lang}wcf.acp.group.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</span></a></li>
 				{/foreach}
-			</nav>
-			
+			</ul>
+		</nav>
+		
+		<nav class="menu"><!-- ToDo -->
 			{foreach from=$optionTree item=categoryLevel1}
-				{foreach from=$categoryLevel1[categories] item=categoryLevel2}
-					<div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}-content" class="border tabMenuContent hidden">
-						<div class="container-1">
-							<hgroup class="subHeading">
-								<h1>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h1>
-								<h2>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}</h2>
-							</hgroup>
-							
-							{if $categoryLevel2[options]|count}
-								{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.group.option.'}
-							{/if}
+				<ul id="{@$categoryLevel1[object]->categoryName}-categories" class="hidden">
+					{foreach from=$categoryLevel1[categories] item=categoryLevel2}
+						<li id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}"><a onclick="tabMenu.showTabMenuContent('{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}');"><span>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</span></a></li>
+					{/foreach}
+				</ul>
+			{/foreach}
+		</nav>
+		
+		{foreach from=$optionTree item=categoryLevel1}
+			{foreach from=$categoryLevel1[categories] item=categoryLevel2}
+				<div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}-content" class="border tabMenuContent hidden">
+					<hgroup class="subHeading">
+						<h1>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h1>
+						<h2>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}</h2>
+					</hgroup>
+					
+					{if $categoryLevel2[options]|count}
+						{include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.group.option.'}
+					{/if}
+					
+					{if $categoryLevel2[categories]|count}
+						{foreach from=$categoryLevel2[categories] item=categoryLevel3}
+							<fieldset>
+								<legend>{lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}{/lang}</legend>
+								<p class="description">{lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}.description{/lang}</p>
 							
-							{if $categoryLevel2[categories]|count}
-								{foreach from=$categoryLevel2[categories] item=categoryLevel3}
-									<fieldset>
-										<legend>{lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}{/lang}</legend>
-										<p class="description">{lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}.description{/lang}</p>
-									
-										<div>
-											{include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'}
-										</div>
-									</fieldset>
-								{/foreach}
-							{/if}
-						</div>
-					</div>
-				{/foreach}
+								<div>
+									{include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'}
+								</div>
+							</fieldset>
+						{/foreach}
+					{/if}
+					
+				</div>
 			{/foreach}
-		</div>
+		{/foreach}
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 2d3e1eab36..43e320373d 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -42,6 +42,7 @@
 		<hgroup>
 			<h1>{lang}wcf.acp.group.list.count{/lang} <span class="badge" title="{lang}wcf.acp.group.list.count{/lang}">{#$items}</span></h1>
 		</hgroup>
+		
 		<table>
 			<thead>
 				<tr class="tableHead">
@@ -52,6 +53,7 @@
 					{if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 				{foreach from=$groups item=group}
 					<tr id="groupContainer{@$group->groupID}">
@@ -85,6 +87,7 @@
 				{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index e816fe25d9..2ca59a29a3 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -70,6 +70,7 @@
 			{if $additionalUserListOptions|isset}{@$additionalUserListOptions}{/if}
 		</ul>
 	</nav>
+	
 	{if $users|count}
 		<table>
 			<thead>
@@ -85,6 +86,7 @@
 					{if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
 				</tr>
 			</thead>
+			
 			<tbody>
 			{foreach from=$users item=user}
 				<tr id="userRow{@$user->userID}">
@@ -124,6 +126,7 @@
 			{/foreach}
 			</tbody>
 		</table>
+		
 	</div>
 	
 	<div class="contentFooter">
@@ -141,9 +144,7 @@
 	</div>
 {else}
 	<div class="border content">
-		<div class="container-1">
-			<p class="info">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
-		</div>
+		<p class="info">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 36c201b99e..f5585b9e6e 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -31,91 +31,91 @@
 
 <form method="post" action="index.php?form=UserMail">
 	<div class="border content">
-		<div class="container-1">
-			{if $action == ''}
-				<fieldset>
-					<legend>{lang}wcf.acp.user.sendMail.markedUsers{/lang}</legend>
-					
-					<div>
-						{implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
-					</div>
-				</fieldset>	
-			{/if}
-			{if $action == 'group'}
-				<fieldset>
-					<legend>{lang}wcf.acp.user.sendMail.groups{/lang}</legend>
-					
-					<dl{if $errorField == 'groupIDs'} class="formError"{/if}>
-						<dt>
-							<label>{lang}wcf.acp.user.groups{/lang}</label>
-						</dt>
-						<dd>
-							<fieldset>
-								<legend>{lang}wcf.acp.user.groups{/lang}</legend>
-								
-								<dl>
-									<dd>
-										{htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
-									</dd>
-								</dl>
-							</fieldset>
-							{if $errorField == 'groupIDs'}
-								<small class="innerError">
-									{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								</small>
-							{/if}
-						</dd>
-					</dl>
-				</fieldset>	
-			{/if}
+		
+		{if $action == ''}
 			<fieldset>
-				<legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
+				<legend>{lang}wcf.acp.user.sendMail.markedUsers{/lang}</legend>
 				
 				<div>
-					<dl id="subjectDiv"{if $errorField == 'subject'} class="formError"{/if}>
-						<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
-						<dd>
-							<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
-							{if $errorField == 'subject'}
-								<small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
-							{/if}
-							<small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
-						</dd>
-					</dl>
-					
-					<dl id="fromDiv"{if $errorField == 'from'} class="formError"{/if}>
-						<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
-						<dd>
-							<input type="text" id="from" name="from" value="{$from}" class="medium" />
-							{if $errorField == 'from'}
-								<small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
-							{/if}
-							<small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small><!-- ToDo: Language variable contains paragraphs! -->
-						</dd>
-					</dl>
-					
-					<dl id="textDiv"{if $errorField == 'text'} class="formError"{/if}>
-						<dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
-						<dd>
-							<textarea id="text" name="text" rows="15" cols="40" class="long">{$text}</textarea>
-							{if $errorField == 'text'}
-								<small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
-							{/if}
-							<small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
-						</dd>
-					</dl>
-					
-					<dl>
-						<dt></dt>
-						<dd>
-							<label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1" /> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
-						</dd>
-					</dl>
+					{implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
 				</div>
+			</fieldset>	
+		{/if}
+		
+		{if $action == 'group'}
+			<fieldset>
+				<legend>{lang}wcf.acp.user.sendMail.groups{/lang}</legend>
 				
-				{if $additionalFields|isset}{@$additionalFields}{/if}
-			</fieldset>
-		</div>
+				<dl{if $errorField == 'groupIDs'} class="formError"{/if}>
+					<dt>
+						<label>{lang}wcf.acp.user.groups{/lang}</label>
+					</dt>
+					<dd>
+						<fieldset>
+							<legend>{lang}wcf.acp.user.groups{/lang}</legend>
+							
+							<dl>
+								<dd>
+									{htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
+								</dd>
+							</dl>
+						</fieldset>
+						{if $errorField == 'groupIDs'}
+							<small class="innerError">
+								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							</small>
+						{/if}
+					</dd>
+				</dl>
+			</fieldset>	
+		{/if}
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
+			
+			<dl id="subjectDiv"{if $errorField == 'subject'} class="formError"{/if}>
+				<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
+				<dd>
+					<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
+					{if $errorField == 'subject'}
+						<small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+					{/if}
+					<small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl id="fromDiv"{if $errorField == 'from'} class="formError"{/if}>
+				<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+				<dd>
+					<input type="text" id="from" name="from" value="{$from}" class="medium" />
+					{if $errorField == 'from'}
+						<small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+					{/if}
+					<small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small><!-- ToDo: Language variable contains paragraphs! -->
+				</dd>
+			</dl>
+			
+			<dl id="textDiv"{if $errorField == 'text'} class="formError"{/if}>
+				<dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+				<dd>
+					<textarea id="text" name="text" rows="15" cols="40" class="long">{$text}</textarea>
+					{if $errorField == 'text'}
+						<small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+					{/if}
+					<small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt></dt>
+				<dd>
+					<label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1" /> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+				</dd>
+			</dl>
+			
+			{if $additionalFields|isset}{@$additionalFields}{/if}
+		</fieldset>
+		
 	</div>
 	
 	<div class="formSubmit">
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index ae1b2c2919..56bd0e850d 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -16,7 +16,7 @@
 </header>
 
 {if $errorField == 'search'}
-<p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
+	<p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
 {/if}
 
 {*if $deletedUsers}
@@ -38,180 +38,179 @@
 
 <form method="post" action="index.php?form=UserSearch">
 	<div class="border content">
-		<div class="container-1">
-			<fieldset>
-				<legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
-				
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
+			
+			<dl>
+				<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+				<dd>
+					<input type="text" id="username" name="username" value="{$username}" class="medium" />
+					<script type="text/javascript">
+						//<![CDATA[
+						var suggestion = new Suggestion('username');
+						suggestion.enableMultiple(false);
+						//]]>
+					</script>
+				</dd>
+			</dl>
+			
+			<dl>
+				<dt><label for="userID">{lang}wcf.user.userID{/lang}</label></dt>
+				<dd>	
+					<input type="text" id="userID" name="userID" value="{$userID}" class="short" />
+				</dd>
+			</dl>
+			
+			{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
 				<dl>
-					<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+					<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
 					<dd>
-						<input type="text" id="username" name="username" value="{$username}" class="medium" />
-						<script type="text/javascript">
-							//<![CDATA[
-							var suggestion = new Suggestion('username');
-							suggestion.enableMultiple(false);
-							//]]>
-						</script>
+						<input type="email" id="email" name="email" value="{$email}" class="medium" />
 					</dd>
 				</dl>
-				
+			{/if}
+			
+			{if $availableGroups|count}
+				<dl>
+					<dt>
+						<label>{lang}wcf.acp.user.groups{/lang}</label>
+					</dt>
+					<dd>
+						<fieldset>
+							<legend>{lang}wcf.acp.user.groups{/lang}</legend>
+							
+							<dl>
+								<dd>{htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}</dd>
+							</dl>
+							
+							<label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
+						</fieldset>
+					</dd>
+				</dl>
+			{/if}
+			
+			{if $availableLanguages|count > 1}
 				<dl>
-					<dt><label for="userID">{lang}wcf.user.userID{/lang}</label></dt>
-					<dd>	
-						<input type="text" id="userID" name="userID" value="{$userID}" class="short" />
+					<dt>
+						<label>{lang}wcf.user.language{/lang}</label>
+					</dt>
+					<dd>
+						<fieldset>
+							<legend>{lang}wcf.acp.user.language{/lang}</legend>
+							
+							<dl>
+								<dd>{htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}</dd>
+							</dl>
+						</fieldset>
 					</dd>
 				</dl>
+			{/if}
+		</fieldset>
+		
+		{if $additionalFields|isset}{@$additionalFields}{/if}
+		
+		<div class="tabMenuContainer">
+			<nav>
+				<ul class="tabMenu">
+					{if $optionTree|count}<li><a href="#profile">{*<span>*}{lang}wcf.acp.user.search.conditions.profile{/lang}{*</span>*}</a></li>{/if}
+					{if $additionalTabs|isset}{@$additionalTabs}{/if}
+					<li><a href="#resultOptions">{*<span>*}{lang}wcf.acp.user.search.display{/lang}{*</span>*}</a></li>
+				</ul>
+			</nav>
+			
+			{if $optionTree|count}
+				<div id="profile" class="border tabMenuContent hidden">
+					<div class="container-1">
+						<h3 class="subHeading">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>
+						{include file='optionFieldList' langPrefix='wcf.user.option.' options=$optionTree}
+					</div>
+				</div>
+			{/if}
+		
+			{if $additionalTabContents|isset}{@$additionalTabContents}{/if}
+		
+			<div id="resultOptions" class="border tabMenuContent hidden">
+				<hgroup class="subHeading">
+					<h1>{lang}wcf.acp.user.search.display{/lang}</h1>
+				</hgroup>
+				
+				<fieldset>
+					<legend>{lang}wcf.acp.user.search.display.general{/lang}</legend>
 				
-				{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
 					<dl>
-						<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+						<dt><label for="sortField">{lang}wcf.acp.user.search.display.sort{/lang}</label></dt>
+						<dd>
+							<select id="sortField" name="sortField">
+								<option value="userID"{if $sortField == 'userID'} selected="selected"{/if}>{lang}wcf.user.userID{/lang}</option>
+								<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
+								<option value="email"{if $sortField == 'email'} selected="selected"{/if}>{lang}wcf.user.email{/lang}</option>
+								<option value="registrationDate"{if $sortField == 'registrationDate'} selected="selected"{/if}>{lang}wcf.user.registrationDate{/lang}</option>
+							
+								{if $additionalSortFields|isset}{@$additionalSortFields}{/if}
+							</select>
+						</dd>
 						<dd>
-							<input type="email" id="email" name="email" value="{$email}" class="medium" />
+							<select id="sortOrder" name="sortOrder">
+								<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
+								<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
+							</select>
 						</dd>
 					</dl>
-				{/if}
 				
-				{if $availableGroups|count}
 					<dl>
-						<dt>
-							<label>{lang}wcf.acp.user.groups{/lang}</label>
-						</dt>
+						<dt><label for="itemsPerPage">{lang}wcf.acp.user.search.display.itemsPerPage{/lang}</label></dt>
 						<dd>
-							<fieldset>
-								<legend>{lang}wcf.acp.user.groups{/lang}</legend>
-								
-								<dl>
-									<dd>{htmlCheckboxes options=$availableGroups name='groupIDs' selected=$groupIDs}</dd>
-								</dl>
-								
-								<label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
-							</fieldset>
+							<input type="text" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" class="short" />
 						</dd>
 					</dl>
-				{/if}
+				</fieldset>
+			
+				<fieldset>
+					<legend>{lang}wcf.acp.user.search.display.columns{/lang}</legend>
+				
+					{if $optionTree|count}
+						<dl>
+							<dt>
+								<label>{lang}wcf.acp.user.search.display.columns.profile{/lang}</label>
+							</dt>
+							<dd>
+								<fieldset>
+									<legend>{lang}wcf.acp.user.search.display.columns.profile{/lang}</legend>
+									
+									<dl>
+										<dd>
+											{foreach from=$optionTree item=option}
+												<label><input type="checkbox" name="columns[]" value="{$option->optionName}" {if $option->optionName|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
+											{/foreach}
+										<dd>
+									</dl>
+								</fieldset>
+							</dd>
+						</dl>
+					{/if}
 				
-				{if $availableLanguages|count > 1}
 					<dl>
-						<dt>
-							<label>{lang}wcf.user.language{/lang}</label>
-						</dt>
+						<dt><label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label></dt>
 						<dd>
 							<fieldset>
-								<legend>{lang}wcf.acp.user.language{/lang}</legend>
-								
+								<legend>{lang}wcf.acp.user.search.display.columns.other{/lang}</legend>
+							
 								<dl>
-									<dd>{htmlCheckboxes options=$availableLanguages name='languageIDs' selected=$languageIDs disableEncoding=true}</dd>
+									<dd>
+										<label><input type="checkbox" name="columns[]" value="email" {if "email"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.email{/lang}</label></dd>
+										<label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.registrationDate{/lang}</label>
+									</dd>
+									
+									{if $additionalColumns|isset}{@$additionalColumns}{/if}
 								</dl>
 							</fieldset>
 						</dd>
 					</dl>
-				{/if}
-			</fieldset>
-			
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-			
-			<div class="tabMenuContainer">
-				<nav>
-					<ul class="tabMenu">
-						{if $optionTree|count}<li><a href="#profile">{*<span>*}{lang}wcf.acp.user.search.conditions.profile{/lang}{*</span>*}</a></li>{/if}
-						{if $additionalTabs|isset}{@$additionalTabs}{/if}
-						<li><a href="#resultOptions">{*<span>*}{lang}wcf.acp.user.search.display{/lang}{*</span>*}</a></li>
-					</ul>
-				</nav>
 				
-				{if $optionTree|count}
-					<div id="profile" class="border tabMenuContent hidden">
-						<div class="container-1">
-							<h3 class="subHeading">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>
-							{include file='optionFieldList' langPrefix='wcf.user.option.' options=$optionTree}
-						</div>
-					</div>
-				{/if}
-			
-				{if $additionalTabContents|isset}{@$additionalTabContents}{/if}
-			
-				<div id="resultOptions" class="border tabMenuContent hidden">
-					<div class="container-1">
-						<h1 class="subHeading">{lang}wcf.acp.user.search.display{/lang}</h1>
-					
-						<fieldset>
-							<legend>{lang}wcf.acp.user.search.display.general{/lang}</legend>
-						
-							<dl>
-								<dt><label for="sortField">{lang}wcf.acp.user.search.display.sort{/lang}</label></dt>
-								<dd>
-									<select id="sortField" name="sortField">
-										<option value="userID"{if $sortField == 'userID'} selected="selected"{/if}>{lang}wcf.user.userID{/lang}</option>
-										<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
-										<option value="email"{if $sortField == 'email'} selected="selected"{/if}>{lang}wcf.user.email{/lang}</option>
-										<option value="registrationDate"{if $sortField == 'registrationDate'} selected="selected"{/if}>{lang}wcf.user.registrationDate{/lang}</option>
-									
-										{if $additionalSortFields|isset}{@$additionalSortFields}{/if}
-									</select>
-								</dd>
-								<dd>
-									<select id="sortOrder" name="sortOrder">
-										<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
-										<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
-									</select>
-								</dd>
-							</dl>
-						
-							<dl>
-								<dt><label for="itemsPerPage">{lang}wcf.acp.user.search.display.itemsPerPage{/lang}</label></dt>
-								<dd>
-									<input type="text" id="itemsPerPage" name="itemsPerPage" value="{@$itemsPerPage}" class="short" />
-								</dd>
-							</dl>
-						</fieldset>
-					
-						<fieldset>
-							<legend>{lang}wcf.acp.user.search.display.columns{/lang}</legend>
-						
-							{if $optionTree|count}
-								<dl>
-									<dt>
-										<label>{lang}wcf.acp.user.search.display.columns.profile{/lang}</label>
-									</dt>
-									<dd>
-										<fieldset>
-											<legend>{lang}wcf.acp.user.search.display.columns.profile{/lang}</legend>
-											
-											<dl>
-												<dd>
-													{foreach from=$optionTree item=option}
-														<label><input type="checkbox" name="columns[]" value="{$option->optionName}" {if $option->optionName|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
-													{/foreach}
-												<dd>
-											</dl>
-										</fieldset>
-									</dd>
-								</dl>
-							{/if}
-						
-							<dl>
-								<dt><label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label></dt>
-								<dd>
-									<fieldset>
-										<legend>{lang}wcf.acp.user.search.display.columns.other{/lang}</legend>
-									
-										<dl>
-											<dd>
-												<label><input type="checkbox" name="columns[]" value="email" {if "email"|in_array:$columns}checked="checked" {/if}/> {lang}wcf.user.email{/lang}</label></dd>
-												<label><input type="checkbox" name="columns[]" value="registrationDate" {if "registrationDate"|in_array:$columns}checked="checked"{/if}/> {lang}wcf.user.registrationDate{/lang}</label>
-											</dd>
-											
-											{if $additionalColumns|isset}{@$additionalColumns}{/if}
-										</dl>
-									</fieldset>
-								</dd>
-							</dl>
-						
-						</fieldset>
-					</div>
-				</div>
+				</fieldset>
+				
 			</div>
-			
 		</div>
 	</div>
 	
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
index a85e99d0e1..95be3bb83d 100644
--- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
@@ -84,226 +84,123 @@
 
 <form method="post" action="index.php?form=UsersMassProcessing">
 	<div class="border content">
-		<div class="container-1">
-			<h3 class="subHeading">{lang}wcf.acp.user.massProcessing.conditions{/lang}</h3>
+		
+		<hgroup class="subHeading">
+			<h1>{lang}wcf.acp.user.massProcessing.conditions{/lang}</h1>
+		</hgroup>
+		
+		<fieldset>
+			<legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
 			
-			<fieldset>
-				<legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
-				
+			<dl>
+				<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+				<dd>
+					<input type="text" id="username" name="username" value="{$username}" class="medium" />
+					<script type="text/javascript">
+						//<![CDATA[
+						suggestion.enableMultiple(false);
+						suggestion.init('username');
+						//]]>
+					</script>
+				</dd>
+			</dl>
+			
+			{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
 				<dl>
-					<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-					<dd>
-						<input type="text" id="username" name="username" value="{$username}" class="medium" />
-						<script type="text/javascript">
-							//<![CDATA[
-							suggestion.enableMultiple(false);
-							suggestion.init('username');
-							//]]>
-						</script>
+					<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+					<dd>	
+						<input type="email" id="email" name="email" value="{$email}" class="medium" />
 					</dd>
 				</dl>
-				
-				{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-					<dl>
-						<dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
-						<dd>	
-							<input type="email" id="email" name="email" value="{$email}" class="medium" />
-						</dd>
-					</dl>
-				{/if}
-				
-				{if $availableGroups|count}
-					<dl>
-						<dt><label>{lang}wcf.acp.user.groups{/lang}</label></dt>
-						<dd>
-							<fieldset>
-								<legend>{lang}wcf.acp.user.groups{/lang}</legend>
-								<dl>
-									<dd>
-										{htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray}
-										
-										<label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
-									</dd>
-								</dl>
-							</fieldset>
-						</dd>
-					</dl>
-				{/if}
-				
-				{if $availableLanguages|count > 1}
-					<dl>
-						<dt><label>{lang}wcf.user.language{/lang}</label></dt>
-						<dd>
-							<fieldset>
-								<legend>{lang}wcf.acp.user.language{/lang}</legend>
-								
-								<dl>
-									<dd>{htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}</dd>
-								</dl>
-							</fieldset>
-						</dd>
-					</dl>
-				{/if}
-			</fieldset>
-		
-			{if $additionalFields|isset}{@$additionalFields}{/if}
-			
-			<div class="tabMenu">
-				<ul>
-					{if $options|count}<li id="profile"><a onclick="tabMenu.showSubTabMenu('profile');"><span>{lang}wcf.acp.user.search.conditions.profile{/lang}</span></a></li>{/if}
-					{if $additionalTabs|isset}{@$additionalTabs}{/if}
-				</ul>
-			</div>
-			<div class="subTabMenu">
-				<div class="containerHead"><div> </div></div>
-			</div>
+			{/if}
 			
-			{if $options|count}
-				<div id="profile-content" class="border tabMenuContent hidden">
-					<div class="container-1">
-						<h1 class="subHeading">{lang}wcf.acp.user.search.conditions.profile{/lang}</h1>
-						
-						{include file='optionFieldList' langPrefix='wcf.user.option.'}
-					</div>
-				</div>
+			{if $availableGroups|count}
+				<dl>
+					<dt><label>{lang}wcf.acp.user.groups{/lang}</label></dt>
+					<dd>
+						<fieldset>
+							<legend>{lang}wcf.acp.user.groups{/lang}</legend>
+							<dl>
+								<dd>
+									{htmlCheckboxes options=$availableGroups name='groupIDArray' selected=$groupIDArray}
+									
+									<label style="margin-top: 10px"><input type="checkbox" name="invertGroupIDs" value="1" {if $invertGroupIDs == 1}checked="checked" {/if}/> {lang}wcf.acp.user.groups.invertSearch{/lang}</label>
+								</dd>
+							</dl>
+						</fieldset>
+					</dd>
+				</dl>
 			{/if}
 			
-			{if $additionalTabContents|isset}{@$additionalTabContents}{/if}
-		</div>
+			{if $availableLanguages|count > 1}
+				<dl>
+					<dt><label>{lang}wcf.user.language{/lang}</label></dt>
+					<dd>
+						<fieldset>
+							<legend>{lang}wcf.acp.user.language{/lang}</legend>
+							
+							<dl>
+								<dd>{htmlCheckboxes options=$availableLanguages name='languageIDArray' selected=$languageIDArray disableEncoding=true}</dd>
+							</dl>
+						</fieldset>
+					</dd>
+				</dl>
+			{/if}
+		</fieldset>
+	
+		{if $additionalFields|isset}{@$additionalFields}{/if}
+		
+		<nav>
+			<ul class="tabMenu">
+				{if $options|count}<li id="profile"><a onclick="tabMenu.showSubTabMenu('profile');"><span>{lang}wcf.acp.user.search.conditions.profile{/lang}</span></a></li>{/if}
+				{if $additionalTabs|isset}{@$additionalTabs}{/if}
+			</ul>
+		</nav>
+		
+		<nav class="menu">
+			<div class="containerHead"><div> </div></div>
+		</nav>
+		
+		{if $options|count}
+			<div id="profile-content" class="border tabMenuContent hidden">
+				<hgroup class="subHeading">
+					<h1>{lang}wcf.acp.user.search.conditions.profile{/lang}</h1>
+				</hgroup>
+				
+				{include file='optionFieldList' langPrefix='wcf.user.option.'}
+			</div>
+		{/if}
+		
+		{if $additionalTabContents|isset}{@$additionalTabContents}{/if}
 	</div>
 	
 	<div class="border content">
-		<div class="container-1">
-			<h1 class="subHeading">{lang}wcf.acp.user.massProcessing.action{/lang}</h1>
-				
-			<dl{if $errorField == 'action'} class="formError"{/if}>
-				<dt><label>{lang}wcf.acp.user.massProcessing.action{/lang}</label></dt>
-				<dd>
-					<fieldset>
-						<legend>{lang}wcf.acp.user.massProcessing.action{/lang}</legend>
-						
-						<dl>
-							<dd>
-								{if $__wcf->session->getPermission('admin.user.canMailUser')}
-									<label><input type="radio" onclick="if (IS_SAFARI) enableSendMail()" onfocus="enableSendMail()" name="action" value="sendMail" {if $action == 'sendMail'}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail{/lang}</label>
-									<label><input type="radio" onclick="if (IS_SAFARI) enableExportMailAddress()" onfocus="enableExportMailAddress()" name="action" value="exportMailAddress" {if $action == 'exportMailAddress'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress{/lang}</label>
-								{/if}
-								{if $__wcf->session->getPermission('admin.user.canEditUser')}
-									<label><input type="radio" onclick="if (IS_SAFARI) enableAssignToGroup()" onfocus="enableAssignToGroup()" name="action" value="assignToGroup" {if $action == 'assignToGroup'}checked="checked" {/if}/> {lang}wcf.acp.user.assignToGroup{/lang}</label>
-								{/if}
-								{if $__wcf->session->getPermission('admin.user.canDeleteUser')}
-									<label><input type="radio" onclick="if (IS_SAFARI) enableDelete()" onfocus="enableDelete()" name="action" value="delete" {if $action == 'delete'}checked="checked" {/if}/> {lang}wcf.acp.user.delete{/lang}</label>
-								{/if}
-								
-								{if $additionalActions|isset}{@$additionalActions}{/if}
-								
-								{if $errorField == 'action'}
-									<small class="innerError">
-										{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-									</small>
-								{/if}
-							</dd>
-						</dl>
-					</fieldset>
-				</dd>
-			</dl>
+		<hgroup class="subHeading">
+			<h1>{lang}wcf.acp.user.massProcessing.action{/lang}</h1>
+		</hgroup>
 			
-			<div id="sendMailDiv">
+		<dl{if $errorField == 'action'} class="formError"{/if}>
+			<dt><label>{lang}wcf.acp.user.massProcessing.action{/lang}</label></dt>
+			<dd>
 				<fieldset>
-					<legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
+					<legend>{lang}wcf.acp.user.massProcessing.action{/lang}</legend>
 					
-					<dl id="fromDiv"{if $errorField == 'from'} class="formError"{/if}>
-						<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+					<dl>
 						<dd>
-							<input type="email" id="from" name="from" value="{$from}" class="medium" />
-							{if $errorField == 'from'}
-								<small class="innerError">
-									{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								</small>
+							{if $__wcf->session->getPermission('admin.user.canMailUser')}
+								<label><input type="radio" onclick="if (IS_SAFARI) enableSendMail()" onfocus="enableSendMail()" name="action" value="sendMail" {if $action == 'sendMail'}checked="checked" {/if}/> {lang}wcf.acp.user.sendMail{/lang}</label>
+								<label><input type="radio" onclick="if (IS_SAFARI) enableExportMailAddress()" onfocus="enableExportMailAddress()" name="action" value="exportMailAddress" {if $action == 'exportMailAddress'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress{/lang}</label>
 							{/if}
-							<small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
-						</dd>
-					</dl>
-					
-					<dl id="subjectDiv"{if $errorField == 'subject'} class="formError"{/if}>
-						<dt>
-							<label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label>
-						</dt>
-						<dd>
-							<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
-							{if $errorField == 'subject'}
-								<small class="innerError">
-									{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								</small>
+							{if $__wcf->session->getPermission('admin.user.canEditUser')}
+								<label><input type="radio" onclick="if (IS_SAFARI) enableAssignToGroup()" onfocus="enableAssignToGroup()" name="action" value="assignToGroup" {if $action == 'assignToGroup'}checked="checked" {/if}/> {lang}wcf.acp.user.assignToGroup{/lang}</label>
 							{/if}
-							<small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
-						</dd>
-					</dl>
-					
-					<dl id="textDiv"{if $errorField == 'text'} class="formError"{/if}>
-						<dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
-						<dd>
-							<textarea id="text" name="text" rows="15" cols="40">{$text}</textarea>
-							{if $errorField == 'text'}
-								<small class="innerError" class="long">
-									{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
-								</small>
+							{if $__wcf->session->getPermission('admin.user.canDeleteUser')}
+								<label><input type="radio" onclick="if (IS_SAFARI) enableDelete()" onfocus="enableDelete()" name="action" value="delete" {if $action == 'delete'}checked="checked" {/if}/> {lang}wcf.acp.user.delete{/lang}</label>
 							{/if}
-							<small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
-						</dd>
-					</dl>
-					
-					<dl class="reversed separated">
-						<dt><label for="enableHTML">{lang}wcf.acp.user.sendMail.enableHTML{/lang}</label></dt>
-						<dd>
-							<input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}/> 
-						</dd>
-					</dl>
-				</div>
-			</fieldset>
-			
-			<div id="exportMailAddressDiv">
-				<fieldset>
-					<legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
-					
-					<dl>
-						<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
-						<dd>
-							<fieldset>
-								<legend>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</legend>
-								
-								<dl>
-									<dd><label><input type="radio" onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></dd>
-									<dd><label><input type="radio" onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></dd>
-								</dl>
-							</fieldset>
-						</dd>
-					</dl>
-				
-					<dl id="separatorDiv">
-						<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
-						<dd>
-							<textarea id="separator" name="separator" rows="2" cols="40">{$separator}</textarea>
-						</dd>
-					</dl>
-					
-					<dl id="textSeparatorDiv">
-						<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
-						<dd>
-							<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
-						</dd>
-					</dl>
-				</fieldset>
-			</div>
-			
-			<div id="assignToGroupDiv">
-				<fieldset>
-					<legend>{lang}wcf.acp.user.groups{/lang}</legend>
-					
-					<dl>
-						<dd{if $errorField == 'assignToGroupIDArray'} class="formError"{/if}>
-							{htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray}
-							{if $errorField == 'assignToGroupIDArray'}
+							
+							{if $additionalActions|isset}{@$additionalActions}{/if}
+							
+							{if $errorField == 'action'}
 								<small class="innerError">
 									{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
 								</small>
@@ -311,10 +208,115 @@
 						</dd>
 					</dl>
 				</fieldset>
+			</dd>
+		</dl>
+		
+		<div id="sendMailDiv">
+			<fieldset>
+				<legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
+				
+				<dl id="fromDiv"{if $errorField == 'from'} class="formError"{/if}>
+					<dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+					<dd>
+						<input type="email" id="from" name="from" value="{$from}" class="medium" />
+						{if $errorField == 'from'}
+							<small class="innerError">
+								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							</small>
+						{/if}
+						<small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
+					</dd>
+				</dl>
+				
+				<dl id="subjectDiv"{if $errorField == 'subject'} class="formError"{/if}>
+					<dt>
+						<label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label>
+					</dt>
+					<dd>
+						<input type="text" id="subject" name="subject" value="{$subject}" class="long" />
+						{if $errorField == 'subject'}
+							<small class="innerError">
+								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							</small>
+						{/if}
+						<small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+					</dd>
+				</dl>
+				
+				<dl id="textDiv"{if $errorField == 'text'} class="formError"{/if}>
+					<dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+					<dd>
+						<textarea id="text" name="text" rows="15" cols="40">{$text}</textarea>
+						{if $errorField == 'text'}
+							<small class="innerError" class="long">
+								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							</small>
+						{/if}
+						<small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
+					</dd>
+				</dl>
+				
+				<dl class="reversed separated">
+					<dt><label for="enableHTML">{lang}wcf.acp.user.sendMail.enableHTML{/lang}</label></dt>
+					<dd>
+						<input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}/> 
+					</dd>
+				</dl>
 			</div>
+		</fieldset>
+		
+		<div id="exportMailAddressDiv">
+			<fieldset>
+				<legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
+				
+				<dl>
+					<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
+					<dd>
+						<fieldset>
+							<legend>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</legend>
+							
+							<dl>
+								<dd><label><input type="radio" onclick="if (IS_SAFARI) setFileType('csv')" onfocus="setFileType('csv')" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label></dd>
+								<dd><label><input type="radio" onclick="if (IS_SAFARI) setFileType('xml')" onfocus="setFileType('xml')" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}/> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label></dd>
+							</dl>
+						</fieldset>
+					</dd>
+				</dl>
 			
-			{if $additionalActionSettings|isset}{@$additionalActionSettings}{/if}
+				<dl id="separatorDiv">
+					<dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
+					<dd>
+						<textarea id="separator" name="separator" rows="2" cols="40">{$separator}</textarea>
+					</dd>
+				</dl>
+				
+				<dl id="textSeparatorDiv">
+					<dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
+					<dd>
+						<input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
+					</dd>
+				</dl>
+			</fieldset>
 		</div>
+		
+		<div id="assignToGroupDiv">
+			<fieldset>
+				<legend>{lang}wcf.acp.user.groups{/lang}</legend>
+				
+				<dl>
+					<dd{if $errorField == 'assignToGroupIDArray'} class="formError"{/if}>
+						{htmlCheckboxes options=$availableGroups name=assignToGroupIDArray selected=$assignToGroupIDArray}
+						{if $errorField == 'assignToGroupIDArray'}
+							<small class="innerError">
+								{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
+							</small>
+						{/if}
+					</dd>
+				</dl>
+			</fieldset>
+		</div>
+		
+		{if $additionalActionSettings|isset}{@$additionalActionSettings}{/if}
 	</div>
 	
 	<div class="formSubmit">
-- 
2.20.1