diff --git a/src/main/resources/com/adr/helloiot/styles/main-dark.css b/src/main/resources/com/adr/helloiot/styles/main-dark.css
index 679cd65..31af36a 100644
--- a/src/main/resources/com/adr/helloiot/styles/main-dark.css
+++ b/src/main/resources/com/adr/helloiot/styles/main-dark.css
@@ -1,6 +1,6 @@
 /*
     HelloIoT is a dashboard creator for MQTT
-    Copyright (C) 2017 Adrián Romero Corchado.
+    Copyright (C) 2017-2018 Adrián Romero Corchado.
 
     This file is part of HelloIot.
 
@@ -116,9 +116,9 @@
 }
 
 .unitbase {
-    -fx-background-radius: 6,5;
-    -fx-background-insets: 0, 1;
-    -fx-background-color: -fx-border-unit, -fx-background-unit;      
+    -fx-background-radius: 0, 6, 5;
+    -fx-background-insets: 0, 3, 4;
+    -fx-background-color: transparent, -fx-border-unit, -fx-background-unit;        
     -fx-effect: dropshadow(one-pass-box, derive(-fx-border-unit, -20%), 4, 0, 0, 0);
 }
 
@@ -127,8 +127,7 @@
     -fx-font-size: 16px;
     -fx-text-fill: -fx-info-fill;
     -fx-background-insets: 0, 0 5 4 5, 0 5 5 5;
-    -fx-background-color:  -fx-background-container, -fx-separator-fill, -fx-background-container;    
-    -fx-padding: 10px 10px 5px 10px;      
+    -fx-background-color:  -fx-background-container, -fx-separator-fill, -fx-background-container;     
 }
 
 .fieldlabel {
diff --git a/src/main/resources/com/adr/helloiot/styles/main.css b/src/main/resources/com/adr/helloiot/styles/main.css
index b2bb2df..2783096 100644
--- a/src/main/resources/com/adr/helloiot/styles/main.css
+++ b/src/main/resources/com/adr/helloiot/styles/main.css
@@ -1,6 +1,6 @@
 /*
     HelloIoT is a dashboard creator for MQTT
-    Copyright (C) 2017 Adrián Romero Corchado.
+    Copyright (C) 2017-2018 Adrián Romero Corchado.
 
     This file is part of HelloIot.
 
@@ -98,11 +98,10 @@
 }
 
 .unitbase {
-    -fx-background-radius: 6, 5;
-    -fx-background-insets: 0, 1;
-    -fx-background-color:  -fx-border-unit, -fx-background-unit;        
+    -fx-background-radius: 0, 6, 5;
+    -fx-background-insets: 0, 3, 4;
+    -fx-background-color: transparent, -fx-border-unit, -fx-background-unit;        
     -fx-effect: dropshadow(one-pass-box, derive(-fx-border-unit, 20%), 4, 0, 0, 0);
- 
 }
 
 .labelsection {
@@ -110,8 +109,7 @@
     -fx-font-size: 16px;
     -fx-text-fill: -fx-info-fill;
     -fx-background-insets: 0, 0 5 4 0, 0 5 5 0;
-    -fx-background-color: -fx-background-container, -fx-separator-fill, -fx-background-container;    
-    -fx-padding: 10px 10px 5px 10px;      
+    -fx-background-color: -fx-background-container, -fx-separator-fill, -fx-background-container;           
 }
 
 .fieldlabel {
diff --git a/src/main/resources/com/adr/helloiot/styles/root.css b/src/main/resources/com/adr/helloiot/styles/root.css
index 132fac9..a515c9f 100644
--- a/src/main/resources/com/adr/helloiot/styles/root.css
+++ b/src/main/resources/com/adr/helloiot/styles/root.css
@@ -1,6 +1,6 @@
 /*
     HelloIoT is a dashboard creator for MQTT
-    Copyright (C) 2017 Adrián Romero Corchado.
+    Copyright (C) 2017-2018 Adrián Romero Corchado.
 
     This file is part of HelloIot.
 
@@ -37,16 +37,17 @@
 }
 
 .gridcontainer {
-    -fx-spacing: 6px;
-    -fx-padding: 6px;   
+    -fx-padding: 3px;   
 }
-.linecontainer {
-    -fx-spacing: 6px;
-    -fx-vgap: 6px;
-    -fx-hgap: 6px
+
+.labelsection {
+    -fx-font-weight: bold;
+    -fx-background-insets: 0, 0 5 4 0, 0 5 5 0;
+    -fx-background-color:  -fx-background, -fx-separator-fill, -fx-background;      
+    -fx-padding: 10px 10px 5px 10px;    
 }
 
-.labelsection, .formsection {
+.formsection {
     -fx-font-weight: bold;
     -fx-background-insets: 0, 0 5 1 0, 0 5 2 0;
     -fx-background-color:  -fx-background, -fx-separator-fill, -fx-background;      
@@ -65,9 +66,9 @@
 }
 
 .unitbase {
-    -fx-background-insets: 0, 1;
-    -fx-background-color: derive(-fx-box-border, 25%), -fx-background;      
-    -fx-padding: 4px 6px 4px 6px;
+    -fx-background-insets: 0, 3, 4;
+    -fx-background-color: transparent, derive(-fx-box-border, 25%), -fx-background;      
+    -fx-padding: 7px 9px 7px 9px;
     -fx-value-color:  -fx-text-base-color;    
 }
 .noneditable {