diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php
index a95b15f5d..bc598b06f 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -139,23 +139,27 @@
         
         <div class="card">
           <div class="card-body mb-3">
-            <div class="float-left">
-              <h4 class="header-title">Liste aller Personen & Firmen</h4>
-              <?php if(is_array($filter) && count($filter)): ?>
-              <p class="sub-header">
-                <?php if(array_key_exists("parents_only", $filter) && $filter['parents_only'] == 0): ?>
-                  Zeige alle Personen und Firmen<br />
-                <?php else: ?>
-                  Zeige nur Personen und Firmen ohne Zugehörigkeit an. <a href="<?=self::getUrl("Address", "Index", ['filter' => array_merge($filter, ["parents_only" => 0])])?>">Alle anzeigen</a><br />
+            <div class="row">
+              <div class="col-12">
+              <div class="float-left">
+                <h4 class="header-title">Liste aller Personen & Firmen</h4>
+                <?php if(is_array($filter) && count($filter)): ?>
+                <p class="sub-header">
+                  <?php if(array_key_exists("parents_only", $filter) && $filter['parents_only'] == 0): ?>
+                    Zeige alle Personen und Firmen<br />
+                  <?php else: ?>
+                    Zeige nur Personen und Firmen ohne Zugehörigkeit an. <a href="<?=self::getUrl("Address", "Index", ['filter' => array_merge($filter, ["parents_only" => 0])])?>">Alle anzeigen</a><br />
+                  <?php endif; ?>
+                  <?php if(is_array($filter['addresstype']) && count($filter['addresstype'])): ?>
+                    Gefiltert nach Rolle: <?=implode(", ", $types)?><br />
+                  <?php endif; ?>
+                </p>
                 <?php endif; ?>
-                <?php if(is_array($filter['addresstype']) && count($filter['addresstype'])): ?>
-                  Gefiltert nach Rolle: <?=implode(", ", $types)?><br />
-                <?php endif; ?>
-              </p>
-              <?php endif; ?>
-            </div>
-            <div class="float-right">
-              <a class="btn btn-primary" href="<?=self::getUrl("Address", "add")?>"><i class="fas fa-plus"></i> Neue Person/Firma anlegen</a>
+              </div>
+              <div class="float-right">
+                <a class="btn btn-primary" href="<?=self::getUrl("Address", "add")?>"><i class="fas fa-plus"></i> Neue Person/Firma anlegen</a>
+              </div>
+              </div>
             </div>
             
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
diff --git a/Layout/default/Building/Index.php b/Layout/default/Building/Index.php
index fea46ced9..810f5bb8a 100644
--- a/Layout/default/Building/Index.php
+++ b/Layout/default/Building/Index.php
@@ -120,11 +120,15 @@
         
         <div class="card">
           <div class="card-body mb-3">
-            <div class="float-left">
-              <h4 class="header-title">Liste aller Objekte</h4>
-            </div>
-            <div class="float-right">
-              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Building", "add")?>"><i class="fas fa-plus"></i> Neues Objekt anlegen</a>
+            <div class="row">
+              <div class="col-12">
+                <div class="float-left">
+                  <h4 class="header-title">Liste aller Objekte</h4>
+                </div>
+                <div class="float-right">
+                  <a class="btn btn-primary mb-2" href="<?=self::getUrl("Building", "add")?>"><i class="fas fa-plus"></i> Neues Objekt anlegen</a>
+                </div>
+              </div>
             </div>
             
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
diff --git a/Layout/default/Cpeshipping/Index.php b/Layout/default/Cpeshipping/Index.php
index 423f92b49..bef8918e9 100644
--- a/Layout/default/Cpeshipping/Index.php
+++ b/Layout/default/Cpeshipping/Index.php
@@ -36,7 +36,6 @@
 
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>            
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
-
             
             <form method="post" id="submit-form" action="<?=self::getUrl("Cpeshipping", "save")?>">
               <table class="table table-striped table-hover">
@@ -81,9 +80,10 @@
               </div>
               
             </form>
-            
+            <div class="row cols">
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>            
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+            </div>
             
           </div>
         </div>
diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 126f654eb..8aec82c6d 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -115,7 +115,7 @@
             
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
-            
+
               <?php if(is_array($networks) && count($networks)): ?>
                 <?php foreach($networks as $networkname => $terminations): ?>
                 <?php if(!count($terminations)) continue; ?>
diff --git a/Layout/default/Patching/Index.php b/Layout/default/Patching/Index.php
index b899e4c3c..6dce760bc 100644
--- a/Layout/default/Patching/Index.php
+++ b/Layout/default/Patching/Index.php
@@ -101,9 +101,7 @@
         
         <div class="card">
           <div class="card-body mb-3">
-            <div class="float-left">
-              <h4 class="header-title">Patchungen</h4>
-            </div>
+            <h4 class="header-title">Patchungen</h4>
 
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
diff --git a/Layout/default/Voicenumberblock/Index.php b/Layout/default/Voicenumberblock/Index.php
index 337c76a71..8d693b739 100644
--- a/Layout/default/Voicenumberblock/Index.php
+++ b/Layout/default/Voicenumberblock/Index.php
@@ -80,16 +80,20 @@
         
         <div class="card">
           <div class="card-body mb-3">
-            <div class="float-left">
-              <h4 class="header-title">Rufnummernblöcke</h4>
+            <div class="row">
+              <div class="cols">
+                <div class="float-left">
+                  <h4 class="header-title">Rufnummernblöcke</h4>
+                </div>
+                <div class="float-right">
+                  <a class="btn btn-primary mb-2" href="<?=self::getUrl("Voicenumberblock", "add")?>"><i class="fas fa-plus"></i> Neuen Rufnummernblock anlegen</a>
+                </div>
+              </div>
             </div>
-            <div class="float-right">
-              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Voicenumberblock", "add")?>"><i class="fas fa-plus"></i> Neuen Rufnummernblock anlegen</a>
-            </div>
-            
+
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
-            
+
             <table class="table table-striped table-hover">
               <tr>
                 <th>Name</th>