diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php
index 0a5efc398..f764c5b2a 100644
--- a/src/Controller/StateBalancesController.php
+++ b/src/Controller/StateBalancesController.php
@@ -23,12 +23,6 @@ class StateBalancesController extends AppController
         //$this->Auth->allow(['add', 'edit']);
         $this->Auth->allow(['overview', 'overviewGdt']);
         $this->loadComponent('JsonRequestClient');
-        $this->set(
-            'naviHierarchy',
-            (new NaviHierarchy())->
-            add(new NaviHierarchyEntry(__('Startseite'), 'Dashboard', 'index', false))->
-            add(new NaviHierarchyEntry(__('Kontoübersicht'), 'StateBalances', 'overview', true))
-        );
     }
     /**
      * Index method
@@ -47,6 +41,12 @@ class StateBalancesController extends AppController
 
     public function overview()
     {
+        $this->set(
+            'naviHierarchy',
+            (new NaviHierarchy())->
+            add(new NaviHierarchyEntry(__('Startseite'), 'Dashboard', 'index', false))->
+            add(new NaviHierarchyEntry(__('Kontoübersicht'), 'StateBalances', 'overview', true))
+        );
         $startTime = microtime(true);
         $this->viewBuilder()->setLayout('frontend');
         $session = $this->getRequest()->getSession();
@@ -88,7 +88,7 @@ class StateBalancesController extends AppController
           //var_dump($sendCoins);
             if ($sendCoins->state_user_id != $user['id']) {
                 array_push($involvedUserIds, intval($sendCoins->state_user_id));
-            } else if ($sendCoins->receiver_user_id != $user['id']) {
+            } elseif ($sendCoins->receiver_user_id != $user['id']) {
                 array_push($involvedUserIds, intval($sendCoins->receiver_user_id));
             }
         }
@@ -140,7 +140,7 @@ class StateBalancesController extends AppController
             if ($sendCoins->state_user_id == $user['id']) {
                 $type = 'send';
                 $otherUser = $involvedUserIndices[$sendCoins->receiver_user_id];
-            } else if ($sendCoins->receiver_user_id == $user['id']) {
+            } elseif ($sendCoins->receiver_user_id == $user['id']) {
                 $type = 'receive';
                 $otherUser = $involvedUserIndices[$sendCoins->state_user_id];
             }
@@ -164,6 +164,12 @@ class StateBalancesController extends AppController
 
     public function overviewGdt()
     {
+        $this->set(
+            'naviHierarchy',
+            (new NaviHierarchy())->
+            add(new NaviHierarchyEntry(__('Startseite'), 'Dashboard', 'index', false))->
+            add(new NaviHierarchyEntry(__('GDT Kontoübersicht'), 'StateBalances', 'overviewGdt', true))
+        );
         $startTime = microtime(true);
         $this->viewBuilder()->setLayout('frontend');
         $session = $this->getRequest()->getSession();
@@ -173,6 +179,42 @@ class StateBalancesController extends AppController
         }
         $user = $session->read('StateUser');
         $requestResult = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'listPerEmailApi');
+        /* Mock */
+        /*
+        $requestResult['state'] = 'success';
+        $requestResult['data'] = array();
+        $requestResult['data']['state'] = 'success';
+        $requestResult['data']['ownEntries'] = array(
+            array(
+                'gdt' => 1000,
+                'email' => 'abc@test.de',
+                'date' => date("d.m.Y"),
+                'comment' => 'blabliblubb',
+                'amount' => 3400,
+                'amount2' => 3400,
+                'factor' => 24,
+                'factor2' => 24,
+            )
+        );
+        $requestResult['data']['connectEntrys'] = array();
+        $requestResult['data']['connectEntrys'][0] = array(
+            'publishersPath' => array('uiarne udiaern duriaend'),
+            'connect' => array(
+                'elopage_transaction' => array(
+                    'email' => 'airen@email.de',
+                ),
+                'gdt_entry' => array(
+                    'gdt' => 300000,
+                    'date' => date("d.m.Y"),
+                    'amount' => 3400,
+                    'amount2' => 3400,
+                    'factor' => 24,
+                    'factor2' => 24,
+                )
+            )
+        );
+        */
+        /* END Mock */
         if ('success' === $requestResult['state'] && 'success' === $requestResult['data']['state']) {
           //var_dump(array_keys($requestResult['data']));
             $ownEntries = $requestResult['data']['ownEntries'];
diff --git a/src/Template/StateBalances/overview_gdt.ctp b/src/Template/StateBalances/overview_gdt.ctp
index cf7cfa29e..fe3d58cf3 100644
--- a/src/Template/StateBalances/overview_gdt.ctp
+++ b/src/Template/StateBalances/overview_gdt.ctp
@@ -24,116 +24,84 @@ function publisherLink($publisher, $the) {
 }
 
 $this->assign('title', __('GDT Kontoübersicht'));
+
+$header = '<h3>' . __('Zur Verfügung: ') . '</h3>';
+if($gdtSum > 0){
+  $header .= '<h2>'.$this->element('printGDT', ['number' => $gdtSum]).'</h2>';
+}
+$this->assign('header', $header);
 ?>
-<div class="row">
-  <div class="col-md-8 equel-grid">
-    <div class="grid">
-      <div class="grid-body py-3">
-        overview
-        <h3><?= __('Zur Verfügung: ') ?></h3>
-        <?php if($gdtSum > 0) : ?>
-          <h2><?= $this->element('printGDT', ['number' => $gdtSum]) ?></h2>
-        <?php endif; ?>
-      </div>
-    </div>
-  </div>
-</div>
 <?php if(isset($ownEntries) && count($ownEntries) > 0) :?>
-<div class="row">
-  <div class="col-md-12 equel-grid">
-    <div class="grid">
-      <div class="grid-body py-3">
-        <p class="card-title ml-n1"><?= __('Eigene Einzahlungen') ?></p>
-      </div>
-      <div class="table-responsive">
-        <table class="table table-hover table-sm">
-          <thead>
-            <tr class="solid-header">
-              <th class="pl-4"><?= __('E-Mail') ?></th>
-              <th><?= __('Datum') ?></th>
-              <th><?= __('Kommentar') ?></th>
-              <th><?= __('Euro') ?></th>
-              <th><?= __('Factor')?></th>
-              <th><?= __('GDT') ?></th>
-            </tr>
-          </thead>
-          <tbody>
-            <?php foreach($ownEntries as $entry) : ?>
-            <tr>
-              <td><?= $entry['email'] ?></td>
-              <td><?= new FrozenTime($entry['date']) ?></td>
-              <td><?= h($entry['comment']) ?></td>
-              <td>
-                  <?= $this->element('printEuro', ['number' => $entry['amount']]); ?>
-                  <?php if($entry['amount2']) echo ' + ' . $this->element('printEuro', ['number' => $entry['amount2']]) ?>
-              </td>
-              <td>
-                <?= $this->Number->format($entry['factor']) ?>
-                <?php if($entry['factor2'] != '1') : ?> x
-                  <?= $this->Number->format($entry['factor2']) ?>
-                <?php endif; ?>
-              </td>
-              <td><?= $this->element('printGDT', ['number' => $entry['gdt']]) ?></td>
-            </tr>
-            <?php endforeach; ?>
-          </tbody>
-        </table>
-      </div>
+<div class="content-list">
+  <p class="content-list-title"><?= __('Eigene Einzahlungen') ?></p>
+  <div class="content-list-table">
+    <div class="row">
+      <div class="cell header-cell c3"><?= __('E-Mail') ?></div>
+      <div class="cell header-cell c3"><?= __('Datum') ?></div>
+      <div class="cell header-cell c0"><?= __('Kommentar') ?></div>
+      <div class="cell header-cell c3"><?= __('Euro') ?></div>
+      <div class="cell header-cell c2"><?= __('Factor')?></div>
+      <div class="cell header-cell c3"><?= __('GDT') ?></div>
     </div>
+    <?php foreach($ownEntries as $entry) : ?>
+    <div class="row">
+      <div class="cell c3"><?= $entry['email'] ?></div>
+      <div class="cell c3"><?= new FrozenTime($entry['date']) ?></div>
+      <div class="cell c0"><?= h($entry['comment']) ?></div>
+      <div class="cell c3">
+        <?= $this->element('printEuro', ['number' => $entry['amount']]); ?>
+        <?php if($entry['amount2']) echo ' + ' . $this->element('printEuro', ['number' => $entry['amount2']]) ?>
+      </div>
+      <div class="cell c2">
+      <?= $this->Number->format($entry['factor']) ?>
+      <?php if($entry['factor2'] != '1') : ?> x
+        <?= $this->Number->format($entry['factor2']) ?>
+      <?php endif; ?>
+      </div>
+      <div class="cell c3"><?= $this->element('printGDT', ['number' => $entry['gdt']]) ?></div>
+    </div>
+    <?php endforeach; ?>
   </div>
 </div>
 <?php endif; ?>
 <?php if(isset($connectEntries) && count($connectEntries) > 0) : ?>
-<div class="row">
-  <div class="col-md-12 equel-grid">
-    <div class="grid">
-      <div class="grid-body py-3">
-        <p class="card-title ml-n1"><?= __('Einzahlungen anderer (Publisherprogramm)') ?></p>
-      </div>
-      <div class="table-responsive">
-        <table class="table table-hover table-sm">
-          <thead>
-            <tr class="solid-header">
-              <!--<th class="pl-4"><?= __('Einzahlender') ?></th>-->
-              <th class="pl-4"><?= __('Datum') ?></th>
-              <th><?= __('Euro') ?></th>
-              <th><?= __('Factor')?></th>
-              <th><?= __('GDT') ?></th>
-            </tr>
-          </thead>
-          <tbody>
-            <?php foreach($connectEntries as $entry) :
-              $elopageTransaction = $entry['connect']['elopage_transaction'];
-              $gdtEntry = $entry['connect']['gdt_entry'];
-              ?>
-              <tr><td colspan="5">
-                    <?= $elopageTransaction['email'] ?>
-                      <?php foreach($entry['publishersPath'] as $c => $publisher) : ?>
-                         ->
-                        <?= publisherLink($publisher, $this) ?>
-                      <?php endforeach; ?>
-                  </td>
-              </tr>
-              <tr>
-                <!--<td><?= h($elopageTransaction['email']) ?></td>-->
-                <td><?= new FrozenTime($gdtEntry['date']) ?></td>
-                <td>
-                    <?= $this->element('printEuro', ['number' => $gdtEntry['amount']]) ?>
-                    <?php if($gdtEntry['amount2']) echo ' + ' . $this->element('printEuro', ['number' => $gdtEntry['amount2']]) ?>
-                </td>
-                <td>
-                  <?= $this->Number->format($gdtEntry['factor']) ?>
-                  <?php if($gdtEntry['factor2'] != '1') : ?> x
-                    <?= $this->Number->format($gdtEntry['factor2']) ?>
-                  <?php endif; ?>
-                </td>
-                <td><?= $this->element('printGDT', ['number' => $gdtEntry['gdt']]) ?></td>
-              </tr>
-            <?php endforeach; ?>
-          </tbody>
-        </table>
-      </div>
+<div class="content-list">
+  <p class="content-list-title"><?= __('Einzahlungen anderer (Publisherprogramm)') ?></p>
+  <div class="content-list-table">
+    <div class="row">
+      <div class="cell header-cell c0"><?= __('Einzahlender') ?></div>
+      <div class="cell header-cell c3"><?= __('Datum') ?></div>
+      <div class="cell header-cell c3"><?= __('Euro') ?></div>
+      <div class="cell header-cell c2"><?= __('Factor')?></div>
+      <div class="cell header-cell c3"><?= __('GDT') ?></div>
     </div>
+    <?php foreach($connectEntries as $entry) :
+      $elopageTransaction = $entry['connect']['elopage_transaction'];
+      $gdtEntry = $entry['connect']['gdt_entry'];
+    ?>
+    <div class="row">
+      <div class="cell c0">
+        <?= $elopageTransaction['email'] ?>
+        <?php foreach($entry['publishersPath'] as $c => $publisher) : ?>
+           ->
+          <?= publisherLink($publisher, $this) ?>
+        <?php endforeach; ?>
+      </div>
+      <!--<div class="cell c0"><?= h($elopageTransaction['email']) ?></div>-->
+      <div class="cell c3"><?= new FrozenTime($gdtEntry['date']) ?></div>
+      <div class="cell c3">
+          <?= $this->element('printEuro', ['number' => $gdtEntry['amount']]) ?>
+          <?php if($gdtEntry['amount2']) echo ' + ' . $this->element('printEuro', ['number' => $gdtEntry['amount2']]) ?>
+      </div>
+      <div class="cell c2">
+        <?= $this->Number->format($gdtEntry['factor']) ?>
+        <?php if($gdtEntry['factor2'] != '1') : ?> x
+          <?= $this->Number->format($gdtEntry['factor2']) ?>
+        <?php endif; ?>
+      </div>
+      <div class="cell c3"><?= $this->element('printGDT', ['number' => $gdtEntry['gdt']]) ?></div>
+    </div>
+    <?php endforeach; ?>
   </div>
 </div>
 <?php endif; ?>