diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 501edaf4d..cf3fee31b 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -613,7 +613,7 @@ class Site extends BaseAdmin
 			'$worker_title'      => DI::l10n()->t('Worker'),
 			'$relay_title'       => DI::l10n()->t('Message Relay'),
 			'$relocate'          => DI::l10n()->t('Relocate Instance'),
-			'$relocate_warning'  => DI::l10n()->t('Warning! Advanced function. Could make this server unreachable.'),
+			'$relocate_warning'  => DI::l10n()->t('<strong>Warning!</strong> Advanced function. Could make this server unreachable.'),
 			'$baseurl'           => DI::baseUrl()->get(true),
 
 			// name, label, value, help string, extra data...
diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index b6d0c5930..cb948aabe 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -1,6 +1,6 @@
 <script>
-	$(function(){
-		$("#cnftheme").click(function(){
+	$(function () {
+		$("#cnftheme").click(function () {
 			document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val());
 			return false;
 		});
@@ -10,143 +10,143 @@
 	<h1>{{$title}} - {{$page}}</h1>
 
 	<form action="{{$baseurl}}/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_input.tpl" field=$sender_email}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_input.tpl" field=$email_banner}}
-	{{include file="field_input.tpl" field=$shortcut_icon}}
-	{{include file="field_input.tpl" field=$touch_icon}}
-	{{include file="field_textarea.tpl" field=$additional_info}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
-	{{include file="field_checkbox.tpl" field=$hide_help}}
-	{{include file="field_select.tpl" field=$singleuser}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		{{include file="field_input.tpl" field=$sitename}}
+		{{include file="field_input.tpl" field=$sender_email}}
+		{{include file="field_textarea.tpl" field=$banner}}
+		{{include file="field_input.tpl" field=$email_banner}}
+		{{include file="field_input.tpl" field=$shortcut_icon}}
+		{{include file="field_input.tpl" field=$touch_icon}}
+		{{include file="field_textarea.tpl" field=$additional_info}}
+		{{include file="field_select.tpl" field=$language}}
+		{{include file="field_select.tpl" field=$theme}}
+		{{include file="field_select.tpl" field=$theme_mobile}}
+		{{include file="field_select.tpl" field=$ssl_policy}}
+		{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
+		{{include file="field_checkbox.tpl" field=$hide_help}}
+		{{include file="field_select.tpl" field=$singleuser}}
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	{{include file="field_input.tpl" field=$daily_registrations}}
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		<h2>{{$registration}}</h2>
+		{{include file="field_input.tpl" field=$register_text}}
+		{{include file="field_select.tpl" field=$register_policy}}
+		{{include file="field_input.tpl" field=$daily_registrations}}
+		{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+		{{include file="field_checkbox.tpl" field=$no_openid}}
+		{{include file="field_checkbox.tpl" field=$no_regfullname}}
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$upload}}</h3>
-	{{include file="field_select.tpl" field=$storagebackend}}
-	{{foreach from=$storageform item=$field}}
-		{{include file=$field.field field=$field}}
-	{{/foreach}}
-	<hr>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		<h2>{{$upload}}</h2>
+		{{include file="field_select.tpl" field=$storagebackend}}
+		{{foreach from=$storageform item=$field}}
+			{{include file=$field.field field=$field}}
+		{{/foreach}}
+		<hr>
+		{{include file="field_input.tpl" field=$maximagesize}}
+		{{include file="field_input.tpl" field=$maximagelength}}
+		{{include file="field_input.tpl" field=$jpegimagequality}}
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_input.tpl" field=$forbidden_nicknames}}
-	{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
-	{{include file="field_input.tpl" field=$allowed_oembed}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_select.tpl" field=$community_page_style}}
-	{{include file="field_input.tpl" field=$max_author_posts_community_page}}
+		<h2>{{$corporate}}</h2>
+		{{include file="field_input.tpl" field=$allowed_sites}}
+		{{include file="field_input.tpl" field=$allowed_email}}
+		{{include file="field_input.tpl" field=$forbidden_nicknames}}
+		{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
+		{{include file="field_input.tpl" field=$allowed_oembed}}
+		{{include file="field_checkbox.tpl" field=$block_public}}
+		{{include file="field_checkbox.tpl" field=$force_publish}}
+		{{include file="field_select.tpl" field=$community_page_style}}
+		{{include file="field_input.tpl" field=$max_author_posts_community_page}}
 
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+		{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
 
-	{{if $diaspora_able}}
-		{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{else}}
-		<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
-			<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
-			<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span>
-		</div>
-	{{/if}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	<div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}" /></div>
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}
-	{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
-	{{include file="field_checkbox.tpl" field=$explicit_content}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		{{if $diaspora_able}}
+			{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+		{{else}}
+			<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
+				<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
+				<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span>
+			</div>
+		{{/if}}
+		{{include file="field_checkbox.tpl" field=$dfrn_only}}
+		{{include file="field_input.tpl" field=$global_directory}}
+		<div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}"/></div>
+		{{include file="field_checkbox.tpl" field=$newuser_private}}
+		{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+		{{include file="field_checkbox.tpl" field=$private_addons}}
+		{{include file="field_checkbox.tpl" field=$disable_embedded}}
+		{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
+		{{include file="field_checkbox.tpl" field=$explicit_content}}
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$advanced}}</h3>
-	{{include file="field_select.tpl" field=$rino}}
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$maxloadavg_frontend}}
-	{{include file="field_input.tpl" field=$optimize_max_tablesize}}
-	{{include file="field_input.tpl" field=$optimize_fragmentation}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	{{include file="field_input.tpl" field=$temppath}}
-	{{include file="field_checkbox.tpl" field=$suppress_tags}}
-	{{include file="field_checkbox.tpl" field=$nodeinfo}}
-	{{include file="field_select.tpl" field=$check_new_version_url}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		<h2>{{$advanced}}</h2>
+		{{include file="field_select.tpl" field=$rino}}
+		{{include file="field_checkbox.tpl" field=$verifyssl}}
+		{{include file="field_input.tpl" field=$proxy}}
+		{{include file="field_input.tpl" field=$proxyuser}}
+		{{include file="field_input.tpl" field=$timeout}}
+		{{include file="field_input.tpl" field=$maxloadavg_frontend}}
+		{{include file="field_input.tpl" field=$optimize_max_tablesize}}
+		{{include file="field_input.tpl" field=$optimize_fragmentation}}
+		{{include file="field_input.tpl" field=$abandon_days}}
+		{{include file="field_input.tpl" field=$temppath}}
+		{{include file="field_checkbox.tpl" field=$suppress_tags}}
+		{{include file="field_checkbox.tpl" field=$nodeinfo}}
+		{{include file="field_select.tpl" field=$check_new_version_url}}
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$portable_contacts}}</h3>
-	{{include file="field_checkbox.tpl" field=$poco_completion}}
-	{{include file="field_select.tpl" field=$gcontact_discovery}}
-	{{include file="field_input.tpl" field=$poco_requery_days}}
-	{{include file="field_select.tpl" field=$poco_discovery}}
-	{{include file="field_select.tpl" field=$poco_discovery_since}}
-	{{include file="field_checkbox.tpl" field=$poco_local_search}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		<h2>{{$portable_contacts}}</h2>
+		{{include file="field_checkbox.tpl" field=$poco_completion}}
+		{{include file="field_select.tpl" field=$gcontact_discovery}}
+		{{include file="field_input.tpl" field=$poco_requery_days}}
+		{{include file="field_select.tpl" field=$poco_discovery}}
+		{{include file="field_select.tpl" field=$poco_discovery_since}}
+		{{include file="field_checkbox.tpl" field=$poco_local_search}}
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$performance}}</h3>
-	{{include file="field_checkbox.tpl" field=$only_tag_search}}
-	{{include file="field_input.tpl" field=$itemcache}}
-	{{include file="field_input.tpl" field=$itemcache_duration}}
-	{{include file="field_input.tpl" field=$max_comments}}
-	{{include file="field_checkbox.tpl" field=$proxy_disabled}}
-	{{include file="field_checkbox.tpl" field=$dbclean}}
-	{{include file="field_input.tpl" field=$dbclean_expire_days}}
-	{{include file="field_input.tpl" field=$dbclean_unclaimed}}
-	{{include file="field_input.tpl" field=$dbclean_expire_conv}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		<h2>{{$performance}}</h2>
+		{{include file="field_checkbox.tpl" field=$only_tag_search}}
+		{{include file="field_input.tpl" field=$itemcache}}
+		{{include file="field_input.tpl" field=$itemcache_duration}}
+		{{include file="field_input.tpl" field=$max_comments}}
+		{{include file="field_checkbox.tpl" field=$proxy_disabled}}
+		{{include file="field_checkbox.tpl" field=$dbclean}}
+		{{include file="field_input.tpl" field=$dbclean_expire_days}}
+		{{include file="field_input.tpl" field=$dbclean_unclaimed}}
+		{{include file="field_input.tpl" field=$dbclean_expire_conv}}
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$worker_title}}</h3>
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$min_memory}}
-	{{include file="field_input.tpl" field=$worker_queues}}
-	{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
-	{{include file="field_checkbox.tpl" field=$worker_fastlane}}
-	{{include file="field_checkbox.tpl" field=$worker_frontend}}
+		<h2>{{$worker_title}}</h2>
+		{{include file="field_input.tpl" field=$maxloadavg}}
+		{{include file="field_input.tpl" field=$min_memory}}
+		{{include file="field_input.tpl" field=$worker_queues}}
+		{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
+		{{include file="field_checkbox.tpl" field=$worker_fastlane}}
+		{{include file="field_checkbox.tpl" field=$worker_frontend}}
 
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
-	<h3>{{$relay_title}}</h3>
-	{{include file="field_checkbox.tpl" field=$relay_subscribe}}
-	{{include file="field_input.tpl" field=$relay_server}}
-	{{include file="field_checkbox.tpl" field=$relay_directly}}
-	{{include file="field_select.tpl" field=$relay_scope}}
-	{{include file="field_input.tpl" field=$relay_server_tags}}
-	{{include file="field_checkbox.tpl" field=$relay_user_tags}}
+		<h2>{{$relay_title}}</h2>
+		{{include file="field_checkbox.tpl" field=$relay_subscribe}}
+		{{include file="field_input.tpl" field=$relay_server}}
+		{{include file="field_checkbox.tpl" field=$relay_directly}}
+		{{include file="field_select.tpl" field=$relay_scope}}
+		{{include file="field_input.tpl" field=$relay_server_tags}}
+		{{include file="field_checkbox.tpl" field=$relay_user_tags}}
 
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 	</form>
 
 	{{* separate form for relocate... *}}
 	<form action="{{$baseurl}}/admin/site" method="post">
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	<h3>{{$relocate}}</h3>
-	<strong>{{$relocate_warning}}</strong>
-	{{include file="field_input.tpl" field=$relocate_url}}
-	<input type="hidden" name="page_site" value="{{$submit}}">
-	<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}" /></div>
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<h2>{{$relocate}}</h2>
+		<p>{{$relocate_warning}}</p>
+		{{include file="field_input.tpl" field=$relocate_url}}
+		<input type="hidden" name="page_site" value="{{$submit}}">
+		<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}"/></div>
 	</form>
 
 </div>
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index 902b8a000..652fe91c3 100644
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -1,4 +1,3 @@
-
 <script>
 	$(function(){
 		$(".collapse").on('show.bs.collapse', function(e) {
@@ -20,38 +19,40 @@
 </script>
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css?v={{$smarty.const.FRIENDICA_VERSION}}" type="text/css" media="screen"/>
 
-<div id='adminpage' class="adminpage generic-page-wrapper">
+<div id="adminpage" class="adminpage generic-page-wrapper">
 	<h1>{{$title}} - {{$page}}</h1>
-	<form action="{{$baseurl}}/admin/site" method="post">
-		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-		<input type='hidden' name='active_panel' value=''>
-		<div class="panel-group panel-group-settings" id="admin-settings" role="tablist" aria-multiselectable="true">
+	<div class="panel-group panel-group-settings" id="admin-settings" role="tablist" aria-multiselectable="true">
+		<form action="{{$baseurl}}/admin/site" method="post">
+			<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+			<input type="hidden" name="active_panel" value="">
 			<!--
 			/*
 			*    General Information
 			*/ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-general">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-general">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-general-collapse" aria-expanded="false" aria-controls="admin-settings-general-collapse">
 							General Information
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-general-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-general">
-					{{include file="field_input.tpl" field=$sitename}}
-					{{include file="field_input.tpl" field=$sender_email}}
-					{{include file="field_textarea.tpl" field=$banner}}
-					{{include file="field_input.tpl" field=$shortcut_icon}}
-					{{include file="field_input.tpl" field=$touch_icon}}
-					{{include file="field_textarea.tpl" field=$additional_info}}
-					{{include file="field_select.tpl" field=$language}}
-					{{include file="field_select.tpl" field=$theme}}
-					{{include file="field_select.tpl" field=$theme_mobile}}
-					{{include file="field_select.tpl" field=$ssl_policy}}
-					{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
-					{{include file="field_checkbox.tpl" field=$hide_help}}
-					{{include file="field_select.tpl" field=$singleuser}}
+					<div class="panel-body">
+						{{include file="field_input.tpl" field=$sitename}}
+						{{include file="field_input.tpl" field=$sender_email}}
+						{{include file="field_textarea.tpl" field=$banner}}
+						{{include file="field_input.tpl" field=$shortcut_icon}}
+						{{include file="field_input.tpl" field=$touch_icon}}
+						{{include file="field_textarea.tpl" field=$additional_info}}
+						{{include file="field_select.tpl" field=$language}}
+						{{include file="field_select.tpl" field=$theme}}
+						{{include file="field_select.tpl" field=$theme_mobile}}
+						{{include file="field_select.tpl" field=$ssl_policy}}
+						{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
+						{{include file="field_checkbox.tpl" field=$hide_help}}
+						{{include file="field_select.tpl" field=$singleuser}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -63,21 +64,22 @@
 			 *    Registration
 			 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-registration">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-registration">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-registration-collapse" aria-expanded="false" aria-controls="admin-settings-registration-collapse">
 							{{$registration}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-registration-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-registration">
-
-					{{include file="field_input.tpl" field=$register_text}}
-					{{include file="field_select.tpl" field=$register_policy}}
-					{{include file="field_input.tpl" field=$daily_registrations}}
-					{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-					{{include file="field_checkbox.tpl" field=$no_openid}}
-					{{include file="field_checkbox.tpl" field=$no_regfullname}}
+					<div class="panel-body">
+						{{include file="field_input.tpl" field=$register_text}}
+						{{include file="field_select.tpl" field=$register_policy}}
+						{{include file="field_input.tpl" field=$daily_registrations}}
+						{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+						{{include file="field_checkbox.tpl" field=$no_openid}}
+						{{include file="field_checkbox.tpl" field=$no_regfullname}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -91,22 +93,24 @@
 				 *    File upload
 				 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-upload">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-upload">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-upload-collapse" aria-expanded="false" aria-controls="admin-settings-upload-collapse">
 							{{$upload}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-upload-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-upload">
-					{{include file="field_select.tpl" field=$storagebackend}}
-					{{foreach from=$storageform item=$field}}
-						{{include file=$field.field field=$field}}
-					{{/foreach}}
-					<hr>
-					{{include file="field_input.tpl" field=$maximagesize}}
-					{{include file="field_input.tpl" field=$maximagelength}}
-					{{include file="field_input.tpl" field=$jpegimagequality}}
+					<div class="panel-body">
+						{{include file="field_select.tpl" field=$storagebackend}}
+						{{foreach from=$storageform item=$field}}
+							{{include file=$field.field field=$field}}
+						{{/foreach}}
+						<hr>
+						{{include file="field_input.tpl" field=$maximagesize}}
+						{{include file="field_input.tpl" field=$maximagelength}}
+						{{include file="field_input.tpl" field=$jpegimagequality}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -119,46 +123,47 @@
 			 *    Corporate
 			 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-corporate">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-corporate">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-corporate-collapse" aria-expanded="false" aria-controls="admin-settings-corporate-collapse">
 							{{$corporate}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-corporate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-corporate">
-					{{include file="field_input.tpl" field=$allowed_sites}}
-					{{include file="field_input.tpl" field=$allowed_email}}
-					{{include file="field_input.tpl" field=$forbidden_nicknames}}
-					{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
-					{{include file="field_input.tpl" field=$allowed_oembed}}
-					{{include file="field_checkbox.tpl" field=$block_public}}
-					{{include file="field_checkbox.tpl" field=$force_publish}}
-					{{include file="field_select.tpl" field=$community_page_style}}
-					{{include file="field_input.tpl" field=$max_author_posts_community_page}}
+					<div class="panel-body">
+						{{include file="field_input.tpl" field=$allowed_sites}}
+						{{include file="field_input.tpl" field=$allowed_email}}
+						{{include file="field_input.tpl" field=$forbidden_nicknames}}
+						{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
+						{{include file="field_input.tpl" field=$allowed_oembed}}
+						{{include file="field_checkbox.tpl" field=$block_public}}
+						{{include file="field_checkbox.tpl" field=$force_publish}}
+						{{include file="field_select.tpl" field=$community_page_style}}
+						{{include file="field_input.tpl" field=$max_author_posts_community_page}}
 
-					{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+						{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
 
-					{{if $diaspora_able}}
-					{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-					{{else}}
-					<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
-						<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
-						<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span>
+						{{if $diaspora_able}}
+							{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+						{{else}}
+							<div class="field checkbox" id="div_id_{{$diaspora_enabled.0}}">
+								<label for="id_{{$diaspora_enabled.0}}">{{$diaspora_enabled.1}}</label>
+								<span id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
+							</div>
+						{{/if}}
+						{{include file="field_checkbox.tpl" field=$dfrn_only}}
+						{{include file="field_input.tpl" field=$global_directory}}
+						<p>
+							<input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>
+						</p>
+						{{include file="field_checkbox.tpl" field=$newuser_private}}
+						{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+						{{include file="field_checkbox.tpl" field=$private_addons}}
+						{{include file="field_checkbox.tpl" field=$disable_embedded}}
+						{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
+						{{include file="field_checkbox.tpl" field=$explicit_content}}
 					</div>
-					{{/if}}
-					{{include file="field_checkbox.tpl" field=$dfrn_only}}
-					{{include file="field_input.tpl" field=$global_directory}}
-					<div class="panel-footer">
-						<input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>
-					</div>
-					{{include file="field_checkbox.tpl" field=$newuser_private}}
-					{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-					{{include file="field_checkbox.tpl" field=$private_addons}}
-					{{include file="field_checkbox.tpl" field=$disable_embedded}}
-					{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
-					{{include file="field_checkbox.tpl" field=$explicit_content}}
-
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -170,28 +175,29 @@
 			 *    Corporate
 			 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-$dvanced">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-$dvanced">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-advanced-collapse" aria-expanded="false" aria-controls="admin-settings-advanced-collapse">
 							{{$advanced}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-advanced-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-advanced">
-
-					{{include file="field_select.tpl" field=$rino}}
-					{{include file="field_checkbox.tpl" field=$verifyssl}}
-					{{include file="field_input.tpl" field=$proxy}}
-					{{include file="field_input.tpl" field=$proxyuser}}
-					{{include file="field_input.tpl" field=$timeout}}
-					{{include file="field_input.tpl" field=$maxloadavg_frontend}}
-					{{include file="field_input.tpl" field=$optimize_max_tablesize}}
-					{{include file="field_input.tpl" field=$optimize_fragmentation}}
-					{{include file="field_input.tpl" field=$abandon_days}}
-					{{include file="field_input.tpl" field=$temppath}}
-					{{include file="field_checkbox.tpl" field=$suppress_tags}}
-					{{include file="field_checkbox.tpl" field=$nodeinfo}}
-					{{include file="field_select.tpl" field=$check_new_version_url}}
+					<div class="panel-body">
+						{{include file="field_select.tpl" field=$rino}}
+						{{include file="field_checkbox.tpl" field=$verifyssl}}
+						{{include file="field_input.tpl" field=$proxy}}
+						{{include file="field_input.tpl" field=$proxyuser}}
+						{{include file="field_input.tpl" field=$timeout}}
+						{{include file="field_input.tpl" field=$maxloadavg_frontend}}
+						{{include file="field_input.tpl" field=$optimize_max_tablesize}}
+						{{include file="field_input.tpl" field=$optimize_fragmentation}}
+						{{include file="field_input.tpl" field=$abandon_days}}
+						{{include file="field_input.tpl" field=$temppath}}
+						{{include file="field_checkbox.tpl" field=$suppress_tags}}
+						{{include file="field_checkbox.tpl" field=$nodeinfo}}
+						{{include file="field_select.tpl" field=$check_new_version_url}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -203,21 +209,22 @@
 			 *    Contact Directory
 			 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-contacts">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-contacts">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-contacts-collapse" aria-expanded="false" aria-controls="admin-settings-contacts-collapse">
 							{{$portable_contacts}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-contacts-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-cocontactsrporate">
-
-					{{include file="field_checkbox.tpl" field=$poco_completion}}
-					{{include file="field_select.tpl" field=$gcontact_discovery}}
-					{{include file="field_input.tpl" field=$poco_requery_days}}
-					{{include file="field_select.tpl" field=$poco_discovery}}
-					{{include file="field_select.tpl" field=$poco_discovery_since}}
-					{{include file="field_checkbox.tpl" field=$poco_local_search}}
+					<div class="panel-body">
+						{{include file="field_checkbox.tpl" field=$poco_completion}}
+						{{include file="field_select.tpl" field=$gcontact_discovery}}
+						{{include file="field_input.tpl" field=$poco_requery_days}}
+						{{include file="field_select.tpl" field=$poco_discovery}}
+						{{include file="field_select.tpl" field=$poco_discovery_since}}
+						{{include file="field_checkbox.tpl" field=$poco_local_search}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -229,24 +236,25 @@
 			 *    Performance
 			 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-performance">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-performance">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-performance-collapse" aria-expanded="false" aria-controls="admin-settings-performance-collapse">
 							{{$performance}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-performance-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-performance">
-
-					{{include file="field_checkbox.tpl" field=$only_tag_search}}
-					{{include file="field_input.tpl" field=$itemcache}}
-					{{include file="field_input.tpl" field=$itemcache_duration}}
-					{{include file="field_input.tpl" field=$max_comments}}
-					{{include file="field_checkbox.tpl" field=$proxy_disabled}}
-					{{include file="field_checkbox.tpl" field=$dbclean}}
-					{{include file="field_input.tpl" field=$dbclean_expire_days}}
-					{{include file="field_input.tpl" field=$dbclean_unclaimed}}
-					{{include file="field_input.tpl" field=$dbclean_expire_conv}}
+					<div class="panel-body">
+						{{include file="field_checkbox.tpl" field=$only_tag_search}}
+						{{include file="field_input.tpl" field=$itemcache}}
+						{{include file="field_input.tpl" field=$itemcache_duration}}
+						{{include file="field_input.tpl" field=$max_comments}}
+						{{include file="field_checkbox.tpl" field=$proxy_disabled}}
+						{{include file="field_checkbox.tpl" field=$dbclean}}
+						{{include file="field_input.tpl" field=$dbclean_expire_days}}
+						{{include file="field_input.tpl" field=$dbclean_unclaimed}}
+						{{include file="field_input.tpl" field=$dbclean_expire_conv}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -258,21 +266,22 @@
 			 *    Worker
 			 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-worker">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-worker">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-worker-collapse" aria-expanded="false" aria-controls="admin-settings-worker-collapse">
 							{{$worker_title}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-worker-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-worker">
-
-					{{include file="field_input.tpl" field=$maxloadavg}}
-					{{include file="field_input.tpl" field=$min_memory}}
-					{{include file="field_input.tpl" field=$worker_queues}}
-					{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
-					{{include file="field_checkbox.tpl" field=$worker_fastlane}}
-					{{include file="field_checkbox.tpl" field=$worker_frontend}}
+					<div class="panel-body">
+						{{include file="field_input.tpl" field=$maxloadavg}}
+						{{include file="field_input.tpl" field=$min_memory}}
+						{{include file="field_input.tpl" field=$worker_queues}}
+						{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
+						{{include file="field_checkbox.tpl" field=$worker_fastlane}}
+						{{include file="field_checkbox.tpl" field=$worker_frontend}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
@@ -284,55 +293,55 @@
 			 *    Relay
 			 */ -->
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="admin-relay-corporate">
-					<h4>
+				<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-relay-corporate">
+					<h2>
 						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relay-collapse" aria-expanded="false" aria-controls="admin-settings-relay-collapse">
 							{{$relay_title}}
 						</a>
-					</h4>
+					</h2>
 				</div>
 				<div id="admin-settings-relay-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relay">
-
-					{{include file="field_checkbox.tpl" field=$relay_subscribe}}
-					{{include file="field_input.tpl" field=$relay_server}}
-					{{include file="field_checkbox.tpl" field=$relay_directly}}
-					{{include file="field_select.tpl" field=$relay_scope}}
-					{{include file="field_input.tpl" field=$relay_server_tags}}
-					{{include file="field_checkbox.tpl" field=$relay_user_tags}}
+					<div class="panel-body">
+						{{include file="field_checkbox.tpl" field=$relay_subscribe}}
+						{{include file="field_input.tpl" field=$relay_server}}
+						{{include file="field_checkbox.tpl" field=$relay_directly}}
+						{{include file="field_select.tpl" field=$relay_scope}}
+						{{include file="field_input.tpl" field=$relay_server_tags}}
+						{{include file="field_checkbox.tpl" field=$relay_user_tags}}
+					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
 					</div>
 				</div>
 			</div>
-	</form>
+		</form>
 
-	<!--
-	/*
-	 *    Relocate
-	 */ -->
-	<div class="panel">
-		<div class="section-subtitle-wrapper" role="tab" id="admin-settings-relocate">
-			<h4>
-				<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relocate-collapse" aria-expanded="false" aria-controls="admin-settings-relocate-collapse">
-					{{$relocate}}
-				</a>
-			</h4>
-		</div>
-		<div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
-			<div class="alert alert-danger alert-dismissible">
-				<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
-				<strong>{{$relocate_warning}}</strong>
+		<!--
+		/*
+		 *    Relocate
+		 */ -->
+		<form class="panel" action="{{$baseurl}}/admin/site" method="post">
+			<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+			<input type="hidden" name="page_site" value="{{$submit}}">
+			<input type="hidden" name="active_panel" value="admin-settings-relocate-collapse">
+			<div class="section-subtitle-wrapper panel-heading" role="tab" id="admin-settings-relocate">
+				<h2>
+					<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relocate-collapse" aria-expanded="false" aria-controls="admin-settings-relocate-collapse">
+						{{$relocate}}
+					</a>
+				</h2>
 			</div>
-			{{* separate form for relocate... *}}
-			<form action="{{$baseurl}}/admin/site" method="post">
-				<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-				{{include file="field_input.tpl" field=$relocate_url}}
-				<input type="hidden" name="page_site" value="{{$submit}}">
-				<input type='hidden' name='active_panel' value='admin-settings-relocate-collapse'>
+			<div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
+				<div class="panel-body">
+					<div class="alert alert-danger alert-dismissible">
+						{{$relocate_warning}}
+					</div>
+					{{include file="field_input.tpl" field=$relocate_url}}
+				</div>
 				<div class="panel-footer">
 					<input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button}}"/>
 				</div>
-			</form>
-		</div>
+			</div>
+		</form>
 	</div>
 </div>