diff --git a/template/New/admin/admin_home.tpl b/template/New/admin/admin_home.tpl
index 9fdc2442..49a66c35 100644
--- a/template/New/admin/admin_home.tpl
+++ b/template/New/admin/admin_home.tpl
@@ -7,7 +7,7 @@
 </section>
 
 <section class="content">
- <div >
+ <div class="row">
     <?php if($easywiModules['gs'] and $pa['roots'] and $statsArray['gameMasterInstalled']>0) { ?>
     <div class="col-xl-3 col-md-6 mb-4">
         <div class="card border-left-primary shadow h-100 py-2">
@@ -413,7 +413,7 @@
     <?php }?>
 
     <?php if($easywiModules['my'] and ($pa['mysql'] or $pa['mysql_settings']) and $statsArray['mysqlMasterInstalled']>0) { ?>
-        <div class="row">
+                     <div class="row">
         <div class="col-xl-3 col-md-6 mb-4">
         <div class="card border-left-primary shadow h-100 py-2">
             <div class="card-body">
@@ -495,18 +495,18 @@
 	
 	
 	<?php if(isset($easywitweets) && $easywitweets) { ?>
-
-        <div class="col-md-4">
+	<div class="row">
+        <div class="col-md-8">
            <ul class="timeline">
                 <div class="card shadow mb-4">
                 <div class="card-header py-3">
 					<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-				 <a class="twitter-timeline" href="https://twitter.com/easy_wi?ref_src=twsrc^tfw">Tweets by easy_wi</a>
+				 <a style="width:100%" class="twitter-timeline" href="https://twitter.com/easy_wi?ref_src=twsrc^tfw">Tweets by easy_wi</a>
                 </div>            
               	</div>
             </ul>
         </div>
-
+    </div>
     <?php } ?>
      <?php if(count($feedArray)>0) { ?>
     <hr>
diff --git a/template/New/admin/admin_settings.tpl b/template/New/admin/admin_settings.tpl
index 487bb8e1..e77c694c 100644
--- a/template/New/admin/admin_settings.tpl
+++ b/template/New/admin/admin_settings.tpl
@@ -3,25 +3,11 @@
     <ol class="breadcrumb">
         <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
         <li class="active"><i class="fa fa-wrench"></i> <?php echo $gsprache->settings;?></li>
-        <div class="col-sm">
-    </div>
-    <div class="col-sm">
-     </div>
-    <div class="col-sm">
-
-      <div class="box box-primary">
-       <div class="box-footer">
-        <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
-       </div>
-      </div>
-
-    </div>
     </ol>
 </section>
 <form role="form" action="admin.php?w=se&amp;r=se" onsubmit="return confirm('<?php echo $gsprache->sure;?>');" method="post">
 <input type="hidden" name="token" value="<?php echo token();?>">
 <input type="hidden" name="action" value="md">
-
 <section class="content">
     <div class="row">
         <div class="col-md-6">
@@ -372,6 +358,14 @@
             </div>
         </div>
     </div>
-    
+    <div class="row">
+     <div class="col-md-12">
+      <div class="box box-primary">
+       <div class="box-footer">
+        <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
+       </div>
+      </div>
+     </div>
+    </div>
 </section>
 </form>
\ No newline at end of file
diff --git a/template/New/admin/admin_settings_email.tpl b/template/New/admin/admin_settings_email.tpl
index d0ea08e1..d2746909 100644
--- a/template/New/admin/admin_settings_email.tpl
+++ b/template/New/admin/admin_settings_email.tpl
@@ -4,16 +4,6 @@
         <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
         <li><a href="admin.php?w=se"><i class="fa fa-wrench"></i> <?php echo $gsprache->settings;?></a></li>
         <li class="active"><i class="fa fa-envelope"></i> E-Mail <?php echo $gsprache->settings;?></li>
-        <div class="col-sm">
-        </div>
-        <div class="col-sm">
-        </div>
-        <div class="col-sm">
-                <div class="box box-primary">
-                    <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
-                </div>
-        </div>
-                 
     </ol>
 </section>
 
@@ -94,6 +84,9 @@
                             <div class="pull-right" id="smtptestresult"></div>
                         </div>
                     </div>
+                    <div class="box-footer">
+                        <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
+                    </div>
                 </div>
             </div>
             <div class="col-md-6">
diff --git a/template/New/admin/admin_settings_imprint.tpl b/template/New/admin/admin_settings_imprint.tpl
index 65e36aa9..70020314 100644
--- a/template/New/admin/admin_settings_imprint.tpl
+++ b/template/New/admin/admin_settings_imprint.tpl
@@ -4,15 +4,6 @@
         <li><a href="admin.php"><i class="fa fa-home"></i> Home</a></li>
         <li><a href="admin.php?w=se"><i class="fa fa-wrench"></i> <?php echo $gsprache->settings;?></a></li>
         <li class="active"><i class="fa fa-legal"></i> <?php echo $gsprache->imprint.' '.$gsprache->settings;?></li>
-        <div class="col-sm">
-        </div>
-        <div class="col-sm">
-        </div>
-        <div class="col-sm">
-                <div class="box box-primary">
-                        <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
-                </div>
-        </div>
     </ol>
 </section>
 
@@ -43,6 +34,10 @@
                         </div>
                         <?php } ?>
                     </div>
+
+                    <div class="box-footer">
+                        <button class="btn btn-primary" id="inputEdit" type="submit"><i class="fa fa-save">&nbsp;<?php echo $gsprache->save;?></i></button>
+                    </div>
                 </form>
             </div>
         </div>