diff --git a/public/css/vis-timeline.css b/public/css/vis-timeline.css
index dea6884..1bba0b3 100755
--- a/public/css/vis-timeline.css
+++ b/public/css/vis-timeline.css
@@ -26,7 +26,7 @@
   */
 }
 
-/* TODO: get animation working nicely
+/* 
 
 .vis-item {
   -webkit-transition: top .4s ease-in-out;
@@ -134,7 +134,7 @@
   width: 100%;
   height: 1px;
   box-shadow: 0 0 10px rgba(0,0,0,0.8);
-  /* TODO: find a nice way to ensure vis-shadows are drawn on top of items
+  /* 
   z-index: 1;
   */
 }
diff --git a/server/waip.js b/server/waip.js
index cb08485..e6d1fb2 100755
--- a/server/waip.js
+++ b/server/waip.js
@@ -241,8 +241,8 @@ module.exports = function (io, sql, tw, async, app_cfg) {
           
           var nsp_waip = io.of('/waip');
           console.log(JSON.stringify(row));
-          console.log(nsp_waip.sockets.connected[row.socket_id]);
-          //var socket = ;
+          console.log(nsp_waip.connected[row.socket_id]);
+          var socket = nsp_waip.connected[row.socket_id];
           //nsp_waip.to(rooms.room).emit('io.response', rmld_obj);
 
           //io.of('/waip').to(row.socket_id).emit('io.standby', null);
diff --git a/views/includes/master_wachalarm.pug b/views/includes/master_wachalarm.pug
index ff34cd0..649c94f 100644
--- a/views/includes/master_wachalarm.pug
+++ b/views/includes/master_wachalarm.pug
@@ -1,17 +1,17 @@
 #waiptableau.fullheight.row.no-gutters
-  .col-6.h-5.d-flex.align-items-center.py-1.text-dark 
-    button#replay.btn.btn-outline-dark.h-100.py-1.tf_singleline
+  .col-6.h-5.d-flex.align-items-center.py-1.text-muted 
+    button#replay.btn.btn-outline-light.h-100.py-1.tf_singleline
       .ion-md-play-circle
-    button#volume.btn.btn-outline-dark.h-100.mx-1.tf_singleline
+    button#volume.btn.btn-outline-light.h-100.mx-1.tf_singleline
       .ion-md-volume-high
     #date-time
       .tf_singleline -Datum- - -Uhrzeit-  
-  .col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-dark.tf_singleline
+  .col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline
     #wachenname.ion-md-business=data_wache || ' -Wachenname-'
   .col-10.h-15.h-20_ls.pr-3
-    #einsatz_art.h-100.w-100.d-flex.align-items-center.font-weight-bold.p-3.rounded.bg-light.tf_singleline
+    #einsatz_art.h-100.w-100.d-flex.align-items-center.font-weight-bold.p-3.rounded.bg-dark.tf_singleline
       #einsatz_stichwort.ion-md-apps  -Stichwort-
-  .col-2.h-15.h-20_ls.d-flex.align-items-center.justify-content-center.p-3.rounded.bg-light.text-info.tf_singleline
+  .col-2.h-15.h-20_ls.d-flex.align-items-center.justify-content-center.p-3.rounded.bg-dark.text-info.tf_singleline
     #sondersignal.ion-md-apps
   .col-12.col-5_ls.h-35.h-70_ls.pt-3_pt.ptr-3_ls 
     #map.h-100.rounded  
@@ -61,14 +61,26 @@
           | -Ortsteil-
           br
           | -Straße Hsnr-
-      .col-6.h-65.d-flex.align-items-end.justify-content-end.tf_multiline
-          ul#em_alarmiert.list-group
+      //.col-6.h-65.d-flex.align-items-end.justify-content-end
+      .col-6.h-65.d-flex.align-content-end.flex-wrap
+        //div.flex-fill.rounded.bg-secondary.p-2.m-1
+        div.rounded.bg-secondary.d-flex.justify-content-between
+          div.pr-2 FL CB 01/42-01
+          div.p-2.badge.badge-success 2
+        div.rounded.bg-secondary.d-flex.justify-content-between
+          div.pr-2 FL CB 01/42-01
+          div.p-2.badge.badge-success 2
+        div.rounded.bg-secondary.d-flex.justify-content-between
+          div.pr-2 FL CB 01/42-01
+          div.p-2.badge.badge-success 2          
+
+          //ul#em_alarmiert.list-group
             li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 1-
             li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 2-
             li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel n-  
           // TODO: Status mit anzeigen (als .badge.badge-pill)
           // TODO: auflistung vieler Fahrzeuge verbessern. flexfill
-      .col-12.h-5.d-flex.align-items-end.justify-content-center.text-dark.tf_singleline
+      .col-12.h-5.d-flex.align-items-end.justify-content-center.text-muted.tf_singleline
         #em_weitere -weiteres Einsatzmittel 1-, -weiteres Einsatzmittel 2-, -weiteres Einsatzmittel n-
       .col-12.h-20.d-flex.align-items-center.rounded.bg-light.font-weight-bold.text-info.tf_singleline
         #besonderheiten -Besonderheiten-
diff --git a/views/tests/test_wachalarm.pug b/views/tests/test_wachalarm.pug
index ffb99a1..a174683 100644
--- a/views/tests/test_wachalarm.pug
+++ b/views/tests/test_wachalarm.pug
@@ -1,4 +1,4 @@
-extends layout
+extends ../layout
 
 append head
   link(rel='stylesheet', href='/css/ionicons.min.css')
@@ -6,10 +6,9 @@ append head
   link(rel='stylesheet', href='/css/waip.css')
 
 block content
-  include includes/modal_response
   .container-fluid
-    include includes/wachalarm
+    include ../includes/master_wachalarm
   script(src='/js/leaflet.js')
   script(src='/js/textFit.min.js')
-  script(src='/js/waip_client.js')
+  script(src='/js/client_waip.js')