diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index b52faad32..ed1e0c108 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -274,6 +274,8 @@ class AppController extends Controller
       }
       if(isset($returnTable['details'])) {
         $adminErrorEntity->details = $returnTable['details'];
+      } else {
+        $adminErrorEntity->details = __('(Leere Details)');
       }
       if(!$adminErrorTable->save($adminErrorEntity)) {
         $this->Flash->error(__('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink()));
diff --git a/src/Template/AddressTypes/index.ctp b/src/Template/AddressTypes/index.ctp
index 978751be0..8460e08a7 100644
--- a/src/Template/AddressTypes/index.ctp
+++ b/src/Template/AddressTypes/index.ctp
@@ -40,8 +40,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/AdminErrors/index.ctp b/src/Template/AdminErrors/index.ctp
index c5bbf8afd..96e077ce1 100644
--- a/src/Template/AdminErrors/index.ctp
+++ b/src/Template/AdminErrors/index.ctp
@@ -12,44 +12,41 @@
         <li><?= $this->Html->link(__('New State User'), ['controller' => 'StateUsers', 'action' => 'add']) ?></li>
     </ul>
 </nav>
-<div class="adminErrors index large-9 medium-8 columns content">
-    <h3><?= __('Admin Errors') ?></h3>
-    <table cellpadding="0" cellspacing="0">
-        <thead>
-            <tr>
-                <th scope="col"><?= $this->Paginator->sort('id') ?></th>
-                <th scope="col"><?= $this->Paginator->sort('state_user_id') ?></th>
-                <th scope="col"><?= $this->Paginator->sort('controller') ?></th>
-                <th scope="col"><?= $this->Paginator->sort('action') ?></th>
-                <th scope="col"><?= $this->Paginator->sort('state') ?></th>
-                <th scope="col"><?= $this->Paginator->sort('msg') ?></th>
-                <th scope="col"><?= $this->Paginator->sort('details') ?></th>
-                <th scope="col"><?= $this->Paginator->sort('created') ?></th>
-                <th scope="col" class="actions"><?= __('Actions') ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($adminErrors as $adminError): ?>
-            <tr>
-                <td><?= $this->Number->format($adminError->id) ?></td>
-                <td><?= $adminError->has('state_user') ? $this->Html->link($adminError->state_user->id, ['controller' => 'StateUsers', 'action' => 'view', $adminError->state_user->id]) : '' ?></td>
-                <td><?= h($adminError->controller) ?></td>
-                <td><?= h($adminError->action) ?></td>
-                <td><?= h($adminError->state) ?></td>
-                <td><?= h($adminError->msg) ?></td>
-                <td><?= h($adminError->details) ?></td>
-                <td><?= h($adminError->created) ?></td>
-                <td class="actions">
-                    <?= $this->Html->link(__('View'), ['action' => 'view', $adminError->id]) ?>
-                    <?= $this->Html->link(__('Edit'), ['action' => 'edit', $adminError->id]) ?>
-                    <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $adminError->id], ['confirm' => __('Are you sure you want to delete # {0}?', $adminError->id)]) ?>
-                </td>
-            </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <div class="paginator">
-        <ul class="pagination">
+<div class="content-list">
+    <div class="content-list-table">
+        <div class="row">
+            <div class="cell cell-dense header-cell centered c1"><?= $this->Paginator->sort('id') ?></div>
+            <div class="cell cell-dense header-cell c1"><?= $this->Paginator->sort('state_user_id') ?></div>
+            <div class="cell cell-dense header-cell c4"><?= $this->Paginator->sort('controller') ?></div>
+            <div class="cell cell-dense header-cell c2"><?= $this->Paginator->sort('action') ?></div>
+            <div class="cell cell-dense header-cell c2"><?= $this->Paginator->sort('state') ?></div>
+            <div class="cell cell-dense header-cell c0"><?= $this->Paginator->sort('msg') ?></div>
+            <div class="cell cell-dense header-cell c3"><?= $this->Paginator->sort('details') ?></div>
+            <div class="cell cell-dense header-cell c3"><?= $this->Paginator->sort('created') ?></div>
+            <div class="cell cell-dense header-cell c3"><?= __('Actions') ?></div>
+        </div>
+        <?php foreach ($adminErrors as $adminError): ?>
+        <div class="row">
+            <div class="cell cell-dense centered c1"><?= $this->Number->format($adminError->id) ?></div>
+            <div class="cell cell-dense c1"><?= $adminError->has('state_user') ? $this->Html->link($adminError->state_user->id, ['controller' => 'StateUsers', 'action' => 'view', $adminError->state_user->id]) : '' ?></div>
+            <div class="cell cell-dense c4"><?= h($adminError->controller) ?></div>
+            <div class="cell cell-dense c2"><?= h($adminError->action) ?></div>
+            <div class="cell cell-dense c2"><?= h($adminError->state) ?></div>
+            <div class="cell cell-dense c0"><?= h($adminError->msg) ?></div>
+            <div class="cell cell-dense c3"><?= h($adminError->details) ?></div>
+            <div class="cell cell-dense c3"><?= h($adminError->created) ?></div>
+            <div class="cell cell-dense c3">
+                <?= $this->Html->link(__('View'), ['action' => 'view', $adminError->id]) ?>
+                &nbsp;
+                <?= $this->Html->link(__('Edit'), ['action' => 'edit', $adminError->id]) ?>
+                &nbsp;
+                <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $adminError->id], ['confirm' => __('Are you sure you want to delete # {0}?', $adminError->id)]) ?>
+            </div>
+        </div>
+        <?php endforeach; ?>
+    </div>
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/Dashboard/index.ctp b/src/Template/Dashboard/index.ctp
index b46abff94..d5370b1d4 100644
--- a/src/Template/Dashboard/index.ctp
+++ b/src/Template/Dashboard/index.ctp
@@ -53,6 +53,7 @@ $this->assign(
   <div class="content-collection">
     <div class="content-item action-button">
       <i class="material-icons-outlined">redeem</i>
+      <!-- insights / redeem -->
       <?= $this->Html->link(
               __('viele schöpfen'),
               ['controller' => 'TransactionCreations', 'action' => 'createMulti'],
diff --git a/src/Template/Element/Flash/default.ctp b/src/Template/Element/Flash/default.ctp
index 826b3837a..694b244c1 100644
--- a/src/Template/Element/Flash/default.ctp
+++ b/src/Template/Element/Flash/default.ctp
@@ -1,5 +1,5 @@
 <?php
-$class = 'alert-primary';
+$class = '';
 if (!empty($params['class'])) {
     $class .= ' ' . $params['class'];
 }
@@ -8,6 +8,6 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
 }
 ?>
 <!--<div class="<?= h($class) ?>" onclick="this.classList.add('hidden');"><?= $message ?></div>-->
-<div class="alert <?= h($class) ?>" onclick="this.classList.add('hidden')" role="alert">
+<div class="alert <?= h($class) ?>" role="alert">
   <?= $message ?>
 </div>
diff --git a/src/Template/Element/Flash/error.ctp b/src/Template/Element/Flash/error.ctp
index 1e95323d6..65a8fbec3 100644
--- a/src/Template/Element/Flash/error.ctp
+++ b/src/Template/Element/Flash/error.ctp
@@ -4,6 +4,7 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
 }
 ?>
 <!--<div class="message error" onclick="this.classList.add('hidden');"><?= $message ?></div>-->
-<div class="alert alert-danger" role="alert" onclick="this.classList.add('hidden');">
-  <i class="mdi mdi-alert-outline alert-color mdi-2x"></i> <?= $message ?>
+<div class="alert alert-error" role="alert">
+  <i class="material-icons-outlined">report_problem</i>
+  <span><?= $message ?></span>
 </div>
\ No newline at end of file
diff --git a/src/Template/Element/Flash/success.ctp b/src/Template/Element/Flash/success.ctp
index be2ef0852..31a062095 100644
--- a/src/Template/Element/Flash/success.ctp
+++ b/src/Template/Element/Flash/success.ctp
@@ -5,6 +5,6 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
 ?>
 <!--<div class="message success" onclick="this.classList.add('hidden')"><?= $message ?></div>-->
 
-<div class="alert alert-success" onclick="this.classList.add('hidden')" role="alert">
+<div class="alert alert-success" role="alert">
   <b><?= __('Info:') ?></b> <?= $message ?>
 </div>
\ No newline at end of file
diff --git a/src/Template/ElopageBuys/index.ctp b/src/Template/ElopageBuys/index.ctp
index f2e88d97c..4d5ecc1d1 100644
--- a/src/Template/ElopageBuys/index.ctp
+++ b/src/Template/ElopageBuys/index.ctp
@@ -54,8 +54,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/Layout/default.ctp b/src/Template/Layout/default.ctp
index 0324f61eb..4633502df 100644
--- a/src/Template/Layout/default.ctp
+++ b/src/Template/Layout/default.ctp
@@ -33,21 +33,21 @@ $cakeDescription = 'Gradido';
 </head>
 <body>
     <div class="content-default">
-        <div class="content-container info-container">
-            <ul class="nav-horizontal nav-top-smaller">
-                <li><?= $this->html->link(__('Logout'), ['controller' => 'ServerUsers', 'action' => 'logout'])?></li>
-                <li><a target="_blank" href="https://book.cakephp.org/3.0/">Documentation</a></li>
-                <li><a target="_blank" href="https://api.cakephp.org/3.0/">API</a></li>
-            </ul>
-            <h1><a href=""><?= $this->fetch('title') ?></a></h1>
-            <?= $this->Flash->render() ?>
-            <?= $this->fetch('content') ?>
-        </div>
-        <?php if(isset($timeUsed)) : ?>
-        <div class="bottomleft">
-            <?=  round($timeUsed * 1000.0, 4) ?> ms
-        </div>
-        <?php endif;?>
+      <div class="content-container default-container">
+        <ul class="nav-horizontal nav-top-smaller">
+            <li><?= $this->html->link(__('Logout'), ['controller' => 'ServerUsers', 'action' => 'logout'])?></li>
+            <li><a target="_blank" href="https://book.cakephp.org/3.0/">Documentation</a></li>
+            <li><a target="_blank" href="https://api.cakephp.org/3.0/">API</a></li>
+        </ul>
+        <h1><a href=""><?= $this->fetch('title') ?></a></h1>
+        <?= $this->Flash->render() ?>
+        <?= $this->fetch('content') ?>
+      </div>
     </div>
+    <?php if(isset($timeUsed)) : ?>
+    <div class="bottomleft">
+        <?=  round($timeUsed * 1000.0, 4) ?> ms
+    </div>
+    <?php endif;?>
 </body>
 </html>
diff --git a/src/Template/Layout/frontend.ctp b/src/Template/Layout/frontend.ctp
index 53cc71816..c46ca1247 100644
--- a/src/Template/Layout/frontend.ctp
+++ b/src/Template/Layout/frontend.ctp
@@ -57,11 +57,6 @@ $GLOBALS["self"] = $this;
       <div>
         <i class="material-icons-outlined nav-main-button">menu</i>
       </div>
-      <!-- XXX -->
-      <div class="flash-messages">
-        <?= $this->Flash->render() ?>
-      </div>
-      <!-- XXX -->
       <div class="nav-vertical">
         <ul>
         <?= $this->element('navi'); ?>
@@ -70,6 +65,9 @@ $GLOBALS["self"] = $this;
     </div>
     <div class="content">
       <div class="nav-content">
+        <div class="flash-messages" onclick="this.classList.add('hidden')">
+          <?= $this->Flash->render() ?>
+        </div>
         <?= $this->element('navi_center'); ?>
       </div>
       <?php if ($this->fetch('header')): ?>
diff --git a/src/Template/OperatorTypes/index.ctp b/src/Template/OperatorTypes/index.ctp
index 4f5bf65d4..52a49b547 100644
--- a/src/Template/OperatorTypes/index.ctp
+++ b/src/Template/OperatorTypes/index.ctp
@@ -38,8 +38,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/Operators/index.ctp b/src/Template/Operators/index.ctp
index 98328a130..3da9a6afb 100644
--- a/src/Template/Operators/index.ctp
+++ b/src/Template/Operators/index.ctp
@@ -43,8 +43,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/ServerUsers/index.ctp b/src/Template/ServerUsers/index.ctp
index ea505a0ac..a6e14cedc 100644
--- a/src/Template/ServerUsers/index.ctp
+++ b/src/Template/ServerUsers/index.ctp
@@ -46,8 +46,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateBalances/index.ctp b/src/Template/StateBalances/index.ctp
index a4f2c1eff..4b0db06d6 100644
--- a/src/Template/StateBalances/index.ctp
+++ b/src/Template/StateBalances/index.ctp
@@ -41,8 +41,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateBalances/overview.ctp b/src/Template/StateBalances/overview.ctp
index e1d8a4bfb..26e533f08 100644
--- a/src/Template/StateBalances/overview.ctp
+++ b/src/Template/StateBalances/overview.ctp
@@ -30,9 +30,9 @@ $this->assign('header', $header);
     <div class="row">
       <div class="cell header-cell c4"><?= __('Absender') . ' / ' . ('Empfänger') ?></div>
       <div class="cell header-cell c0"><?= __('Verwendungszweck') ?></div>
-      <div class="cell header-cell c2"><?= __('Datum') ?></div>
-      <div class="cell header-cell c2"><?= __('Betrag') ?></div>
-      <div class="cell header-cell c1" title="<?= __('Transaktions Nr.') ?>"><?= __('Nr') ?></div>
+      <div class="cell header-cell c4"><?= __('Datum') ?></div>
+      <div class="cell header-cell c3"><?= __('Betrag') ?></div>
+      <div class="cell header-cell c2" title="<?= __('Transaktions Nr.') ?>"><?= __('Nr') ?></div>
     </div>
     <?php foreach($transactions as $transaction):
       $send = $transaction['type'] == 'send';
@@ -60,18 +60,20 @@ $this->assign('header', $header);
             <?php else : ?>
             <small class="tx-email"><?= $transaction['name'] ?></small>
             <?php endif; ?>
-            <span class=" <?= $cellColorClass ?>">
+            <!-- noch ungeklärt - icon ist nicht aligned -->
+            <div class="cell-icon <?= $cellColorClass ?>">
               <?php if($transaction['type'] == 'creation') : ?>
               <i class="material-icons-outlined orange-color">redeem</i>
+              <!-- insights / redeem -->
                 <?= __('Geschöpft')?>
               <?php elseif($transaction['type'] == 'send') : ?>
-              <i class="material-icons-outlined">arrow_right_alt</i>
+              <i class="material-icons-outlined">arrow_back</i>
                 <?= __('Gesendet') ?>
               <?php elseif($transaction['type'] == 'receive') : ?>
-              <i class="material-icons-outlined">arrow_left_alt</i>
+              <i class="material-icons-outlined">arrow_forward</i>
                 <?= __('Empfangen') ?>
               <?php endif; ?>
-            </span>
+            </div>
           </div>
         </div>
         <div class="cell c0" data-toggle="tooltip" data-placement="bottom" title="<?= $transaction['memo'] ?>">
@@ -81,9 +83,9 @@ $this->assign('header', $header);
           <?= $transaction['memo'] ?>
         <?php endif;?>
         </div>
-        <div class="cell c2"><?= $transaction['date']->nice() ?></div>
-        <div class="cell c2"><?= $this->element('printGradido', ['number' => $balance]) ?></div>
-        <div class="cell c1">
+        <div class="cell c4"><?= $transaction['date']->nice() ?></div>
+        <div class="cell c3"><?= $this->element('printGradido', ['number' => $balance]) ?></div>
+        <div class="cell c2">
           <?= $transaction['transaction_id'] ?>
         </div>
       </div>
diff --git a/src/Template/StateCreated/index.ctp b/src/Template/StateCreated/index.ctp
index 116d5b8ec..64a514b3b 100644
--- a/src/Template/StateCreated/index.ctp
+++ b/src/Template/StateCreated/index.ctp
@@ -48,8 +48,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateErrors/index.ctp b/src/Template/StateErrors/index.ctp
index 2e252ccb5..3f34f449b 100644
--- a/src/Template/StateErrors/index.ctp
+++ b/src/Template/StateErrors/index.ctp
@@ -42,8 +42,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateErrors/show_for_user.ctp b/src/Template/StateErrors/show_for_user.ctp
index 5d8018990..2420571a3 100644
--- a/src/Template/StateErrors/show_for_user.ctp
+++ b/src/Template/StateErrors/show_for_user.ctp
@@ -16,11 +16,13 @@ $this->assign('title', __('Fehlermeldungen'));
 ?>
 <div class="content-list">
   <p class="content-list-title">Fehler</p>
-  <div class="content-list-table error-list">
-    <span class="header-cell">Transaktion Typ</span>
-    <span class="header-cell">Datum</span>
-    <span class="header-cell">Fehler</span>
-    <span class="header-cell">Aktionen</span>
+  <div class="content-list-table">
+    <div class="row">
+      <div class="cell header-cell c2">Transaktion Typ</div>
+      <div class="cell header-cell c2">Datum</div>
+      <div class="cell header-cell c0">Fehler</div>
+      <div class="cell header-cell c1">Aktionen</div>
+    </div>
     <?php foreach($errors as $error) :
       $type = $transactionTypes[$error->transaction_type_id-1];
       $errorMessage = "";
@@ -33,10 +35,17 @@ $this->assign('title', __('Fehlermeldungen'));
         $errorMessage = $error->message_json;
       }
     ?>
-    <span title="<?= $type->text ?>"><?= $type->name ?></span>
-    <span><?= $error->created ?></span>
-    <span><?= $errorMessage ?></span>
-    <span><?= $this->Html->link(__('Delete'), ['action' => 'deleteForUser', $error->id], ['class' => 'grd-form-bn grd-form-bn-discard']) ?></span>
+    <div class="row">
+      <div class="cell c3" title="<?= $type->text ?>"><?= $type->name ?></div>
+      <div class="cell c3"><?= $error->created ?></div>
+      <div class="cell c0"><?= $errorMessage ?></div>
+      <div class="cell c2">
+        <?= $this->Html->link(
+          __('Delete'),
+          ['action' => 'deleteForUser', $error->id],
+          ['class' => 'form-button button-cancel']
+          ) ?></div>
+    </div>
     <?php endforeach; ?>
   </div>
 </div>
diff --git a/src/Template/StateGroupAddresses/index.ctp b/src/Template/StateGroupAddresses/index.ctp
index e149e2382..1d988e9a7 100644
--- a/src/Template/StateGroupAddresses/index.ctp
+++ b/src/Template/StateGroupAddresses/index.ctp
@@ -40,8 +40,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateGroupRelationships/index.ctp b/src/Template/StateGroupRelationships/index.ctp
index ee731e8c7..57fbc4da5 100644
--- a/src/Template/StateGroupRelationships/index.ctp
+++ b/src/Template/StateGroupRelationships/index.ctp
@@ -38,8 +38,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateGroups/index.ctp b/src/Template/StateGroups/index.ctp
index 5881bb99a..a37029ab2 100644
--- a/src/Template/StateGroups/index.ctp
+++ b/src/Template/StateGroups/index.ctp
@@ -44,8 +44,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateRelationshipTypes/index.ctp b/src/Template/StateRelationshipTypes/index.ctp
index 076bb4246..2e44a8d88 100644
--- a/src/Template/StateRelationshipTypes/index.ctp
+++ b/src/Template/StateRelationshipTypes/index.ctp
@@ -36,8 +36,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateUsers/index.ctp b/src/Template/StateUsers/index.ctp
index 78a57a22f..458f18057 100644
--- a/src/Template/StateUsers/index.ctp
+++ b/src/Template/StateUsers/index.ctp
@@ -52,8 +52,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/StateUsers/view.ctp b/src/Template/StateUsers/view.ctp
index 341ba1261..b3616601c 100644
--- a/src/Template/StateUsers/view.ctp
+++ b/src/Template/StateUsers/view.ctp
@@ -4,7 +4,7 @@
  * @var \App\Model\Entity\StateUser $stateUser
  */
 ?>
-<nav class="large-2 medium-3 columns" id="actions-sidebar">
+<nav id="actions-sidebar">
     <ul class="nav-horizontal nav-smaller">
         <li class="heading"><?= __('Actions') ?></li>
         <li><?= $this->Html->link(__('Edit State User'), ['action' => 'edit', $stateUser->id]) ?> </li>
diff --git a/src/Template/TransactionCreations/index.ctp b/src/Template/TransactionCreations/index.ctp
index 6964bd582..d9d156239 100644
--- a/src/Template/TransactionCreations/index.ctp
+++ b/src/Template/TransactionCreations/index.ctp
@@ -42,8 +42,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/TransactionGroupAddaddress/index.ctp b/src/Template/TransactionGroupAddaddress/index.ctp
index 8ddbd56fa..eb3d82084 100644
--- a/src/Template/TransactionGroupAddaddress/index.ctp
+++ b/src/Template/TransactionGroupAddaddress/index.ctp
@@ -40,8 +40,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/TransactionGroupAllowtrades/index.ctp b/src/Template/TransactionGroupAllowtrades/index.ctp
index c63b7f712..07386ccb2 100644
--- a/src/Template/TransactionGroupAllowtrades/index.ctp
+++ b/src/Template/TransactionGroupAllowtrades/index.ctp
@@ -40,8 +40,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/TransactionGroupCreates/index.ctp b/src/Template/TransactionGroupCreates/index.ctp
index 9aa6e0e6c..13aeabf83 100644
--- a/src/Template/TransactionGroupCreates/index.ctp
+++ b/src/Template/TransactionGroupCreates/index.ctp
@@ -42,8 +42,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/TransactionSendCoins/index.ctp b/src/Template/TransactionSendCoins/index.ctp
index c3b279186..a14083c61 100644
--- a/src/Template/TransactionSendCoins/index.ctp
+++ b/src/Template/TransactionSendCoins/index.ctp
@@ -43,8 +43,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/TransactionSignatures/index.ctp b/src/Template/TransactionSignatures/index.ctp
index 30ae7da07..9b8bc2826 100644
--- a/src/Template/TransactionSignatures/index.ctp
+++ b/src/Template/TransactionSignatures/index.ctp
@@ -36,8 +36,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/TransactionTypes/index.ctp b/src/Template/TransactionTypes/index.ctp
index bbf21c3ee..b2248ae4b 100644
--- a/src/Template/TransactionTypes/index.ctp
+++ b/src/Template/TransactionTypes/index.ctp
@@ -38,8 +38,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/src/Template/Transactions/index.ctp b/src/Template/Transactions/index.ctp
index 9294fc25b..25890878a 100644
--- a/src/Template/Transactions/index.ctp
+++ b/src/Template/Transactions/index.ctp
@@ -41,7 +41,7 @@
             <div class="cell"><?= h($transaction->received) ?></div>
         <?php endforeach; ?>
     </div>
-    <div class="paginator">
+    <div>
         <ul class="nav-horizontal pagination">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
diff --git a/src/Template/Users/index.ctp b/src/Template/Users/index.ctp
index cb49cec28..14566ea26 100644
--- a/src/Template/Users/index.ctp
+++ b/src/Template/Users/index.ctp
@@ -46,8 +46,8 @@
             <?php endforeach; ?>
         </tbody>
     </table>
-    <div class="paginator">
-        <ul class="pagination">
+    <div>
+        <ul class="nav-horizontal">
             <?= $this->Paginator->first('<< ' . __('first')) ?>
             <?= $this->Paginator->prev('< ' . __('previous')) ?>
             <?= $this->Paginator->numbers() ?>
diff --git a/webroot/css/grd_styles.css b/webroot/css/grd_styles.css
index 54cd4ffc0..aad33204c 100644
--- a/webroot/css/grd_styles.css
+++ b/webroot/css/grd_styles.css
@@ -231,6 +231,72 @@
   }
 }
 /* Ende @media screen */
+/*
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+*/
+/* ============================================================
+
+  Screen styles for flash messages.
+
+  Datei     :   messages.css
+  Datum     :   30.10.2019, 16:04:16
+  Autor     :   einhornimmond, Christine Slotty
+  Copyright :   Gradio
+
+   ============================================================*/
+@media screen {
+  .flash-messages {
+    width: 30%;
+    position: absolute;
+    top: 57px;
+    left: 241px;
+    text-align: center;
+  }
+  .flash-messages .alert {
+    margin: 0;
+    padding: 1em;
+    vertical-align: middle;
+    border-radius: 5px;
+  }
+  .flash-messages .alert-success {
+    color: #fff !important;
+    background-color: #047006;
+    border: 1px solid #04700675;
+  }
+  .flash-messages .alert-error {
+    color: #fff !important;
+    background-color: red;
+    border: 1px solid rgba(255, 0, 0, 0.5);
+  }
+  .flash-messages .message {
+    padding: 5px;
+  }
+  .flash-messages .success {
+    color: #047006;
+  }
+  .flash-messages .error {
+    color: red;
+  }
+  .flash-messages.hidden {
+    display: none;
+  }
+  /* messages, update flash */
+  .grd-error {
+    color: red;
+    border: 1px solid rgba(255, 0, 0, 0.5);
+    padding: 5px;
+  }
+  .grd-info {
+    border: 1px dotted gray;
+    padding: 5px;
+  }
+  .grd-success {
+    padding: 5px;
+    color: #047006;
+  }
+}
 /* ============================================================
 
   Navigation
@@ -494,6 +560,7 @@
     padding-left: 0;
     margin-bottom: 0;
     list-style: none;
+    z-index: 10;
   }
   .notify {
     display: block;
@@ -643,14 +710,14 @@
     font-family: Roboto, sans-serif;
     font-weight: 500;
     font-size: 1rem;
-    padding-top: 6em;
+    /*padding-top: 2em;*/
     padding-right: 10em;
   }
   /* Center Navigation Top */
   .nav-content {
+    position: relative;
     color: #565656;
     margin: 0 0.25em;
-    margin-bottom: 1em;
   }
   .nav-content-list {
     display: flex;
@@ -679,6 +746,11 @@
   .main-container {
     width: 100%;
   }
+  .default-container {
+    width: 90%;
+    margin: auto;
+    padding: 1em;
+  }
   /* Generic Content */
   .content-region {
     border-bottom: 1px dashed #F5F5F5;
@@ -760,26 +832,37 @@
   }
   .cell {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
     padding: 1em 1.5em;
   }
+  .cell-dense {
+    padding: 0.1em 0.5em;
+  }
+  .centered {
+    justify-content: center;
+  }
   .c0 {
     flex-grow: 5;
   }
   .c1 {
-    width: 80px;
-    flex: 0 0 80px;
+    min-width: 40px;
+    flex: 0 0 40px;
   }
   .c2 {
-    width: 160px;
-    flex: 0 0 160px;
+    min-width: 80px;
+    flex: 0 0 80px;
   }
   .c3 {
-    width: 240px;
-    flex: 0 0 240px;
+    min-width: 160px;
+    flex: 0 0 160px;
   }
   .c4 {
-    width: 320px;
+    min-width: 240px;
+    flex: 0 0 240px;
+  }
+  .c5 {
+    min-width: 320px;
     flex: 0 0 320px;
   }
   .header-cell {
@@ -826,6 +909,13 @@
     font-size: 80%;
     font-weight: 400;
   }
+  /*,
+    .cell-icon .material-icons-outlined */
+  .cell-icon {
+    /*noch ungeklärt - icon ist nicht aligned */
+    /*font-size: 1.25em;*/
+    vertical-align: middle;
+  }
   /* =====================================
         FORM TOP CONTENT (checkTransaction)
        =====================================*/
@@ -966,11 +1056,11 @@ and open the template in the editor.
     box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
   }
   .form-button:hover {
-    color: #fff;
     background-color: #034b04;
     border-color: #023f03;
   }
   .button-cancel {
+    color: #fff !important;
     background-color: #f0825f;
     border-color: #f0825f;
   }
@@ -1182,35 +1272,3 @@ div.grd_modal-footer {
 .grd_modal-footer button:hover {
   background-color: rgba(255, 255, 255, 0.5);
 }
-/*
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-/*
-    Created on : 30.10.2019, 16:04:16
-    Author     : einhornimmond
-*/
-/* messages, update flash */
-.grd-error {
-  color: red;
-  border: 1px solid rgba(255, 0, 0, 0.5);
-  padding: 5px;
-}
-.grd-info {
-  border: 1px dotted gray;
-  padding: 5px;
-}
-.grd-success {
-  padding: 5px;
-  color: #047006;
-}
-.flash-messages .message {
-  padding: 5px;
-}
-.flash-messages .success {
-  color: #047006;
-}
-.flash-messages .error {
-  color: red;
-}
diff --git a/websrc/src/less-files.css b/websrc/src/less-files.css
index 54cd4ffc0..aad33204c 100644
--- a/websrc/src/less-files.css
+++ b/websrc/src/less-files.css
@@ -231,6 +231,72 @@
   }
 }
 /* Ende @media screen */
+/*
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+*/
+/* ============================================================
+
+  Screen styles for flash messages.
+
+  Datei     :   messages.css
+  Datum     :   30.10.2019, 16:04:16
+  Autor     :   einhornimmond, Christine Slotty
+  Copyright :   Gradio
+
+   ============================================================*/
+@media screen {
+  .flash-messages {
+    width: 30%;
+    position: absolute;
+    top: 57px;
+    left: 241px;
+    text-align: center;
+  }
+  .flash-messages .alert {
+    margin: 0;
+    padding: 1em;
+    vertical-align: middle;
+    border-radius: 5px;
+  }
+  .flash-messages .alert-success {
+    color: #fff !important;
+    background-color: #047006;
+    border: 1px solid #04700675;
+  }
+  .flash-messages .alert-error {
+    color: #fff !important;
+    background-color: red;
+    border: 1px solid rgba(255, 0, 0, 0.5);
+  }
+  .flash-messages .message {
+    padding: 5px;
+  }
+  .flash-messages .success {
+    color: #047006;
+  }
+  .flash-messages .error {
+    color: red;
+  }
+  .flash-messages.hidden {
+    display: none;
+  }
+  /* messages, update flash */
+  .grd-error {
+    color: red;
+    border: 1px solid rgba(255, 0, 0, 0.5);
+    padding: 5px;
+  }
+  .grd-info {
+    border: 1px dotted gray;
+    padding: 5px;
+  }
+  .grd-success {
+    padding: 5px;
+    color: #047006;
+  }
+}
 /* ============================================================
 
   Navigation
@@ -494,6 +560,7 @@
     padding-left: 0;
     margin-bottom: 0;
     list-style: none;
+    z-index: 10;
   }
   .notify {
     display: block;
@@ -643,14 +710,14 @@
     font-family: Roboto, sans-serif;
     font-weight: 500;
     font-size: 1rem;
-    padding-top: 6em;
+    /*padding-top: 2em;*/
     padding-right: 10em;
   }
   /* Center Navigation Top */
   .nav-content {
+    position: relative;
     color: #565656;
     margin: 0 0.25em;
-    margin-bottom: 1em;
   }
   .nav-content-list {
     display: flex;
@@ -679,6 +746,11 @@
   .main-container {
     width: 100%;
   }
+  .default-container {
+    width: 90%;
+    margin: auto;
+    padding: 1em;
+  }
   /* Generic Content */
   .content-region {
     border-bottom: 1px dashed #F5F5F5;
@@ -760,26 +832,37 @@
   }
   .cell {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
     padding: 1em 1.5em;
   }
+  .cell-dense {
+    padding: 0.1em 0.5em;
+  }
+  .centered {
+    justify-content: center;
+  }
   .c0 {
     flex-grow: 5;
   }
   .c1 {
-    width: 80px;
-    flex: 0 0 80px;
+    min-width: 40px;
+    flex: 0 0 40px;
   }
   .c2 {
-    width: 160px;
-    flex: 0 0 160px;
+    min-width: 80px;
+    flex: 0 0 80px;
   }
   .c3 {
-    width: 240px;
-    flex: 0 0 240px;
+    min-width: 160px;
+    flex: 0 0 160px;
   }
   .c4 {
-    width: 320px;
+    min-width: 240px;
+    flex: 0 0 240px;
+  }
+  .c5 {
+    min-width: 320px;
     flex: 0 0 320px;
   }
   .header-cell {
@@ -826,6 +909,13 @@
     font-size: 80%;
     font-weight: 400;
   }
+  /*,
+    .cell-icon .material-icons-outlined */
+  .cell-icon {
+    /*noch ungeklärt - icon ist nicht aligned */
+    /*font-size: 1.25em;*/
+    vertical-align: middle;
+  }
   /* =====================================
         FORM TOP CONTENT (checkTransaction)
        =====================================*/
@@ -966,11 +1056,11 @@ and open the template in the editor.
     box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
   }
   .form-button:hover {
-    color: #fff;
     background-color: #034b04;
     border-color: #023f03;
   }
   .button-cancel {
+    color: #fff !important;
     background-color: #f0825f;
     border-color: #f0825f;
   }
@@ -1182,35 +1272,3 @@ div.grd_modal-footer {
 .grd_modal-footer button:hover {
   background-color: rgba(255, 255, 255, 0.5);
 }
-/*
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-/*
-    Created on : 30.10.2019, 16:04:16
-    Author     : einhornimmond
-*/
-/* messages, update flash */
-.grd-error {
-  color: red;
-  border: 1px solid rgba(255, 0, 0, 0.5);
-  padding: 5px;
-}
-.grd-info {
-  border: 1px dotted gray;
-  padding: 5px;
-}
-.grd-success {
-  padding: 5px;
-  color: #047006;
-}
-.flash-messages .message {
-  padding: 5px;
-}
-.flash-messages .success {
-  color: #047006;
-}
-.flash-messages .error {
-  color: red;
-}
diff --git a/websrc/src/less/02-colors.less b/websrc/src/less/02-colors.less
index 3e2df7614..d8fed66da 100644
--- a/websrc/src/less/02-colors.less
+++ b/websrc/src/less/02-colors.less
@@ -22,7 +22,6 @@
 @menu-link-selected: #047006;
 @menu-border-color: #f2f4f5;
 
-
 /* CONTENT */
 @container-background: #fff;
 @container-text: #212529;
@@ -74,15 +73,16 @@
 @print-link-text: #06c;
 @gdt-text: #a27824;
 
-
 /* NOTIFICATION */
 @info-border: gray;
 @success: green;
 @success-background: lightcyan;
 @success-background-hover: lightgreen;
+@alert-color: #fff;
 @error: red;
 @error-border: rgba(255, 0, 0, 0.5);
 @success: #047006;
+@success-border: #04700675;
 @alert: #ff5f66;
 @alert-blink: #ff5f669e;
 @notify: #525c5d;
diff --git a/websrc/src/less/06_messages.less b/websrc/src/less/06_messages.less
new file mode 100644
index 000000000..7275ef5a0
--- /dev/null
+++ b/websrc/src/less/06_messages.less
@@ -0,0 +1,78 @@
+/*
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+*/
+
+/* ============================================================
+
+  Screen styles for flash messages.
+
+  Datei     :   messages.css
+  Datum     :   30.10.2019, 16:04:16
+  Autor     :   einhornimmond, Christine Slotty
+  Copyright :   Gradio
+
+   ============================================================*/
+@media screen {
+  .flash-messages {
+    width: 30%;
+    position: absolute;
+    top: 57px;
+    left: 241px;
+    text-align: center;
+
+    .alert {
+      margin: 0;
+      padding: 1em;
+      vertical-align: middle;
+      border-radius: 5px;
+    }
+
+    .alert-success {
+      color: @alert-color !important;
+      background-color: @success;
+      border: 1px solid @success-border;
+    }
+    .alert-error {
+      color: @alert-color !important;
+      background-color: @error;
+      border: 1px solid @error-border;
+    }
+
+    .message {
+      padding: 5px;
+    }
+
+    .success {
+      color: @success;
+    }
+
+    .error {
+      color: @error;
+    }
+
+  }
+
+  .flash-messages.hidden {
+    display: none;
+  }
+
+  /* messages, update flash */
+  .grd-error {
+    color: @error;
+    border: 1px solid @error-border;
+    padding: 5px;
+  }
+
+  .grd-info {
+    border: 1px dotted @info-border;
+    padding: 5px;
+  }
+
+  .grd-success {
+    padding: 5px;
+    color: @success;
+  }
+
+}
diff --git a/websrc/src/less/09-notification.less b/websrc/src/less/09-notification.less
index 173ac5ad9..d236c23d2 100644
--- a/websrc/src/less/09-notification.less
+++ b/websrc/src/less/09-notification.less
@@ -15,6 +15,7 @@
         padding-left: 0;
         margin-bottom: 0;
         list-style: none;
+        z-index: 10;
     }
 
     .notify {
diff --git a/websrc/src/less/10-center.less b/websrc/src/less/10-center.less
index 7be2e3383..3e92fc012 100644
--- a/websrc/src/less/10-center.less
+++ b/websrc/src/less/10-center.less
@@ -30,8 +30,7 @@
     letter-spacing: @content-letter-spacing;
     font-family: Roboto, sans-serif;
     font-weight: 500;
-    font-size: 1rem;
-    padding-top: 6em;
+    font-size: 1rem;    /*padding-top: 2em;*/
     padding-right: 10em;
   }
 
@@ -44,9 +43,9 @@
 
   /* Center Navigation Top */
   .nav-content {
+    position: relative;
     color: @content-nav;
     margin: 0 .25em;
-    margin-bottom: 1em;
   }
 
   .nav-content-list {
@@ -70,9 +69,6 @@
     margin: 1em .25em;
   }
 
-  .content-default .content-container {
-  }
-
   /* Top Info Above Main */
   .info-container {
     max-width: 70%;
@@ -84,6 +80,12 @@
     width: 100%;
   }
 
+  .default-container {
+    width: 90%;
+    margin: auto;
+    padding: 1em;
+  }
+
   /* Generic Content */
   .content-region {
     border-bottom: 1px dashed @light;
diff --git a/websrc/src/less/20-list.less b/websrc/src/less/20-list.less
index ce177427a..9c8c8f036 100644
--- a/websrc/src/less/20-list.less
+++ b/websrc/src/less/20-list.less
@@ -49,31 +49,45 @@
 
     .cell {
         display: flex;
+        flex-wrap: wrap;
         align-items: center;
         padding: 1em 1.5em;
     }
 
+    .cell-dense {
+        padding: .1em .5em;
+    }
+
+    .centered {
+        justify-content: center;
+    }
+
     .c0 {
         flex-grow: 5;
     }
 
     .c1 {
-        width: 80px;
-        flex: 0 0 80px;
+        min-width: 40px;
+        flex: 0 0 40px;
     }
 
     .c2 {
-        width: 160px;
-        flex: 0 0 160px;
+        min-width: 80px;
+        flex: 0 0 80px;
     }
 
     .c3 {
-        width: 240px;
-        flex: 0 0 240px;
+        min-width: 160px;
+        flex: 0 0 160px;
     }
 
     .c4 {
-        width: 320px;
+        min-width: 240px;
+        flex: 0 0 240px;
+    }
+
+    .c5 {
+        min-width: 320px;
         flex: 0 0 320px;
     }
 
@@ -130,6 +144,16 @@
         font-weight: 400;
     }
 
+    /*,
+    .cell-icon .material-icons-outlined */
+    .cell-icon {
+
+        /*noch ungeklärt - icon ist nicht aligned */
+
+        /*font-size: 1.25em;*/
+        vertical-align: middle;
+    }
+
     /* =====================================
         FORM TOP CONTENT (checkTransaction)
        =====================================*/
diff --git a/websrc/src/less/30-form.less b/websrc/src/less/30-form.less
index 85b7ce766..c1118a36a 100644
--- a/websrc/src/less/30-form.less
+++ b/websrc/src/less/30-form.less
@@ -116,12 +116,12 @@ and open the template in the editor.
   }
 
   .form-button:hover {
-    color: #fff;
     background-color: #034b04;
     border-color: #023f03;
   }
 
   .button-cancel {
+    color: #fff !important;
     background-color: #f0825f;
     border-color: #f0825f;
   }
diff --git a/websrc/src/less/messages.less b/websrc/src/less/messages.less
deleted file mode 100644
index 76f6f211d..000000000
--- a/websrc/src/less/messages.less
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-
-/*
-    Created on : 30.10.2019, 16:04:16
-    Author     : einhornimmond
-*/
-
-/* messages, update flash */
-
-.grd-error {
-  color: @error;
-  border: 1px solid @error-border;
-  padding: 5px;
-}
-
-.grd-info {
-  border: 1px dotted @info-border;
-  padding: 5px;
-}
-
-.grd-success {
-  padding: 5px;
-  color: @success;
-}
-
-.flash-messages {
-  .message {
-    padding: 5px;
-  }
-
-  .success {
-    color: @success;
-  }
-
-  .error {
-    color: @error;
-  }
-
-}