diff --git a/pom.xml b/pom.xml
index 9bc590f..e744922 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.5.6a</version>
+	<version>4.5.6b</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/api/hue/GroupResponse.java b/src/main/java/com/bwssystems/HABridge/api/hue/GroupResponse.java
index c44b0b0..5bdf9ad 100644
--- a/src/main/java/com/bwssystems/HABridge/api/hue/GroupResponse.java
+++ b/src/main/java/com/bwssystems/HABridge/api/hue/GroupResponse.java
@@ -1,12 +1,7 @@
 package com.bwssystems.HABridge.api.hue;
 
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-
-import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.dao.GroupDescriptor;
 import com.google.gson.annotations.SerializedName;
 
diff --git a/src/main/java/com/bwssystems/HABridge/api/hue/GroupState.java b/src/main/java/com/bwssystems/HABridge/api/hue/GroupState.java
index 40fb535..0ba6152 100644
--- a/src/main/java/com/bwssystems/HABridge/api/hue/GroupState.java
+++ b/src/main/java/com/bwssystems/HABridge/api/hue/GroupState.java
@@ -1,8 +1,5 @@
 package com.bwssystems.HABridge.api.hue;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by Florian Foerderreuther on 07/23/17
  */
diff --git a/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java b/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
index 6fcc599..990e011 100644
--- a/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
@@ -32,7 +32,7 @@ import com.google.gson.JsonSyntaxException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Arrays;
-import java.util.ArrayList;
+
 /*
  * This is an in memory list to manage the configured devices and saves the list as a JSON string to a file for later  
  * loading.
diff --git a/src/main/java/com/bwssystems/HABridge/dao/GroupDescriptor.java b/src/main/java/com/bwssystems/HABridge/dao/GroupDescriptor.java
index 013b89d..eb7a4f9 100644
--- a/src/main/java/com/bwssystems/HABridge/dao/GroupDescriptor.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/GroupDescriptor.java
@@ -4,7 +4,6 @@ import com.bwssystems.HABridge.api.hue.DeviceState;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.bwssystems.HABridge.api.hue.GroupState;
-import com.bwssystems.HABridge.dao.DeviceDescriptor;
 
 /*
  * Object to handle the device configuration
diff --git a/src/main/java/com/bwssystems/HABridge/dao/GroupRepository.java b/src/main/java/com/bwssystems/HABridge/dao/GroupRepository.java
index 1bba331..96a9c5c 100644
--- a/src/main/java/com/bwssystems/HABridge/dao/GroupRepository.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/GroupRepository.java
@@ -2,7 +2,6 @@ package com.bwssystems.HABridge.dao;
 
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -13,8 +12,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.xml.bind.DatatypeConverter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java b/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
index f7e419a..7c2b2ac 100644
--- a/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
+++ b/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
@@ -25,7 +25,6 @@ import com.bwssystems.HABridge.api.CallItem;
 import com.bwssystems.HABridge.dao.BackupFilename;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.dao.DeviceRepository;
-import com.bwssystems.HABridge.dao.GroupDescriptor;
 import com.bwssystems.HABridge.dao.GroupRepository;
 import com.bwssystems.HABridge.dao.ErrorMessage;
 import com.bwssystems.HABridge.util.JsonTransformer;
@@ -92,6 +91,7 @@ public class DeviceResource {
 	    	else {
 	    		devices = new Gson().fromJson("[" + request.body() + "]", DeviceDescriptor[].class);
 	    	}
+			@SuppressWarnings("unused")
 			CallItem[] callItems = null;
 			String errorMessage = null;
 	    	for(int i = 0; i < devices.length; i++) {
diff --git a/src/main/java/com/bwssystems/HABridge/hue/ColorData.java b/src/main/java/com/bwssystems/HABridge/hue/ColorData.java
index 93dcca7..6fd417c 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/ColorData.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/ColorData.java
@@ -1,7 +1,5 @@
 package com.bwssystems.HABridge.hue;
 
-import java.util.List;
-
 public class ColorData {
 	public enum ColorMode { XY, CT, HS}
 
diff --git a/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java b/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java
index de09659..34506f4 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java
@@ -141,6 +141,7 @@ public class ColorDecode {
         return value;
 	}
 
+	@SuppressWarnings("unchecked")
 	public static String replaceColorData(String request, ColorData colorData, int setIntensity, boolean isHex) {
 		if (request == null) {
 			return null;
diff --git a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
index c5c7c75..1472768 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
@@ -747,7 +747,6 @@ public class HueMulator {
 							"invalid/missing parameters in body", null, null, null).getTheErrors(), HueError[].class);
 				}
 
-				String type = theGroup.getType();
 				String groupClass = theGroup.getClass_name();
 				String name = theGroup.getName();
 				if (!(name == null || name.trim().equals(""))) {
@@ -831,6 +830,7 @@ public class HueMulator {
 				bridgeSettingMaster.updateConfigFile();
 
 			if (groupId.equalsIgnoreCase("0")) {
+				@SuppressWarnings("unchecked")
 				GroupResponse theResponse = GroupResponse.createDefaultGroupResponse((Map<String, DeviceResponse>)lightsListHandler(userId, requestIp));
 				return theResponse;
 			} else {
@@ -1257,6 +1257,7 @@ public class HueMulator {
 	}
 
 
+	@SuppressWarnings("unchecked")
 	private String changeGroupState(String userId, String groupId, String body, String ipAddress, boolean fakeLightResponse) {
 		log.debug("PUT action to group  " + groupId + " from " + ipAddress + " user " + userId + " with body " + body);
 		HueError[] theErrors = null;
diff --git a/src/main/java/com/bwssystems/HABridge/hue/HueMulatorHandler.java b/src/main/java/com/bwssystems/HABridge/hue/HueMulatorHandler.java
index 72ae592..0fe5c7d 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulatorHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulatorHandler.java
@@ -4,9 +4,6 @@ import com.bwssystems.HABridge.api.CallItem;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.hue.ColorData;
 
-import java.util.List;
-
-
 public interface HueMulatorHandler {
 	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity, Integer targetBri, Integer targetBriInc, ColorData colorData, DeviceDescriptor device, String body);
 }
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/NestBridge/NestHome.java b/src/main/java/com/bwssystems/HABridge/plugins/NestBridge/NestHome.java
index f1e7a56..0069000 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/NestBridge/NestHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/NestBridge/NestHome.java
@@ -1,7 +1,6 @@
 package com.bwssystems.HABridge.plugins.NestBridge;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/exec/CommandHome.java b/src/main/java/com/bwssystems/HABridge/plugins/exec/CommandHome.java
index 22e5aa9..eb2c69e 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/exec/CommandHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/exec/CommandHome.java
@@ -1,7 +1,6 @@
 package com.bwssystems.HABridge.plugins.exec;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java
index ee379dd..35ae28d 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java
@@ -1,7 +1,5 @@
 package com.bwssystems.HABridge.plugins.http;
 
-import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java b/src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java
index 0eb7ed8..a3d693e 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java
@@ -3,7 +3,6 @@ package com.bwssystems.HABridge.plugins.hue;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
index f642c20..0c692f1 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
@@ -131,6 +131,7 @@ public class LifxHome implements Home {
 		return deviceList;
 	}
 
+	@SuppressWarnings("unused")
 	private Boolean addLifxLights(LFXLightCollection theDeviceList) {
 		if(!validLifx)
 			return false;
@@ -143,6 +144,7 @@ public class LifxHome implements Home {
 		return true;
 	}
 	
+	@SuppressWarnings("unused")
 	private Boolean addLifxGroups(LFXGroupCollection theDeviceList) {
 		if(!validLifx)
 			return false;
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java b/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
index ed3fc54..792df9f 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
@@ -5,8 +5,6 @@ import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
-import org.eclipse.paho.client.mqttv3.MqttSecurityException;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHome.java b/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHome.java
index 5ebe9fd..894a9a1 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHome.java
@@ -3,7 +3,6 @@ package com.bwssystems.HABridge.plugins.mqtt;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/Device.java b/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/Device.java
index b61aaee..abf5641 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/Device.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/Device.java
@@ -1,7 +1,6 @@
 
 package com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup;
 
-import java.util.List;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/GetSetup.java b/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/GetSetup.java
index 0478b58..bb1a7ef 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/GetSetup.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/GetSetup.java
@@ -1,7 +1,6 @@
 
 package com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup;
 
-import java.util.List;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
index 49064b3..0c69aa4 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
@@ -7,7 +7,6 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import javax.xml.bind.DatatypeConverter;
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
index 7ed2124..76a07e1 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
@@ -3,8 +3,6 @@ package com.bwssystems.HABridge.plugins.udp;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.xml.bind.DatatypeConverter;
 
diff --git a/src/main/resources/public/css/scrollable-table.css b/src/main/resources/public/css/scrollable-table.css
index 0a213fd..28eaba1 100644
--- a/src/main/resources/public/css/scrollable-table.css
+++ b/src/main/resources/public/css/scrollable-table.css
@@ -1,5 +1,5 @@
 .scrollableContainer {
-   /* height: 310px;*/
+/*    height: 310px; */
     position: relative;
     padding-top: 35px;
     overflow: hidden;
@@ -29,6 +29,7 @@
 
 .scrollArea {
     height: 100%;
+    max-height: 800px;
     overflow-x: auto;
     overflow-y: auto;
     border: 1px solid #d5d5d5;
diff --git a/src/main/resources/public/views/configuration.html b/src/main/resources/public/views/configuration.html
index 0f1705f..7f54f7a 100644
--- a/src/main/resources/public/views/configuration.html
+++ b/src/main/resources/public/views/configuration.html
@@ -74,7 +74,7 @@
 				<th>Actions</th>
 			</tr>
 		</thead>
-		<tr ng-repeat="device in bridge.devices | orderBy:'name' | filterDevicesByRequester:bridge.state.filterDevicesByIpAddress:bridge.state.filterDevicesOnlyFiltered:bridge.state.filterDeviceType" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
+		<tr ng-repeat="device in bridge.devices | filterDevicesByRequester:bridge.state.filterDevicesByIpAddress:bridge.state.filterDevicesOnlyFiltered:bridge.state.filterDeviceType" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
 			<td>{{$index+1}}</td>
 			<td>{{device.id}}</td>
 			<td>{{device.name}}</td>
diff --git a/src/main/resources/public/views/editdevice.html b/src/main/resources/public/views/editdevice.html
index cef1d07..a6e095f 100644
--- a/src/main/resources/public/views/editdevice.html
+++ b/src/main/resources/public/views/editdevice.html
@@ -54,9 +54,8 @@
 					Bridge Device</button>
 				<button type="submit" class="col-xs-4 col-sm-2 btn btn-success"
 					ng-click="editDevice(false)">Update Bridge Device</button>
-				<button class="btn btn-danger" ng-click="clearDevice()">Clear
-					Device</button>
-				<button class="btn" ng-click="changeEditmode()">Change Editmode</button>
+				<button class="btn btn-danger" ng-click="clearDevice()">Clear</button>
+				<button class="btn" ng-click="changeEditmode()">Change Edit Mode</button>
 			</p>
 			<table class="table table-bordered table-striped table-hover">