diff --git a/resource/web/css/hal.css b/resource/web/css/hal.css
index 7e9b9a76..ab56ffac 100755
--- a/resource/web/css/hal.css
+++ b/resource/web/css/hal.css
@@ -84,6 +84,21 @@ body {
   margin-top: 0;
 }
 
+.vertical-space {
+	height: 70px;
+}
+.text-vert-middle {
+    vertical-align: middle !important;
+}
+
+.table-borderless tbody tr td {
+    border: none;
+}
+
+.drop-shadow {
+    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12)
+}
+
 
 /*
  * Placeholder dashboard ideas
@@ -104,14 +119,6 @@ body {
   border-radius: 50%;
 }
 
-.panel{
-	margin-bottom: 70px;
-}
-
-.drop-shadow {
-    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12)
-}
-
 
 /*
  * c3.js charts overrides
diff --git a/resource/web/event_config.tmpl b/resource/web/event_config.tmpl
index 5582c92c..10476b75 100755
--- a/resource/web/event_config.tmpl
+++ b/resource/web/event_config.tmpl
@@ -133,10 +133,8 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                <h4 class="modal-title" id="exampleModalLabel">Event</h4>
+                <button type="button" class="close" data-dismiss="modal"><span>&times;</span></button>
+                <h4 class="modal-title">Event</h4>
             </div>
             <form method="POST">
                 <div class="modal-body">
diff --git a/resource/web/sensor_config.tmpl b/resource/web/sensor_config.tmpl
index 937c8a73..f1d2b146 100755
--- a/resource/web/sensor_config.tmpl
+++ b/resource/web/sensor_config.tmpl
@@ -86,8 +86,9 @@
                 {{/detectedSensors}}
             </table>
         </div>
-    </div>
+    </div> <!-- /panel -->
 </div>
+<div class="col-md-12 vertical-space"></div>
 
 <div class="col-md-12">
     <div class="panel panel-default drop-shadow">
@@ -140,8 +141,9 @@
                 {{/extUsers}}
             </table>
         </div>
-    </div>
+    </div> <!-- /Panel -->
 </div>
+<div class="col-md-12 vertical-space"></div>
 
 <div class="col-md-12">
     <div class="panel panel-default drop-shadow">
@@ -185,8 +187,9 @@
                 {{/extSensor}}
             </table>
         </div>
-    </div>
+    </div> <!-- /Panel -->
 </div>
+<div class="col-md-12 vertical-space"></div>
 
 
 <!------------- MODALS --------------->
@@ -255,10 +258,8 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                <h4 class="modal-title" id="exampleModalLabel">Sensor</h4>
+                <button type="button" class="close" data-dismiss="modal"><span>&times;</span></button>
+                <h4 class="modal-title">Sensor</h4>
             </div>
             <form method="POST">
                 <div class="modal-body">
@@ -322,9 +323,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+                <button type="button" class="close" data-dismiss="modal"><span>&times;</span></button>
                 <h4 class="modal-title">External User</h4>
             </div>
             <form method="POST">