diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl
index 1824774ad7..76b4a73b47 100644
--- a/client/res/templates/admin/layouts/grid.tpl
+++ b/client/res/templates/admin/layouts/grid.tpl
@@ -14,7 +14,7 @@
         background-color: #FFF;
     }
     #layout ul.panels > li {
-        padding: 5px;
+        padding: 5px 10px;
         margin-bottom: 20px;
         {{#ifEqual columnCount 1}}
 
@@ -31,7 +31,7 @@
     #layout ul.rows > li  {
         list-style: none;
         border: 1px solid #CCC;
-        margin: 5px;
+        margin: 8px 0;
         padding: 5px;
         height: 72px;
     }
@@ -58,6 +58,9 @@
         padding: 5px;
         height: 32px;
     }
+    #layout  ul.cells.disabled > li {
+        margin: 5px 0;
+    }
     #layout ul.rows > li > div {
         width: auto;
     }
diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl
index a77e36648b..ecb7c5a666 100644
--- a/client/res/templates/admin/layouts/rows.tpl
+++ b/client/res/templates/admin/layouts/rows.tpl
@@ -16,7 +16,7 @@
     #layout ul li {
         list-style: none;
         border: 1px solid #CCC;
-        margin: 5px;
+        margin: 5px 0;
         padding: 5px;
         height: 32px;
     }