diff --git a/interface/web/dns/lib/lang/de_dns_dmarc.lng b/interface/web/dns/lib/lang/de_dns_dmarc.lng
index ba29e040fd9a202180b80b6d79d51f6ef63a9dcd..4da1b036680d04ea0d818ac26a013f136eeec882 100644
--- a/interface/web/dns/lib/lang/de_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/de_dns_dmarc.lng
@@ -3,7 +3,7 @@ $wb['data_txt'] = 'DMARC Record';
 $wb['domain_txt'] = 'Domain';
 $wb['dmarc_policy_txt'] = 'Mail Empfänger Policy';
 $wb['dmarc_policy_note_txt'] = 'Wie der empfangen Server Mails behandeln soll, bei denen SPF oder DKIM (DMARC) fehlschlägt.';
-$wb['dmarc_policy_none_txt'] = 'gar nicht';
+$wb['dmarc_policy_none_txt'] = 'nur Reports';
 $wb['dmarc_policy_quarantine_txt'] = 'Quarantäne';
 $wb['dmarc_policy_reject_txt'] = 'abweisen';
 $wb['dmarc_rua_txt'] = "'Aggregate Data Reporting' Adresse";
diff --git a/interface/web/dns/templates/dns_dmarc_edit.htm b/interface/web/dns/templates/dns_dmarc_edit.htm
index 422d2594dfc87c55dfa303f207c375e627b068b9..51116bd506c70a8ecea949c10e31cb2a02aa5f06 100644
--- a/interface/web/dns/templates/dns_dmarc_edit.htm
+++ b/interface/web/dns/templates/dns_dmarc_edit.htm
@@ -1,100 +1,163 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+	<h1><tmpl_var name="list_head_txt"></h1>
+</div>
 <p><tmpl_var name="list_desc_txt"></p>
 
-<div class="panel panel_dns_txt">
-    <div class="pnl_formsarea">
-        <fieldset class="inlineLabels">
-            <div class="ctrlHolder">
-                <label for="domain">{tmpl_var name='domain_txt'}</label>
-				<input name="domain" id="domain" value="{tmpl_var name='domain'}" readonly size="30" maxlength="255" type="text" class="textInput" />
-            </div>
-            <div class="ctrlHolder">
-            	<label for="dmarc_policy">{tmpl_var name='dmarc_policy_txt'}</label>
-                <select name="dmarc_policy" id="dmarc_policy" class="selectInput">
-                	{tmpl_var name='dmarc_policy'}
-                </select>
-				{tmpl_var name='dmarc_policy_note_txt'}
+
+        
+            <div class="form-group">
+                <label for="domain" class="col-sm-2 control-label">{tmpl_var name='domain_txt'}</label>
+				<div class="col-sm-3">
+					<input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" readonly class="form-control" />
+				</div>
+			</div>
+            <div class="form-group">
+            	<label for="dmarc_policy" class="col-sm-2 control-label">{tmpl_var name='dmarc_policy_txt'}</label>
+                <div class="col-sm-3">
+					<select name="dmarc_policy" id="dmarc_policy" class="form-control">{tmpl_var name='dmarc_policy'}</select>
+				</div>
+				<div class="col-sm-7 input-sm">
+					{tmpl_var name='dmarc_policy_note_txt'}
+				</div>
             </div>
-			<div class="ctrlHolder">
-				<label for="dmarc_rua">{tmpl_var name='dmarc_rua_txt'}</label>
-				<input name="dmarc_rua" id="dmarc_rua" value="{tmpl_var name='dmarc_rua'}" size="20" maxlength="63" type="text" class="textInput" />
-				{tmpl_var name='dmarc_rua_note_txt'}
+			<div class="form-group">
+				<label for="dmarc_rua" class="col-sm-2 control-label">{tmpl_var name='dmarc_rua_txt'}</label>
+				<div class="col-sm-3">
+					<input type="text" name="dmarc_rua" id="dmarc_rua" value="{tmpl_var name='dmarc_rua'}" class="form-control" />
+				</div>
+				<div class="col-sm-7 input-sm">
+					{tmpl_var name='dmarc_rua_note_txt'}
+				</div>
 			</div>
-			<div class="ctrlHolder">
-				<label for="dmarc_ruf">{tmpl_var name='dmarc_ruf_txt'}</label>
-				<input name="dmarc_ruf" id="dmarc_ruf" value="{tmpl_var name='dmarc_ruf'}" size="20" maxlength="63" type="text" class="textInput" />
-				{tmpl_var name='dmarc_ruf_note_txt'}
+			<div class="form-group">
+				<label for="dmarc_ruf" class="col-sm-2 control-label">{tmpl_var name='dmarc_ruf_txt'}</label>
+				<div class="col-sm-3">
+					<input type="text" name="dmarc_ruf" id="dmarc_ruf" value="{tmpl_var name='dmarc_ruf'}" class="form-control" />
+				</div>
+				<div class="col-sm-7 input-sm">
+					{tmpl_var name='dmarc_ruf_note_txt'}
+				</div>
 			</div>
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='dmarc_fo_txt'}</p>
-                <div class="multiField">
-					<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>{tmpl_var name='dmarc_fo0_txt'}<br>
-					<input type="checkbox" value="1" id="dmarc_fo1" name="dmarc_fo1" {tmpl_var name='dmarc_fo1'}/>{tmpl_var name='dmarc_fo1_txt'}<br>
-					<input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>{tmpl_var name='dmarc_fod_txt'}<br>
-					<input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>{tmpl_var name='dmarc_fos_txt'}
-                </div>
+
+            <div class="form-group">
+				<label class="col-sm-2 control-label">{tmpl_var name='dmarc_fo_txt'}</label>
+				 <div class="col-sm-3">
+					<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>
+				</div>
+				<div class="col-sm-3 input-sm">
+					{tmpl_var name='dmarc_fo0_txt'}
+				</div>
+			</div>
+            <div class="form-group">
+				<label class="col-sm-2 control-label"></label>
+				<div class="col-sm-3">
+					<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo1'}/>
+				</div>
+				<div class="col-sm-3 input-sm">
+					{tmpl_var name='dmarc_fo1_txt'}
+				</div>
+            </div>
+            <div class="form-group">
+				<label class="col-sm-2 control-label"></label>
+				<div class="col-sm-3">
+					<input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>
+				</div>
+				<div class="col-sm-3 input-sm">
+					{tmpl_var name='dmarc_fod_txt'}
+				</div>
             </div>
-            <div class="ctrlHolder">
-            	<label for="dmarc_adkim">{tmpl_var name='dmarc_adkim_txt'}</label>
-                <select name="dmarc_adkim" id="dmarc_adkim" class="selectInput">
-                	{tmpl_var name='dmarc_adkim'}
-                </select>
-				{tmpl_var name='dmarc_adkim_note_txt'}
+            <div class="form-group">
+				<label class="col-sm-2 control-label"></label>
+				<div class="col-sm-3">
+					<input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>
+				</div>
+				<div class="col-sm-3 input-sm">
+					{tmpl_var name='dmarc_fos_txt'}
+				</div>
+            </div>
+
+            <div class="form-group">
+            	<label for="dmarc_adkim" class="col-sm-2 control-label">{tmpl_var name='dmarc_adkim_txt'}</label>
+                <div class="col-sm-3">
+					<select name="dmarc_adkim" id="dmarc_adkim" class="form-control">{tmpl_var name='dmarc_adkim'}</select>
+				</div>
+				<div class="col-sm-7 input-sm">
+					{tmpl_var name='dmarc_adkim_note_txt'}
+				</div>
             </div>
-            <div class="ctrlHolder">
-            	<label for="dmarc_aspf">{tmpl_var name='dmarc_aspf_txt'}</label>
-                <select name="dmarc_aspf" id="dmarc_aspf" class="selectInput">
-                	{tmpl_var name='dmarc_aspf'}
-                </select>
-				{tmpl_var name='dmarc_aspf_note_txt'}
+            <div class="form-group">
+            	<label for="dmarc_aspf" class="col-sm-2 control-label">{tmpl_var name='dmarc_aspf_txt'}</label>
+                <div class="col-sm-3">
+					<select name="dmarc_aspf" id="dmarc_aspf" class="form-control">{tmpl_var name='dmarc_aspf'}</select>
+				</div>
+				<div class="col-sm-7 input-sm">
+					{tmpl_var name='dmarc_aspf_note_txt'}
+				</div>
             </div>
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='dmarc_rf_txt'}</p>
-                <div class="multiField">
-					 <input type="checkbox" value="1" id=dmarc_rf_afrf" name="dmarc_rf_afrf" {tmpl_var name='dmarc_rf_afrf'}/>{tmpl_var name='dmarc_rf_afrf_txt'}<br>
-					<input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>{tmpl_var name='dmarc_rf_iodef_txt'}
+            <div class="form-group">
+                <label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_txt'}</label>
+                 <div class="col-sm-3">
+                    <input type="checkbox" value="1" id="dmarc_rf_afrf" name="dmarc_fo0" {tmpl_var name='dmarc_rf_afrf'}/>
+                </div>
+                <div class="col-sm-3 input-sm">
+                    {tmpl_var name='dmarc_rf_afrf_txt'}
                 </div>
             </div>
-			<div class="ctrlHolder">
-				<label for="dmarc_pct">{tmpl_var name='dmarc_pct_txt'}</label>
-				<input name="dmarc_pct" id="dmarc_pct" value="{tmpl_var name='dmarc_pct'}" size="20" maxlength="63" type="text" class="textInput" />
-				{tmpl_var name='dmarc_pct_note_txt'}
+            <div class="form-group">
+                <label class="col-sm-2 control-label"></label>
+                <div class="col-sm-3">
+                    <input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>
+                </div>
+                <div class="col-sm-3 input-sm">
+                    {tmpl_var name='dmarc_rf_iodef_txt'}
+                </div>
+            </div>
+			<div class="form-group">
+				<label for="dmarc_pct" class="col-sm-2 control-label">{tmpl_var name='dmarc_pct_txt'}</label>
+				<div class="col-sm-3">
+					<input type="text" name="dmarc_pct" id="dmarc_pct" value="{tmpl_var name='dmarc_pct'}" class="form-control" />
+				</div>
+				<div class="col-sm-7 input-sm">
+					{tmpl_var name='dmarc_pct_note_txt'}
+				</div>
 			</div>
-			<div class="ctrlHolder">
-				<label for="dmarc_ri">{tmpl_var name='dmarc_ri_txt'}</label>
-				<input name="dmarc_ri" id="dmarc_ri" value="{tmpl_var name='dmarc_ri'}" size="20" maxlength="63" type="text" class="textInput" />
-				{tmpl_var name='dmarc_ri_note_txt'}
+			<div class="form-group">
+				<label for="dmarc_ri" class="col-sm-2 control-label">{tmpl_var name='dmarc_ri_txt'}</label>
+				<div class="col-sm-3">
+					<input type="text" name="dmarc_ri" id="dmarc_ri" value="{tmpl_var name='dmarc_ri'}" class="form-control" />
+				</div>
+				<div class="col-sm-7 input-sm">
+					{tmpl_var name='dmarc_ri_note_txt'}
+				</div>
 			</div>
-            <div class="ctrlHolder">
-            	<label for="dmarc_sp">{tmpl_var name='dmarc_sp_txt'}</label>
-                <select name="dmarc_sp" id="dmarc_sp" class="selectInput">
-                	{tmpl_var name='dmarc_sp'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
-                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            <div class="form-group">
+            	<label for="dmarc_sp" class="col-sm-2 control-label">{tmpl_var name='dmarc_sp_txt'}</label>
+                <div class="col-sm-3">
+					<select name="dmarc_sp" id="dmarc_sp" class="form-control">{tmpl_var name='dmarc_sp'}</select>
+				</div>
             </div>
+            <div class="form-group">
+                <label for="ttl" class="col-sm-2 control-label">{tmpl_var name='ttl_txt'}</label>
+                <div class="col-sm-3">
+					<input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+				</div>
+			</div>
 
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='active_txt'}</p>
-                <div class="multiField">
-					<input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} / >
+            <div class="form-group">
+                <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
+                <div class="col-sm-3">
+                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/>
                 </div>
             </div>
-        </fieldset>
-            
+
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <input type="hidden" name="zone" value="{tmpl_var name='zone'}" id="zone">
         <input type="hidden" name="type" value="{tmpl_var name='type'}">
         <input type="hidden" name="name" value="{tmpl_var name='name'}">
             </div>
             
-        <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_dmarc_edit.php"><span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-        </div>
-    </div>
-  
-</div>
+        <div class="clear"><div class="right">
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_dmarc_edit.php">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}">{tmpl_var name='btn_cancel_txt'}</button>
+        </div></div>
 
diff --git a/interface/web/dns/templates/dns_spf_edit.htm b/interface/web/dns/templates/dns_spf_edit.htm
index f7b278386036832cce161dba0723e71d45773f63..bc8c1a20e643d01ea64627a5e2aa968126ddc0cd 100644
--- a/interface/web/dns/templates/dns_spf_edit.htm
+++ b/interface/web/dns/templates/dns_spf_edit.htm
@@ -16,11 +16,11 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='spf_mx_txt'}</label>
-                <div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="spf_mx" name="spf_mx" {tmpl_var name = 'spf_mx_active'} /></div>
+                <div class="col-sm-9"><input type="checkbox" value="1" id="spf_mx" name="spf_mx" {tmpl_var name = 'spf_mx_active'} /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='spf_a_txt'}</label>
-                <div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="spf_a" name="spf_a" {tmpl_var name = 'spf_a_active'} /></div>
+                <div class="col-sm-9"><input type="checkbox" value="1" id="spf_a" name="spf_a" {tmpl_var name = 'spf_a_active'} /></div>
             </div>
 			<div class="form-group">
 				<label for="spf_ip" class="col-sm-3 control-label">{tmpl_var name='spf_ip_txt'}</label>
@@ -40,11 +40,13 @@
             <div class="form-group">
                 <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" /></div></div>
-
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
-                <div class="col-sm-9"><input class="form-control" type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} /></div>
+                 <div class="col-sm-9">
+                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/>
+                </div>
             </div>
+
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 35ba0e90ed94c3f4c97ca8cb925bb7edf4ac14b3..f56c27d8787883b8f34ba5e69be85949fde8f51c 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -100,8 +100,8 @@
               <div class="form-group">
                 <label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
                 <div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
-<a href="javascript:setRequest('create')">{tmpl_var name='dkim_generate_txt'}</a>
               </div>
+				<a class="btn btn-default formbutton-default" href="javascript:setRequest('create')" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
 		<div class="form-group">
                 <div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
               </div>