From ad1563263a6f2a689fb08f3d810193eb57ebf482 Mon Sep 17 00:00:00 2001
From: Luzifr <szekely@woltlab.com>
Date: Mon, 25 Jul 2011 19:28:51 +0200
Subject: [PATCH] More adjustments to match the design-sketch.

---
 wcfsetup/install/files/acp/style/testing.css  | 73 ++++++++++++++-----
 .../files/acp/templates/acpSessionLog.tpl     | 10 +--
 .../files/acp/templates/acpSessionLogList.tpl | 10 +--
 .../install/files/acp/templates/cacheList.tpl | 14 ++--
 .../files/acp/templates/cronjobAdd.tpl        | 20 ++---
 .../files/acp/templates/cronjobList.tpl       | 20 ++---
 .../files/acp/templates/cronjobLogList.tpl    | 14 ++--
 .../install/files/acp/templates/option.tpl    |  2 +-
 .../files/acp/templates/optionImport.tpl      |  2 +-
 .../acp/templates/packageAutoUpdateList.tpl   | 26 +++----
 .../files/acp/templates/packageList.tpl       | 18 ++---
 .../acp/templates/packageStartInstall.tpl     | 33 +++++----
 .../files/acp/templates/packageUpdate.tpl     | 13 ++--
 .../acp/templates/packageUpdateSearch.tpl     | 12 +--
 .../files/acp/templates/packageView.tpl       | 18 ++---
 .../files/acp/templates/updateServerAdd.tpl   | 16 ++--
 .../files/acp/templates/updateServerList.tpl  | 18 ++---
 .../install/files/acp/templates/userAdd.tpl   | 39 +++++-----
 .../install/files/acp/templates/userList.tpl  | 25 ++++---
 .../install/files/acp/templates/userMail.tpl  | 22 +++---
 .../files/acp/templates/userSearch.tpl        | 36 ++++-----
 21 files changed, 244 insertions(+), 197 deletions(-)

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 0c65d2daee..24bc396a82 100644
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -54,6 +54,10 @@ section#content a:hover {
 	top: -9000px;
 }
 
+hr {
+	display: none;
+}
+
 
 
 /* -- -- -- -- -- Header -- -- -- -- -- */
@@ -252,7 +256,7 @@ section#content {
 	background-color: #fff;
 	
 	display: table-cell;
-	padding: 21px;
+	padding: 25px;
 	width: 100%;
 }
 
@@ -299,7 +303,7 @@ nav.sidebarMenu > div h1 {
 	font-size: 130%;
 	font-weight: bold;
 	margin-top: 5px;
-	padding: 7px 15px 7px 35px;
+	padding: 7px 25px 7px 35px;
 	position: relative;
 }
 
@@ -309,7 +313,7 @@ nav.sidebarMenu > div h1.activeMenuItem {
 
 nav.sidebarMenu > div ul li {
 	font-size: 110%;
-	padding: 5px 15px 7px 35px;
+	padding: 5px 25px 7px 35px;
 }
 
 nav.sidebarMenu > div ul li.activeMenuItem {
@@ -449,7 +453,6 @@ div.ui-widget-overlay {
 /* Main Heading */
 
 .mainHeading {
-	height: 48px;
 	margin-bottom: 15px;
 	position: relative;
 }
@@ -458,6 +461,7 @@ div.ui-widget-overlay {
 	position: absolute;
 	top: 0;
 	left: 0;
+	width: 48px;
 	height: 48px;
 }
 
@@ -470,6 +474,7 @@ div.ui-widget-overlay {
 .mainHeading > hgroup h1 {
 	border-bottom: 1px solid #999;
 	color: #999;
+	text-shadow: 0 1px 0 #fff;
 	font-size: 140%;
 	font-weight: bold;
 	padding-bottom: 10px;
@@ -484,6 +489,7 @@ div.ui-widget-overlay {
 .subHeading {
 	border-bottom: 1px solid #999;
 	font-size: 120%;
+	text-shadow: 0 1px 0 #fff;
 	margin: 14px 0 14px;
 	padding: 15px;
 }
@@ -500,6 +506,7 @@ fieldset {
 }
 
 fieldset legend {
+	color: #999;
 	padding: 0 7px 0;
 }
 
@@ -641,13 +648,19 @@ th:last-child {
 	border-right-width: 0;
 }
 
+th {
+	font-size: 85%;
+}
+
 th a {
+	color: #999;
 	display: block;
 	text-decoration: none;
 }
 
 th a:hover {
-	color: #00c !important;
+	color: #333 !important;
+	text-shadow: 0 1px 0 #fff;
 	text-decoration: none !important;
 }
 
@@ -718,17 +731,17 @@ tr.container-2 td {
 
 /* -- -- -- -- -- Large Buttons -- -- -- -- -- */
 
-div.largeButtons {
+nav.largeButtons {
 	text-align: right;
 }
 
-div.largeButtons ul li {
+nav.largeButtons ul li {
 	display: inline;
 }
 
 input[type='reset'],
 input[type='submit'],
-div.largeButtons ul li a {
+nav.largeButtons ul li a {
 	background-color: #fefefe;
 	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#eee));
 	background-image: -moz-linear-gradient(0% 0% 270deg, #fefefe, #eee);
@@ -744,7 +757,7 @@ div.largeButtons ul li a {
 
 input[type='reset']:hover,
 input[type='submit']:hover,
-div.largeButtons ul li a:hover {
+nav.largeButtons ul li a:hover {
 	background-color: #fefefe;
 	background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#eee), to(#fefefe));
 	background-image: -moz-linear-gradient(0% 0% 270deg, #eee, #fefefe);
@@ -755,11 +768,11 @@ div.largeButtons ul li a:hover {
 	text-decoration: none;
 }
 
-div.largeButtons ul li a img {
+nav.largeButtons ul li a img {
 	vertical-align: middle;
 }
 
-div.formSubmit {
+.formSubmit {
 	text-align: center;
 }
 
@@ -814,18 +827,42 @@ div#ajaxExceptionStacktrace {
 	padding: 3px;
 }
 
-p.success {
-	background-color: #b5e61d;
-	border: 1px solid #22b14c;
-	border-radius: 5px;
+
+
+/* -- -- -- -- -- System Notifications -- -- -- -- -- */
+
+p.info,
+p.error,
+p.success,
+p.warning {
+	border-radius: 7px;
 	margin-bottom: 14px;
-	padding: 7px;
+	padding: 7px 14px;
 }
 
-hr {
-	display: none;
+p.info {
+	background-color: #def;
+	border: 1px solid #06f;
+}
+
+p.success {
+	background-color: #efe;
+	border: 1px solid #090;
+}
+
+p.error {
+	background-color: #fee;
+	border: 1px solid #c00;
+}
+
+p.warning {
+	background-color: #ffd;
+	border: 1px solid #660;
 }
 
+
+
+
 #actionProxyLoading {
 	background-color: #faebd7;
 	border: 1px solid #f80;
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index f437813edb..78b833ffde 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -1,12 +1,12 @@
 {include file='header'}
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/sessionLogL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.sessionLog.access.view{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.sessionLog.access.view{/lang}</h1>
+	</hgroup>
+</header>
 
 <div class="contentHeader">
 	{pages print=true assign=pagesLinks link="index.php?page=ACPSessionLog&sessionLogID=$sessionLogID&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
index 06ce005277..1a28523614 100644
--- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
@@ -1,12 +1,12 @@
 {include file='header'}
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/sessionLogL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.sessionLog.view{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.sessionLog.view{/lang}</h1>
+	</hgroup>
+</header>
 
 <div class="contentHeader">
 	{pages print=true assign=pagesLinks link="index.php?page=ACPSessionLogList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index bf0342c6f3..b251e34d78 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -1,11 +1,11 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/cacheL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.cache.list{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.cache.list{/lang}</h1>
+	</hgroup>
+</header>
 
 {if $cleared}
 	<p class="success">{lang}wcf.acp.cache.clear.success{/lang}</p>	
@@ -37,12 +37,12 @@
 </fieldset>
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php?action=CacheClear{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/deleteM.png" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
 			{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 		</ul>
-	</div>
+	</nav>
 </div>
 
 {foreach from=$caches key=cache item=files}
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index b09961ba6b..1bb07683d7 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -1,12 +1,12 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/cronjobs{$action|ucfirst}L.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.cronjob.{$action}{/lang}</h2>
-		<p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
+		<h2>{lang}wcf.acp.cronjob.subtitle{/lang}</h2>
+	</hgroup>
+</header>
 
 {if $errorField}
 	<p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -19,13 +19,14 @@
 <p class="info">{lang}wcf.acp.cronjob.intro{/lang}</p>
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			<li><a href="index.php?page=CronjobList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.cronjobs.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsM.png" alt="" /> <span>{lang}wcf.acp.menu.link.cronjobs.view{/lang}</span></a></li>
 			{if $action == 'edit'}<li><a href="index.php?action=CronjobExecute&amp;cronjobID={@$cronjobID}{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobExecuteM.png" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}
 		</ul>
-	</div>
+	</nav>
 </div>
+
 <form method="post" action="index.php?form=Cronjob{$action|ucfirst}">
 	<div class="border content">
 		<div class="container-1">
@@ -175,9 +176,10 @@
 			{if $additionalFields|isset}{@$additionalFields}{/if}
 		</div>
 	</div>
+	
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		{@SID_INPUT_TAG}
  		{if $cronjobID|isset}<input type="hidden" name="cronjobID" value="{@$cronjobID}" />{/if}
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 86004e95f8..46ab5a69a4 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -1,12 +1,12 @@
 {include file='header'}
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/cronjobsL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.cronjob.list{/lang}</h2>
-		<p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
-	</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.cronjob.list{/lang}</h1>
+		<h2>{lang}wcf.acp.cronjob.subtitle{/lang}</h2>
+	</hgroup>
 	
 	<script type="text/javascript">
 		//<![CDATA[
@@ -33,15 +33,15 @@
 		});
 		//]]>
 	</script>
-</div>
+</header>
 
 <div class="contentHeader">
 	{pages print=true assign=pagesLinks link="index.php?page=CronjobList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
 	
 	{if $__wcf->session->getPermission('admin.system.cronjobs.canAddCronjob')}
-		<div class="largeButtons">
+		<nav class="largeButtons">
 			<ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
-		</div>
+		</nav>
 	{/if}
 </div>
 
@@ -131,9 +131,9 @@
 		{@$pagesLinks}
 		
 		{if $__wcf->session->getPermission('admin.system.cronjobs.canAddCronjob')}
-			<div class="largeButtons">
+			<nav class="largeButtons">
 				<ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobsAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
-			</div>
+			</nav>
 		{/if}
 	</div>
 {/if}
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 2328099faa..9c780857c3 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -1,13 +1,13 @@
 {include file='header'}
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/cronjobsLogL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.cronjob.log{/lang}</h2>
-		<p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.cronjob.log{/lang}</h1>
+		<h2>{lang}wcf.acp.cronjob.subtitle{/lang}</h2>
+	</hgroup>
+</header>
 
 <div class="contentHeader">
 	{pages print=true assign=pagesLinks link="index.php?page=CronjobLogList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
@@ -68,7 +68,7 @@
 {hascontentelse}
 	<div class="border content">
 		<div class="container-1">
-			<p>{lang}wcf.acp.cronjob.log.noEntries{/lang}</p>
+			<p class="info">{lang}wcf.acp.cronjob.log.noEntries{/lang}</p>
 		</div>
 	</div>
 {/hascontent}
diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index e0ecbcb242..db7645357e 100644
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -65,8 +65,8 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		{@SID_INPUT_TAG}
  		<input type="hidden" id="activeTabMenuItem" name="activeTabMenuItem" value="{$activeTabMenuItem}" />
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index 973aed2728..7ed40a7bdf 100644
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -49,8 +49,8 @@
 	</div>
 
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
 		{@SID_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
index 5cb8751ae0..84ed005a9b 100644
--- a/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
@@ -22,30 +22,30 @@
 </script>
 
 <form method="post" action="index.php?form=PackageUpdate" id="updateForm">
-	<div class="mainHeadline">
+	<header class="mainHeading">
 		<img src="{@RELATIVE_WCF_DIR}icon/packageUpdateL.png" alt="" />
-		<div class="headlineContainer">
-			<h2>{lang}wcf.acp.packageUpdate{/lang}</h2>
-			{if $availableUpdates|count}<p><label><input type="checkbox" onclick="checkUncheckAllPackages(document.getElementById('updateForm'))" /> {lang}wcf.acp.packageUpdate.selectAll{/lang}</label></p>{/if}
-		</div>
-	</div>
-
+		<hgroup>
+			<h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
+			{if $availableUpdates|count}<h2><label><input type="checkbox" onclick="checkUncheckAllPackages(document.getElementById('updateForm'))" /> {lang}wcf.acp.packageUpdate.selectAll{/lang}</label></h2>{/if}
+		</hgroup>
+	</header>
+	
 	{if !$availableUpdates|count}
 		<div class="border content">
 			<div class="container-1">
-				<p>{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
+				<p class="info">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
 			</div>
 		</div>
 	{else}
 		{foreach from=$availableUpdates item=availableUpdate}
-			<div class="message content"{if $availableUpdate.version.updateType == 'security'} style="border-color: #c00"{/if}>
+			<article class="message content"{if $availableUpdate.version.updateType == 'security'} style="border-color: #c00"{/if}>
 				<div class="messageInner container-{cycle name='styles' values='1,2'}">
-					<h3 class="subHeadline">
+					<h1 class="subHeading">
 						<label>
 							<input onclick="enableFormElements(document.getElementById('version-{@$availableUpdate.packageID}Div'), this.checked)" type="checkbox" name="updates[{@$availableUpdate.packageID}]" value="{$availableUpdate.version.packageVersion}" />
 							{$availableUpdate.packageName}{if $availableUpdate.instanceNo > 1} (#{#$availableUpdate.instanceNo}){/if}
 						</label>
-					</h3>
+					</h1>
 
 					<div class="messageBody">
 						<div class="formElement">
@@ -92,12 +92,12 @@
 
 					<hr />
 				</div>
-			</div>			
+			</article>			
 		{/foreach}
 		
 		<div class="formSubmit">
-			<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 			<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+			<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 			{@SID_INPUT_TAG}
 	 	</div>
 	{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 487834913a..24c1c2994e 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -10,23 +10,23 @@
 	//]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/packageL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.package.list{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.package.list{/lang}</h1>
+	</hgroup>
+</header>
 
 <div class="contentHeader">
 	{pages print=true assign=pagesLinks link="index.php?page=PackageList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
 
 	{if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}
-		<div class="largeButtons">
+		<nav class="largeButtons">
 			<ul>
 				{if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageInstallM.png" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
 				{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 			</ul>
-		</div>
+		</nav>
 	{/if}
 </div>
 
@@ -93,12 +93,12 @@
 	{@$pagesLinks}
 	
 	{if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}
-		<div class="largeButtons">
+		<nav class="largeButtons">
 			<ul>
 				{if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageInstallM.png" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
 				{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 			</ul>
-		</div>
+		</nav>
 	{/if}
 </div>
 
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 40795c9605..f077b20d76 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -1,33 +1,33 @@
 {include file='header'}
 
-{if $packageID == 0}
-	<div class="mainHeadline">
+
+<header class="mainHeading">
+	{if $packageID == 0}
 		<img src="{@RELATIVE_WCF_DIR}icon/packageInstallL.png" alt="" />
-		<div class="headlineContainer">
-			<h2>{lang}wcf.acp.package.startInstall{/lang}</h2>
-		</div>
-	</div>
-{else}
-	<div class="mainHeadline">
+		<hgroup class="headlineContainer">
+			<h1>{lang}wcf.acp.package.startInstall{/lang}</h1>
+		</hgroup>
+	{else}
 		<img src="{@RELATIVE_WCF_DIR}icon/packageUpdateL.png" alt="" />
-		<div class="headlineContainer">
-			<h2>{lang}wcf.acp.package.startUpdate{/lang}</h2>
-		</div>
-	</div>
-{/if}
+		<hgroup class="headlineContainer">
+			<h1>{lang}wcf.acp.package.startUpdate{/lang}</h1>
+		</hgroup>
+	{/if}
+</header>
 
 {if $errorField != ''}
 	<p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			<li><a href="index.php?page=PackageList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageM.png" alt="" /> <span>{lang}wcf.acp.menu.link.package.view{/lang}</span></a></li>
 			{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 		</ul>
-	</div>
+	</nav>
 </div>
+
 <form method="post" action="index.php?form=PackageStartInstall" enctype="multipart/form-data">
 	<div class="border content">
 		<div class="container-1">
@@ -91,8 +91,9 @@
 	</div>
 
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" />
+		
 		{@SID_INPUT_TAG}
  		<input type="hidden" name="action" value="{$action}" />
  		{if $packageID != 0}<input type="hidden" name="activePackageID" value="{@$packageID}" />{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 9e0d915e9b..8daa81deff 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -1,11 +1,11 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/packageUpdateL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.packageUpdate{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.packageUpdate{/lang}</h1>
+	</hgroup>
+</header>
 
 {if $errorField == 'updates'}
 	{if $errorType === 'empty'}
@@ -49,8 +49,8 @@
 		</div>
 		
 		<div class="formSubmit">
-			{if !$errorField}<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />{/if}
 			{*<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />*}
+			{if !$errorField}<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />{/if}
 			{@SID_INPUT_TAG}
 	 		<input type="hidden" name="send" value="1" />
 	 		
@@ -61,5 +61,4 @@
 	</form>
 {/if}
 
-
 {include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index 1a9991eb36..60c6ab7f42 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -37,12 +37,12 @@
 	//]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/packageSearchL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.packageUpdate.search{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.packageUpdate.search{/lang}</h1>
+	</hgroup>
+</header>
 
 {if $errorField != ''}
 	<p class="error">{lang}wcf.acp.packageUpdate.noneAvailable{/lang}</p>
@@ -126,8 +126,8 @@
 		</div>
 		
 		<div class="formSubmit">
-			<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 			<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+			<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 			{@SID_INPUT_TAG}
 	 	</div>
 	</form>
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 16eafd0936..1a56a7dce8 100644
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -1,12 +1,12 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/packageL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{$package->getName()}</h2>
-		<p>{$package->packageDescription}</p>
-	</div>
-</div>
+	<hgroup>
+		<h1>{$package->getName()}</h1>
+		<h2>{$package->packageDescription}</h2>
+	</hgroup>
+</header>
 
 <fieldset>
 	<legend>{lang}wcf.acp.package.view.properties{/lang}</legend>
@@ -81,7 +81,7 @@
 {/foreach}
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			{if PACKAGE_ID != $package->packageID}
 				{if $package->standalone && $package->package != 'com.woltlab.wcf'}<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php?packageID={@$package->packageID}{@SID_ARG_2ND}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageMakeActiveM.png" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>{/if}
@@ -90,7 +90,7 @@
 			{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=update&amp;activePackageID={@$package->packageID}{@SID_ARG_2ND}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateM.png" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>{/if}
 			{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 		</ul>
-	</div>
+	</nav>
 </div>
 
 {if $requiredPackages|count > 0}
@@ -231,4 +231,4 @@
 	</script>
 {/if}
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
index 65e597263e..f5d6c0fe14 100644
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -1,11 +1,11 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/updateServer{@$action|ucfirst}L.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.updateServer.{$action}{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
+	</hgroup>
+</header>
 
 {if $errorField}
 	<p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -20,9 +20,9 @@
 {/if}
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul><li><a href="index.php?page=UpdateServerList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.server.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerM.png" alt="" /> <span>{lang}wcf.acp.menu.link.package.server.view{/lang}</span></a></li></ul>
-	</div>
+	</nav>
 </div>
 <form method="post" action="index.php?form=UpdateServer{@$action|ucfirst}{if $packageUpdateServerID|isset}&amp;packageUpdateServerID={@$packageUpdateServerID}{/if}">
 	<div class="border content">
@@ -88,8 +88,8 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		{@SID_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index 6bfebfeddf..fa9dec31cb 100644
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -9,21 +9,21 @@
 	//]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/updateServerL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.updateServer.view{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.updateServer.view{/lang}</h1>
+	</hgroup>
+</header>
 
 {if $deletedPackageUpdateServerID}
 	<p class="success">{lang}wcf.acp.updateServer.delete.success{/lang}</p>
 {/if}
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
-	</div>
+	</nav>
 </div>
 
 {if !$updateServers|count}
@@ -88,9 +88,9 @@
 		</table>
 	</div>
 	<div class="contentHeader">
-		<div class="largeButtons">
+		<nav class="largeButtons">
 			<ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
-		</div>
+		</nav>
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 368b5f7d4a..646f7fa8aa 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -49,12 +49,12 @@
 	//]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img {if $userID|isset}id="userEdit{@$userID}" {/if}src="{@RELATIVE_WCF_DIR}icon/user{@$action|ucfirst}L.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.user.{@$action}{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.user.{@$action}{/lang}</h1>
+	</hgroup>
+</header>
 
 {if $errorField}
 	<p class="error">{lang}wcf.global.form.error{/lang}</p>
@@ -69,14 +69,15 @@
 {/if}
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			<li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
 			<li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
 			{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 		</ul>
-	</div>
+	</nav>
 </div>
+
 <form method="post" action="index.php?form=User{@$action|ucfirst}">
 	<div class="border content">
 		<div class="container-1">
@@ -184,15 +185,17 @@
 			{if $additionalFields|isset}{@$additionalFields}{/if}
 			
 			{if $optionTree|count || $additionalTabs|isset}
-				<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="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>
 				</div>
@@ -200,7 +203,7 @@
 				{foreach from=$optionTree item=categoryLevel1}
 					<div class="border tabMenuContent hidden" id="{@$categoryLevel1[object]->categoryName}-content">
 						<div class="container-1">
-							<h3 class="subHeadline">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h3>
+							<h3 class="subHeading">{lang}wcf.user.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</h3>
 							
 							{foreach from=$categoryLevel1[categories] item=categoryLevel2}
 								<fieldset>
@@ -250,8 +253,8 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		{@SID_INPUT_TAG}
  		<input type="hidden" name="action" value="{@$action}" />
  		{if $userID|isset}<input type="hidden" name="userID" value="{@$userID}" />{/if}
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index c91ce1d159..1f5d95b902 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -38,20 +38,20 @@
 	//]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/{if $searchID}userSearch{else}users{/if}L.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.user.{if $searchID}search{else}list{/if}{/lang}</h2>
-		<p>{if $searchID}{lang}wcf.acp.user.search.matches{/lang}{else}{lang}wcf.acp.user.list.count{/lang}{/if}</p>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.user.{if $searchID}search{else}list{/if}{/lang}</h1>
+		<h2>{if $searchID}{lang}wcf.acp.user.search.matches{/lang}{else}{lang}wcf.acp.user.list.count{/lang}{/if}</h2>
+	</hgroup>
+</header>
 
 {assign var=encodedURL value=$url|rawurlencode}
 {assign var=encodedAction value=$action|rawurlencode}
 <div class="contentHeader">
 	{pages print=true assign=pagesLinks link="index.php?page=UserList&pageNo=%d&searchID=$searchID&action=$encodedAction&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:SID_ARG_2ND_NOT_ENCODED}
 	
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			{if $__wcf->session->getPermission('admin.user.canAddUser')}
 				<li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userAddM.png" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
@@ -59,7 +59,7 @@
 			<li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
 			{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 		</ul>
-	</div>
+	</nav>
 </div>
 
 <div class="subTabMenu">
@@ -126,10 +126,11 @@
 			</tbody>
 		</table>
 	</div>
+	
 	<div class="contentFooter">
 		{@$pagesLinks} <div id="userEditMarked" class="optionButtons"></div>
 		
-		<div class="largeButtons">
+		<nav class="largeButtons">
 			<ul>
 				{if $__wcf->session->getPermission('admin.user.canAddUser')}
 					<li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userAddM.png" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
@@ -137,11 +138,13 @@
 				<li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
 				{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 			</ul>
-		</div>
+		</nav>
 	</div>
 {else}
 	<div class="border content">
-		<div class="container-1">{lang}wcf.acp.user.search.error.noMatches{/lang}</div>
+		<div class="container-1">
+			<p class="info">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
+		</div>
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 25969b4f17..ebbd9e317a 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -1,9 +1,9 @@
 {include file='header'}
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/emailL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>
+	<hgroup>
+		<h1>
 			{if $action == 'all'}
 				{lang}wcf.acp.user.sendMail.all{/lang}
 			{elseif $action == 'group'}
@@ -11,27 +11,27 @@
 			{else}
 				{lang}wcf.acp.user.sendMail{/lang}
 			{/if}
-		</h2>
-	</div>
-</div>
+		</h1>
+	</hgroup>
+</header>
 
 {if $errorField}
 	<p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			<li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
 			<li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
 			{if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
 		</ul>
-	</div>
+	</nav>
 </div>
+
 <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>
@@ -143,12 +143,12 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="hidden" name="action" value="{@$action}" />
  		{@SID_INPUT_TAG}
  		<input type="hidden" name="userIDs" value="{@$userIDs}" />
  	</div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 23273f57b2..f50c11a063 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -13,12 +13,12 @@
 	//]]>
 </script>
 
-<div class="mainHeadline">
+<header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/userSearchL.png" alt="" />
-	<div class="headlineContainer">
-		<h2>{lang}wcf.acp.user.search{/lang}</h2>
-	</div>
-</div>
+	<hgroup>
+		<h1>{lang}wcf.acp.user.search{/lang}</h1>
+	</hgroup>
+</header>
 
 {if $errorField == 'search'}
 <p class="error">{lang}wcf.acp.user.search.error.noMatches{/lang}</p>
@@ -31,7 +31,7 @@
 {/if*}
 
 <div class="contentHeader">
-	<div class="largeButtons">
+	<nav class="largeButtons">
 		<ul>
 			{if $__wcf->session->getPermission('admin.user.canAddUser')}
 				<li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userAddM.png" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
@@ -39,7 +39,7 @@
 			<li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a>
 			</li>
 		</ul>
-	</div>
+	</nav>
 </div>
 
 <form method="post" action="index.php?form=UserSearch">
@@ -121,13 +121,15 @@
 			
 			{if $additionalFields|isset}{@$additionalFields}{/if}
 			
-			<div class="tabMenu">
-				<ul>
-					{if $optionTree|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}
-					<li id="resultOptions"><a onclick="tabMenu.showSubTabMenu('resultOptions');"><span>{lang}wcf.acp.user.search.display{/lang}</span></a></li>
-				</ul>
-			</div>
+			<nav>
+				<div class="tabMenu">
+					<ul>
+						{if $optionTree|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}
+						<li id="resultOptions"><a onclick="tabMenu.showSubTabMenu('resultOptions');"><span>{lang}wcf.acp.user.search.display{/lang}</span></a></li>
+					</ul>
+				</div>
+			</nav>
 			<div class="subTabMenu">
 				<div class="containerHead"><div> </div></div>
 			</div>
@@ -135,7 +137,7 @@
 			{if $optionTree|count}
 				<div class="border tabMenuContent hidden" id="profile-content">
 					<div class="container-1">
-						<h3 class="subHeadline">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>
+						<h3 class="subHeading">{lang}wcf.acp.user.search.conditions.profile{/lang}</h3>
 						{include file='optionFieldList' langPrefix='wcf.user.option.' options=$optionTree}
 					</div>
 				</div>
@@ -145,7 +147,7 @@
 			
 			<div class="border tabMenuContent hidden" id="resultOptions-content">
 				<div class="container-1">
-					<h3 class="subHeadline">{lang}wcf.acp.user.search.display{/lang}</h3>
+					<h3 class="subHeading">{lang}wcf.acp.user.search.display{/lang}</h3>
 					
 					<fieldset>
 						<legend>{lang}wcf.acp.user.search.display.general{/lang}</legend>
@@ -229,8 +231,8 @@
 	</div>
 	
 	<div class="formSubmit">
-		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		<input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+		<input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
 		{@SID_INPUT_TAG}
  	</div>
 </form>
-- 
2.20.1