diff --git a/public/js/client_dbrd.js b/public/js/client_dbrd.js
index 714b638..339bee3 100755
--- a/public/js/client_dbrd.js
+++ b/public/js/client_dbrd.js
@@ -374,7 +374,12 @@ socket.on('io.Einsatz', function (data) {
     var flex_div_wa = document.createElement('div');
     flex_div_wa.className = 'd-flex flex-wrap justify-content-between align-items-center';
     flex_div_wa.id = wachen_idstr;
-    table_em.rows[wache_zeile].cells[1].appendChild(flex_div_wa);
+
+    //Flexelement zur Tabelle hinzuefuegen
+    var new_td = document.createElement('td');
+    new_td.appendChild(flex_div_wa);
+    newRow.appendChild(new_td);
+    //table_em.rows[wache_zeile].cells[1].appendChild(flex_div_wa);
     };
     
     //Flex-Element fuer Einsatzmittel erzeugen
@@ -392,7 +397,27 @@ socket.on('io.Einsatz', function (data) {
     
     //Status-Div erzeugen
     var status_div  = document.createElement('div');
-    status_div.className = 'p-2 badge badge-dark';
+    switch (data.einsatzmittel[i].status) {
+      case '1':
+        status_div.className = 'p-2 badge badge-info';
+        break;
+      case '2':
+        status_div.className = 'p-2 badge badge-success';
+        break;
+      case '3':
+        status_div.className = 'p-2 badge badge-warning';
+        break;
+      case '4':
+        status_div.className = 'p-2 badge badge-danger';
+        break;
+      default:
+        status_div.className = 'p-2 badge badge-dark';
+        break;
+    }
+
+
+    
+    
     status_div.innerHTML = data.einsatzmittel[i].status;
 
     //Erzeugte Div zusammensetzen
@@ -525,6 +550,7 @@ th(scope='row') CB FW Cottbus 1
       data.zeitstempel,
       alarm_zeit
     );
+    timeline.customTimes[timeline.customTimes.length - 1].hammer.off("panstart panmove panend");
     timeline.setCustomTimeMarker(markerText, alarm_zeit, false);
     
     // Configuration for the Timeline
diff --git a/views/includes/master_dashboard.pug b/views/includes/master_dashboard.pug
index fba1e81..b2d2906 100755
--- a/views/includes/master_dashboard.pug
+++ b/views/includes/master_dashboard.pug
@@ -176,7 +176,7 @@ style(type='text/css').
                 th(scope='col').text-info.pl-3 Wache
                 th(scope='col').text-info.pl-3 Einsatzmittel
             tbody
-              tr
+              //tr
                 th(scope='row') CB FW Cottbus 1
                 td
                   div.d-flex.flex-wrap.justify-content-between.align-items-center
@@ -195,8 +195,8 @@ style(type='text/css').
                     div.flex-fill.rounded.bg-secondary.p-2.m-1
                       div.d-flex.justify-content-between
                         div.pr-2 FL CB 01/85-01
-                        div.p-2.badge.badge-info 2
-              tr
+                        div.p-2.badge.badge-info 1
+              //tr
                 th(scope='row') CB FW Madlow
                 td 
                   div.d-flex.flex-wrap.justify-content-between.align-items-center