diff --git a/public/css/waip.css b/public/css/waip.css
index 9496762..2468dd5 100644
--- a/public/css/waip.css
+++ b/public/css/waip.css
@@ -24,7 +24,7 @@ body {
 }
 
 .fullheight {
-  height: calc(100vh - 60px - 5rem - 3rem);
+  height: calc(100vh - 60px - 5rem - 2rem);
 }
 
 /*** Anpassungen an Bootstrap ******************/
@@ -205,10 +205,10 @@ audio {
 
 ******/
 
-#em_alarmiert {
+#em_alarmiert, #rmld_container {
   font-size: 1.5vw;
 }
 
 #headline {
-  height: 3rem;
+  height: 2rem;
 }
diff --git a/public/js/client_waip.js b/public/js/client_waip.js
index 7086b19..d325813 100644
--- a/public/js/client_waip.js
+++ b/public/js/client_waip.js
@@ -151,7 +151,7 @@ function do_on_Inactive() {
   $('.navbar').fadeOut('slow');
   $('.footer').fadeOut('slow');
   $('.fullheight').css({
-    height: 'calc(100vh - 2rem)',
+    height: 'calc(100vh - 4rem)',
     cursor: 'none'
   });
   $('body').css({
@@ -173,7 +173,7 @@ function do_on_Active() {
     paddingBottom: '0'
   });
   $('.fullheight').css({
-    height: 'calc(100vh - 60px - 5rem)',
+    height: 'calc(100vh - 60px - 7rem)',
     cursor: 'auto'
   });
   resize_text();
@@ -378,6 +378,8 @@ socket.on('io.new_waip', function (data) {
   console.log(data);
   // Einsatz-ID speichern
   waip_id = data.id;
+  // Alarmzeitsetzen:
+  $('#date-time').html(data.zeitstempel);  
   // Hintergrund der Einsatzart zunächst entfernen
   $('#einsatz_art').removeClass(function (index, className) {
     return (className.match(/(^|\s)bg-\S+/g) || []).join(' ');
diff --git a/views/includes/master_wachalarm.pug b/views/includes/master_wachalarm.pug
index bb40258..65d602e 100644
--- a/views/includes/master_wachalarm.pug
+++ b/views/includes/master_wachalarm.pug
@@ -3,9 +3,9 @@
   .row.no-gutters
     #headline.col-12.d-flex.justify-content-between.py-1.text-muted
       .btn-group.h-100.mr-1
-        label#replay.btn.btn-outline-light
+        label#replay.btn.btn-outline-light.m-0.py-0
           .ion-md-play-circle
-        label#volume.btn.btn-outline-light
+        label#volume.btn.btn-outline-light.m-0.py-0
           .ion-md-volume-high
       #date-time || -Datum- - -Uhrzeit-  
       #wachenname.ion-md-business= data_wache || ' -Wachenname-'
@@ -37,23 +37,23 @@
       .row.no-gutters.h-100.pt-3
         .col-12.h-20.h-100.w-100#rmld_container
           // TODO: Rueckmedlung ohne Rueckmeldung ausbleden
-          .d-flex.fustify-content-between.font-weight-bold
-            .list-group.list-group-horizontal.text-center.w-100
-              .list-group-item.flex-fill.text-success 
+          .d-flex.fustify-content-between.font-weight-bold.h-30
+            .list-group.list-group-horizontal.text-center.w-100.h-100
+              .list-group-item.flex-fill.text-success.py-0
                 a#ek-counter 0
                 a  EK
-              .list-group-item.flex-fill.text-info 
+              .list-group-item.flex-fill.text-info.py-0
                 a#ma-counter 0
                 a  MA
-              .list-group-item.flex-fill.text-light 
+              .list-group-item.flex-fill.text-light.py-0
                 a#fk-counter 0 
                 a  FK
-            .list-group.text-center
-              .list-group-item.border.border-warning.flex-fill.text-warning 
+            .list-group.list-group-horizontal.text-center.h-100
+              .list-group-item.flex-fill.border.border-warning.text-warning.py-0
                 a#agt-counter 0
                 a  AGT
               //a.badge.badge-warning 2 AGT
-          .row
+          .row.h-70
             .col-4#pg-ek.pr-1
               //.progress.mt-1
                   .progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100')