diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less
index 3881c79..14fadc3 100644
--- a/css/area_main-content-secedit.less
+++ b/css/area_main-content-secedit.less
@@ -1,10 +1,10 @@
 /**
- * This styles the "section editing button"
+ * This styles the "section editing button" (data-plugin)
  */
 
 
 #dokuwiki__content.main-content {
-    .editbutton_section {
+    .secedit:not([class*="plugin"]):not([class*="table"]) {
         position: relative;
         z-index: 2;
         top: 0;
diff --git a/css/plugins/data.less b/css/plugins/data.less
index 9d03409..6a6cf57 100644
--- a/css/plugins/data.less
+++ b/css/plugins/data.less
@@ -1,5 +1,5 @@
 /**
- * This file provides styles for old data plugin
+ * This file provides styles for "data plugin"
  * after importing struct data this can be deleted
  */
 
@@ -12,37 +12,37 @@
             margin-left: 0;
             margin-right: 0;
         }
+    }
 
-        + .secedit.editbutton_plugin_data {
-            position: relative;
-            top: -1em; // as margin after DL
-            float: left;
-            font-size: @font-size-small; // for right position
-            margin-top: 0;
+    .editbutton_plugin_data {
+        position: relative;
+        top: -1em; // as margin after DL
+        float: left;
+        font-size: @font-size-small; // for right position
+        margin-top: 0;
 
-            form {
-                button {
-                    min-height: 1rem;
-                    height: 1.8em;
-                    background-color: @ini_background;
-                    border-top: solid 1px @ini_button_background;
-                    border-color: @ini_border;
-                    border-radius: 0 0 @fix_border-radius @fix_border-radius;
-                    color: @ini_existing;
-                    font-size: @font-size-small;
-                    line-height: 1.8em;
-                    margin-top: -1px; // for right position
-                    margin-left: .6em;
-                    padding: 0 .3em;
-                    transition: @transition background-color, @transition border-color, @transition color;
+        form {
+            button {
+                min-height: 1rem;
+                height: 1.8em;
+                background-color: @ini_background;
+                border-top: solid 1px @ini_button_background;
+                border-color: @ini_border;
+                border-radius: 0 0 @fix_border-radius @fix_border-radius;
+                color: @ini_existing;
+                font-size: @font-size-small;
+                line-height: 1.8em;
+                margin-top: -1px; // for right position
+                margin-left: .6em;
+                padding: 0 .3em;
+                transition: @transition background-color, @transition border-color, @transition color;
 
-                    &:hover,
-                    &:focus,
-                    &:active {
-                        background-color: @ini_existing;
-                        border-color: @ini_existing;
-                        color: @ini_background;
-                    }
+                &:hover,
+                &:focus,
+                &:active {
+                    background-color: @ini_existing;
+                    border-color: @ini_existing;
+                    color: @ini_background;
                 }
             }
         }
diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less
index 0a2c2e4..1d22dff 100644
--- a/css/plugins/edittable.less
+++ b/css/plugins/edittable.less
@@ -1,5 +1,5 @@
 /**
- * This file provides styles for qc edittable plugin
+ * This file provides styles for "edittable plugin"
  */
 
 
@@ -10,7 +10,7 @@
         position: relative; // for IE
         z-index: 1; // for IE
         float: left;
-        margin-top: -1.46rem !important; // overwrite inline stales
+        margin-top: -1.4em !important; // overwrite inline stales
 
         form div.no {
             button,
@@ -22,14 +22,10 @@
                 border-radius: 0 0 @fix_border-radius @fix_border-radius;
                 color: @ini_existing;
                 font-size: @font-size-small;
-                margin-top: 0; // for best position of edit-tab beneeth table
+                margin-top: -1px; // for best position of edit-tab beneeth table
                 padding-right: .3em;
                 transition: @transition background-color, @transition border-color, @transition color;
 
-                @media @screen_md-xlg {
-                    margin-top: -1px; // for best position of edit-tab beneeth table
-                }
-
                 &:hover,
                 &:focus,
                 &:active {