diff --git a/hal-core/resource/resource/web/trigger.tmpl b/hal-core/resource/resource/web/trigger.tmpl
index 9ac3c2ac..2dbcff26 100644
--- a/hal-core/resource/resource/web/trigger.tmpl
+++ b/hal-core/resource/resource/web/trigger.tmpl
@@ -24,8 +24,8 @@
                 </button>
             </div>
         </div>
-        <div class="panel-body {{^.isEnabled()}}disabled{{/.isEnabled()}}">
-            <table class="table table-condensed">
+        <div class="panel-body {{^.isEnabled()}}disabled{{/.isEnabled()}}" style="padding-bottom: 0px;">
+            <table class="table table-condensed" style="margin-bottom: 0px;">
                 <thead class="row">
                     <th class="col-md-5 text-center">
                         Triggers
diff --git a/hal-core/src/se/hal/EventControllerManager.java b/hal-core/src/se/hal/EventControllerManager.java
index 35e9581d..7f19c8c3 100644
--- a/hal-core/src/se/hal/EventControllerManager.java
+++ b/hal-core/src/se/hal/EventControllerManager.java
@@ -75,6 +75,7 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
 
         if (controller != null)
             controller.register(event.getDeviceConfig());
+
         registeredEvents.add(event);
         detectedEvents.remove(HalDeviceUtil.findDevice(event.getDeviceConfig(), detectedEvents)); // Remove if this device was detected
     }
diff --git a/hal-core/src/se/hal/SensorControllerManager.java b/hal-core/src/se/hal/SensorControllerManager.java
index 14726c10..2ebc3206 100644
--- a/hal-core/src/se/hal/SensorControllerManager.java
+++ b/hal-core/src/se/hal/SensorControllerManager.java
@@ -75,9 +75,9 @@ public class SensorControllerManager extends HalAbstractControllerManager<HalAbs
 
         if (controller != null)
             controller.register(sensor.getDeviceConfig());
+
         registeredSensors.add(sensor);
-        detectedSensors.remove(
-                HalDeviceUtil.findDevice(sensor.getDeviceConfig(), detectedSensors)); // Remove if this device was detected
+        detectedSensors.remove(HalDeviceUtil.findDevice(sensor.getDeviceConfig(), detectedSensors)); // Remove if this device was detected
     }
 
     /**