diff --git a/admin/index_m.html b/admin/index_m.html
index 105abb9..794bf41 100644
--- a/admin/index_m.html
+++ b/admin/index_m.html
@@ -825,15 +825,15 @@
     <div class="row">
       <div class="col s12" id="tab-area">
         <ul class="tabs blue lighten-4">
-          <li class="tab"><a href="#tab_settings" class="translate">general</a></li>
-          <li class="tab"><a href="#tab_notifications" class="translate">notifications</a></li>
-          <li class="tab"><a href="#tab_states" class="translate">states</a></li>
-          <li class="tab"><a href="#tab_sayit" class="translate">sayit</a></li>
-          <li class="tab"><a href="#tab_shortcuts" class="translate">shortcuts</a></li>
-          <li class="tab"><a href="#tab_words" class="translate">words</a></li>
-          <li class="tab"><a href="#tab_other_alarms" class="translate">other_alarms</a></li>
-          <li class="tab"><a href="#tab_zones" class="translate">zones</a></li>
-          <li class="tab"><a href="#tab_presence" class="translate">presence</a></li>
+          <li class="tab s2 m2 l2"><a href="#tab_settings" class="translate">general</a></li>
+          <li class="tab s2 m2 l2"><a href="#tab_notifications" class="translate">notifications</a></li>
+          <li class="tab s1 m1 l1"><a href="#tab_states" class="translate">states</a></li>
+          <li class="tab s1 m1 l1"><a href="#tab_sayit" class="translate">sayit</a></li>
+          <li class="tab s1 m1 l1"><a href="#tab_shortcuts" class="translate">shortcuts</a></li>
+          <li class="tab s1 m1 l1"><a href="#tab_words" class="translate">words</a></li>
+          <li class="tab s2 m2 l1"><a href="#tab_other_alarms" class="translate">other_alarms</a></li>
+          <li class="tab s1 m1 l2"><a href="#tab_zones" class="translate">zones</a></li>
+          <li class="tab s1 m1 l1"><a href="#tab_presence" class="translate">presence</a></li>
         </ul>
       </div>
       <div id="tab_settings" class="col s12 page">
@@ -1145,25 +1145,25 @@
               <table class="table-values">
                 <thead>
                   <tr>
-                    <th data-name="enabled" style="background: #174475; width: 50px" data-type="checkbox"
+                    <th data-name="enabled" data-title="active" style="background: #174475; width: 50px" data-type="checkbox"
                       class=" translate">active</th>
-                    <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                    <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID
+                    <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                    <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">Object-ID
                     </th>
                     <th data-buttons="edit" style="background: #174475; width: 40px" class=""></th>
-                    <th data-name="negativ" style="background: #174475; width: 100px" data-type="checkbox"
+                    <th data-name="negativ" data-title="negativ" style="background: #174475; width: 100px" data-type="checkbox"
                       class=" translate">negativ</th>
-                    <th data-name="alarm" style="background: #174475; width: 100px" data-type="checkbox"
+                    <th data-name="alarm" data-title="alarm" style="background: #174475; width: 100px" data-type="checkbox"
                       class=" translate">alarm</th>
-                    <th data-name="delay" style="background: #174475; width: 100px" data-type="checkbox"
+                    <th data-name="delay" data-title="delay"style="background: #174475; width: 100px" data-type="checkbox"
                       class=" translate">delay</th>
-                    <th data-name="leave" style="background: #174475; width: 100px" data-type="checkbox"
+                    <th data-name="leave"  data-title="leave" style="background: #174475; width: 100px" data-type="checkbox"
                       class=" translate">leave</th>
-                    <th data-name="warning" style="background: #174475; width: 100px" data-type="checkbox"
+                    <th data-name="warning" data-title="inside" style="background: #174475; width: 100px" data-type="checkbox"
                       class=" translate">inside</th>
-                    <th data-name="delay_inside" style="background: #174475; width: 100px" data-type="checkbox"
+                    <th data-name="delay_inside" data-title="delay_inside" style="background: #174475; width: 100px" data-type="checkbox"
                       class=" translate">delay_inside</th>
-                    <th data-name="night" style="background: #174475; width: 130px" data-type="checkbox"
+                    <th data-name="night" data-title="notification" style="background: #174475; width: 130px" data-type="checkbox"
                       class=" translate">notification</th>
                     <th data-buttons="delete" style="background: #174475; width: 40px" class=""></th>
                   </tr>
@@ -1205,12 +1205,12 @@
               <table class="table-values">
                 <thead>
                   <tr>
-                    <th data-name="enabled" style="background: #174475; width: 50px" data-type="checkbox"
+                    <th data-name="enabled" data-title="active" style="background: #174475; width: 50px" data-type="checkbox"
                       class=" translate">active</th>
-                    <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                    <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID
+                    <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                    <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">Object-ID
                     </th>
-                    <th data-name="speech_delay" style="background: #174475" data-type="number" class=" translate">
+                    <th data-name="speech_delay" data-title="speech_delay" style="background: #174475" data-type="number" class=" translate">
                       speech_delay</th>
                     <th data-buttons="edit" style="background: #174475; width: 40px" class=""></th>
                     <th data-name="opt_say_one" style="background: #174475; width: 40px" data-type="checkbox" class="">1
@@ -1379,19 +1379,19 @@
               <table class="table-values">
                 <thead>
                   <tr>
-                    <th data-name="enabled" style="background: #174475; width: 50px" data-type="checkbox"
+                    <th data-name="enabled" data-title="active" style="background: #174475; width: 50px" data-type="checkbox"
                       class=" translate">active</th>
-                    <th data-name="select_id" style="background: #174475" data-type="select"
+                    <th data-name="select_id" data-title="Name" style="background: #174475" data-type="select"
                       data-options="status.state_list;status.activated;status.gets_activated;status.deactivated;status.burglar_alarm;status.silent_alarm;status.siren;status.activation_failed;status.sleep;status.activated_with_warnings;status.enableable;status.sharp_inside_activated;status.siren_inside;info.notification_circuit_changes;status.alarm_flash;status.silent_flash;other_alarms.one_changes;other_alarms.two_changes"
                       class=" translate">Name</th>
-                    <th data-name="trigger_val" style="background: #174475" data-type="select"
+                    <th data-name="trigger_val" data-title="Trigger" style="background: #174475" data-type="select"
                       data-options=" ;true;false;deactivated;sharp;sharp_inside;burglary;night_rest;gets_activated;activation_failed;activation_aborted;silent_alarm"
                       class=" translate">Trigger</th>
-                    <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                    <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID
+                    <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                    <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">Object-ID
                     </th>
                     <th data-buttons="edit" style="background: #174475; width: 40px" class=" translate"></th>
-                    <th data-name="value" style="background: #174475" class=" translate">values</th>
+                    <th data-name="value" data-title="values" style="background: #174475" class=" translate">values</th>
                     <th data-buttons="delete" style="background: #174475; width: 40px" class=" translate"></th>
                   </tr>
                 </thead>
@@ -1416,16 +1416,16 @@
               <table class="table-values">
                 <thead>
                   <tr>
-                    <th data-name="enabled" style="width: 50px; background: #174475" data-type="checkbox"
+                    <th data-name="enabled" data-title="active" style="width: 50px; background: #174475" data-type="checkbox"
                       class=" translate">active</th>
-                    <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                    <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID
+                    <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                    <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">Object-ID
                     </th>
                     <th data-buttons="edit" style="width: 40px; background: #174475" class=" translate"></th>
-                    <th data-name="trigger_val" style="width: 80px; background: #174475" data-type="select"
+                    <th data-name="trigger_val" data-title="Trigger" style="width: 80px; background: #174475" data-type="select"
                       data-options="any;ne" class=" translate">Trigger</th>
-                    <th data-name="value" style="background: #174475" class=" translate">trigger_values</th>
-                    <th data-name="select_id" style="background: #174475" data-type="select"
+                    <th data-name="value" data-title="trigger_values" style="background: #174475" class=" translate">trigger_values</th>
+                    <th data-name="select_id" data-title="Name" style="background: #174475" data-type="select"
                       data-options="use.activate_nightrest;use.activate_sharp_inside;use.disable;use.enable;use.enable_with_delay;use.panic;use.quit_changes"
                       class=" translate">Name</th>
                     <th data-buttons="delete" style="width: 40px; background: #174475" class=" translate"></th>
@@ -1575,13 +1575,13 @@
                 <table class="table-values">
                   <thead>
                     <tr>
-                      <th data-name="enabled" style="width: 50px; background: #174475" data-type="checkbox"
+                      <th data-name="enabled" data-title="active" style="width: 50px; background: #174475" data-type="checkbox"
                         class=" translate">active</th>
-                      <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                      <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">
+                      <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                      <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">
                         Object-ID
                       </th>
-                      <th data-name="negativ" style="width: 100px; background: #174475" data-type="checkbox"
+                      <th data-name="negativ" data-title="negativ" style="width: 100px; background: #174475" data-type="checkbox"
                         class=" translate">negativ</th>
                       <th data-buttons="edit" style="width: 40px; background: #174475" class=" translate"></th>
                       <th data-buttons="delete" style="width: 40px; background: #174475" class=" translate"></th>
@@ -1611,13 +1611,13 @@
                 <table class="table-values">
                   <thead>
                     <tr>
-                      <th data-name="enabled" style="background: #174475; width: 50px" data-type="checkbox"
+                      <th data-name="enabled" data-title="active" style="background: #174475; width: 50px" data-type="checkbox"
                         class=" translate">active</th>
-                      <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                      <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">
+                      <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                      <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">
                         Object-ID
                       </th>
-                      <th data-name="negativ" style="background: #174475; width: 100px" data-type="checkbox"
+                      <th data-name="negativ" data-title="negativ" style="background: #174475; width: 100px" data-type="checkbox"
                         class=" translate">negativ</th>
                       <th data-buttons="edit" style="background: #174475; width: 40px" class=" translate"></th>
                       <th data-buttons="delete" style="background: #174475; width: 40px" class=" translate"></th>
@@ -1647,13 +1647,13 @@
             <table class="table-values">
               <thead>
                 <tr>
-                  <th data-name="enabled" style="background: #174475; width: 50px" data-type="checkbox"
+                  <th data-name="enabled" data-title="active" style="background: #174475; width: 50px" data-type="checkbox"
                     class=" translate">active</th>
-                  <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                  <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID
+                  <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                  <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">Object-ID
                   </th>
                   <th data-buttons="edit" style="background: #174475; width: 40px" class=""></th>
-                  <th data-name="negativ" style="background: #174475; width: 100px" data-type="checkbox"
+                  <th data-name="negativ" data-title="negativ" style="background: #174475; width: 100px" data-type="checkbox"
                     class=" translate">negativ</th>
                   <th data-buttons="delete" style="background: #174475; width: 40px" class=""></th>
                 </tr>
@@ -1678,13 +1678,13 @@
             <table class="table-values">
               <thead>
                 <tr>
-                  <th data-name="enabled" style="background: #174475; width: 50px" data-type="checkbox"
+                  <th data-name="enabled" data-title="active" style="background: #174475; width: 50px" data-type="checkbox"
                     class=" translate">active</th>
-                  <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                  <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID
+                  <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                  <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">Object-ID
                   </th>
                   <th data-buttons="edit" style="background: #174475; width: 40px" class=""></th>
-                  <th data-name="negativ" style="background: #174475; width: 100px" data-type="checkbox"
+                  <th data-name="negativ" data-title="negativ" style="background: #174475; width: 100px" data-type="checkbox"
                     class=" translate">negativ</th>
                   <th data-buttons="delete" style="background: #174475; width: 40px" class=""></th>
                 </tr>
@@ -1709,13 +1709,13 @@
             <table class="table-values">
               <thead>
                 <tr>
-                  <th data-name="enabled" style="background: #174475; width: 50px" data-type="checkbox"
+                  <th data-name="enabled" data-title="active" style="background: #174475; width: 50px" data-type="checkbox"
                     class=" translate">active</th>
-                  <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
-                  <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID
+                  <th data-name="name" data-title="Name" style="background: #174475" data-type="text" class=" translate">Name</th>
+                  <th data-name="name_id" data-title="Object-ID" style="background: #174475" data-type="text" class=" translate">Object-ID
                   </th>
                   <th data-buttons="edit" style="background: #174475; width: 40px" class=""></th>
-                  <th data-name="negativ" style="background: #174475; width: 100px" data-type="checkbox"
+                  <th data-name="negativ" data-title="negativ" style="background: #174475; width: 100px" data-type="checkbox"
                     class=" translate">negativ</th>
                   <th data-buttons="delete" style="background: #174475; width: 40px" class=""></th>
                 </tr>
@@ -1755,10 +1755,10 @@
               <table class="table-values">
                 <thead>
                   <tr>
-                    <th data-name="enabled" style="width: 50px; background: #174475" data-type="checkbox"
+                    <th data-name="enabled" data-title="active" style="width: 50px; background: #174475" data-type="checkbox"
                       class="translate">active</th>
-                    <th data-name="name" data-type="text" style="background: #174475" class="translate">Name</th>
-                    <th data-name="name_id" data-type="text" style="background: #174475" class="translate">Object-ID
+                    <th data-name="name" data-title="Name" data-type="text" style="background: #174475" class="translate">Name</th>
+                    <th data-name="name_id" data-title="Object-ID" data-type="text" style="background: #174475" class="translate">Object-ID
                     </th>
                     <th data-buttons="edit2" style="width: 150px; background: #174475; height: 40px"
                       data-style="width: 150px; text-align: left"></th>
diff --git a/admin/style.css b/admin/style.css
index 1efe8ef..444ec73 100644
--- a/admin/style.css
+++ b/admin/style.css
@@ -2,6 +2,7 @@
 * {
     box-sizing: border-box
 }
+
 .m {
     /* Don't cut off dropdowns! 
     overflow: initial;*/
@@ -10,31 +11,94 @@
 
 /* Add your styles here */
 /* Header section*/
-#header-area {margin-top: 2px; margin-bottom: 1px; background-color:#174475;}
-#header-area #header-logo-title .logo {float:left; margin-right: 10px;}
-#header-area #header-logo-title p {line-height: normal !important; margin: 0 !important; padding: 8px 0 0 8px;}
-#header-area #header-logo-title p>span.h-title {font-size: 2em !important; color:white; }
-#header-area #header-logo-title p>span.h-sub-title {font-size: 1.1em !important; color:white; font-style: italic; }
+#header-area {
+    margin-top: 2px;
+    margin-bottom: 1px;
+    background-color: #174475;
+}
+
+#header-area #header-logo-title .logo {
+    float: left;
+    margin-right: 10px;
+}
+
+#header-area #header-logo-title p {
+    line-height: normal !important;
+    margin: 0 !important;
+    padding: 8px 0 0 8px;
+}
+
+#header-area #header-logo-title p>span.h-title {
+    font-size: 2em !important;
+    color: white;
+}
+
+#header-area #header-logo-title p>span.h-sub-title {
+    font-size: 1.1em !important;
+    color: white;
+    font-style: italic;
+}
 
 /* Tabs menu */
-.m .tabs .tab a { color: rgba(13, 134, 231, 0.7); } /* Color */
-.m .tabs .tab a { padding: 0 5px; } /* space of x px at beginning and end of text  */
-.m .tabs .active { border-bottom: 2px solid #0d47a1; font-weight: bold;}
-.m .tabs .tab a.active, .m .tabs .tab a:hover { color:#0d47a1; }
-.m .tabs .tab a:hover { border-bottom: 2px solid #46a0e9 !important; }
-.m .row .col.m1 { width: 14%;}
-#tab-area { padding-left:0;padding-right:0; margin-top: 0px; margin-bottom: 1px; background-color:#174475; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2) }
+.m .tabs .tab a {
+    color: rgba(13, 134, 231, 0.7);
+}
+
+/* Color */
+.m .tabs .tab a {
+    padding: 0 5px;
+}
+
+/* space of x px at beginning and end of text  */
+.m .tabs .active {
+    border-bottom: 2px solid #0d47a1;
+    font-weight: bold;
+}
+
+.m .tabs .tab a.active,
+.m .tabs .tab a:hover {
+    color: #0d47a1;
+}
+
+.m .tabs .tab a:hover {
+    border-bottom: 2px solid #46a0e9 !important;
+}
+
+.m .row .col.m1 {
+    width: 14%;
+}
+
+#tab-area {
+    padding-left: 0;
+    padding-right: 0;
+    margin-top: 0px;
+    margin-bottom: 1px;
+    background-color: #174475;
+    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2)
+}
 
 /* Tabs menu react-dark */
-.m.react-dark .tabs .tab a.active, .m .tabs .tab a:hover { color: #2196f3; }
-.m.react-dark .tabs { background-color: #272727 !important;}
+.m.react-dark .tabs .tab a.active,
+.m .tabs .tab a:hover {
+    color: #2196f3;
+}
+
+.m.react-dark .tabs {
+    background-color: #272727 !important;
+}
 
 /* Tabs menu react-blue */
-.m.react-blue .tabs .tab a.active, .m .tabs .tab a:hover { color: #2196f3; }
-.m.react-blue .tabs { background-color: #272727 !important;}
+.m.react-blue .tabs .tab a.active,
+.m .tabs .tab a:hover {
+    color: #2196f3;
+}
+
+.m.react-blue .tabs {
+    background-color: #272727 !important;
+}
 
 
-.m .col .select-wrapper + label {
+.m .col .select-wrapper+label {
     top: -26px;
 }
 
@@ -46,8 +110,67 @@
     height: 48px;
 }
 
+.m .tabs {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    padding: 0;
+}
+
+.m .tabs li {
+    list-style: none;
+    margin: 5px;
+    width: auto;
+}
+
+.m .tabs li a {
+    padding: 10px 20px;
+    display: block;
+    text-align: center;
+}
+
 .m .page {
     height: calc(100% - 160px);
+    overflow-x: hidden;
+    margin-top: 1rem;
+}
+
+.m [type=checkbox]+span:not(.lever) {
+    height: auto;
+}
+
+@media screen and (max-width: 1110px) {
+    .m .tabs {
+        justify-content: space-between;
+        height: 96;
+    }
+
+    .m .tabs {
+        flex: 1 1 calc(50% - 10px);
+    }
+
+    .m .page {
+        height: calc(100% - 185px);
+    }
+}
+
+@media screen and (max-width: 600px) {
+    .m .page {
+        height: calc(100% - 95px);
+    }
+
+    .m .table-values td,
+    .m .table-values th {
+        padding: 15px 5px;
+    }
+
+    .m .modal {
+        width: 98%;
+    }
+
+    .m .dropdown-menu {
+        position: fixed;
+    }
 }
 
 #dialog-command {
@@ -118,6 +241,7 @@
     margin-top: -25px;
     height: auto !important;
 }
+
 #dialog-presence-edit .titlePopUp {
     width: 100% !important;
     background: #174475;
@@ -127,9 +251,10 @@
 
 #dialog-presence-edit .page {
     width: calc(100% - 10px) !important;
-    padding-left:20;
+    padding-left: 20;
     height: calc(100% - 100px);
 }
+
 /*
 #dialog-presence-edit .btn {
     margin-right: 1.5rem;
@@ -140,6 +265,7 @@
     visibility: hidden !important;
     display: none !important;
 }
+
 /* hidden table column */
 #presence th:nth-of-type(n+6) {
     visibility: hidden !important;
@@ -167,13 +293,24 @@
     overflow: visible !important;
     top: 10px !important;
 }
+
 .m .collapsible-header {
     padding: 0.5rem;
 }
+
 .trigger-add {
     margin-top: 1.3rem;
     margin-left: -0.5rem;
 }
+
 .m .modal .modal-footer {
     padding-right: 2rem;
+}
+
+body {
+    overflow: hidden;
+}
+
+.adapter-body {
+    overflow: hidden;
 }
\ No newline at end of file