diff --git a/pom.xml b/pom.xml
index 093c65b..df840f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4beta2.7</version>
+	<version>4beta2.8</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index f7ecc83..8471c83 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -10,9 +10,6 @@ app.config (function ($routeProvider) {
 	}).when ('/logs', {
 		templateUrl: 'views/logs.html',
 		controller: 'LogsController'		
-	}).when ('/editor', {
-		templateUrl: 'views/editor.html',
-		controller: 'EditController'		
 	}).when ('/editdevice', {
 		templateUrl: 'views/editdevice.html',
 		controller: 'EditController'		
@@ -2079,6 +2076,8 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi
 	$scope.clearDevice = function () {
 		bridgeService.clearDevice();
 		$scope.onDevices = null;
+		$scope.dimDevices = null;
+		$scope.offDevices = null;
 	};
 
 	$scope.addDevice = function () {
diff --git a/src/main/resources/public/views/configuration.html b/src/main/resources/public/views/configuration.html
index a0e9ca4..0d729d4 100644
--- a/src/main/resources/public/views/configuration.html
+++ b/src/main/resources/public/views/configuration.html
@@ -19,7 +19,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/editdevice.html b/src/main/resources/public/views/editdevice.html
index 6ea8b00..1953947 100644
--- a/src/main/resources/public/views/editdevice.html
+++ b/src/main/resources/public/views/editdevice.html
@@ -15,11 +15,11 @@
 		href="#/huedevices">Hue Devices</a></li>
 	<li ng-if="bridge.showHal" role="presentation"><a
 		href="#/haldevices">HAL Devices</a></li>
-	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
-	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
-	<li role="presentation" class="active"><a href="#/editdevice">Edit
-			Device</a></li>
+	<li ng-if="bridge.showMqtt" role="presentation"><a
+		href="#/mqttmessages">MQTT Messages</a></li>
+	<li ng-if="bridge.showHass" role="presentation"><a
+		href="#/hassdevices">HomeAssistant Devices</a></li>
+	<li role="presentation" class="active"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
@@ -31,520 +31,530 @@
 			fields the bridge uses. Please use care when updating these fields as
 			you may break the settings used by the bridge to call a specific end
 			point device.</p>
+		<p class="text-muted">This area allows you to create any http or
+			udp call to an endpoint. You can use the default GET or select the
+			http verb type below and configure a payload for either on, dim or
+			off methods. For Execution of a
+			script or program, plese fill in the path. All manually entered calls
+			can use Json notation of array with [{&quot;item&quot;:&quot;the
+			payload&quot;},{&quot;item&quot;:&quot;another payload&quot;}] to
+			execute multiple entries. Adding the value replacements
+			(${intensity..byte},${intensity.percent},${intensity.math(X*1)}) will
+			also work.</p>
 		<p>When copying, update the name and select the "Add Bridge
 			Device" Button.</p>
 
-	<form name="form">
-	<p>
-		<button class="btn btn-primary" ng-click="copyDevice()">Add	Bridge Device</button>
-		<button type="submit" class="col-xs-4 col-sm-2 btn btn-success"	ng-click="addDevice()">Update Bridge Device</button>
-		<button class="btn btn-danger" ng-click="clearDevice()">Clear Device</button>
-	</p>
-	<table class="table table-bordered table-striped table-hover">
-	
-		<tr>
-			<td><label class="col-xs-12 col-sm-2 control-label" for="device-name">Name</label></td>
+		<form name="form">
+			<p>
+				<button class="btn btn-primary" ng-click="copyDevice()">Add
+					Bridge Device</button>
+				<button type="submit" class="col-xs-4 col-sm-2 btn btn-success"
+					ng-click="addDevice()">Update Bridge Device</button>
+				<button class="btn btn-danger" ng-click="clearDevice()">Clear
+					Device</button>
+			</p>
+			<table class="table table-bordered table-striped table-hover">
 
-			<td>
-				<input type="text" class="form-control" id="device-name"
-					ng-model="device.name" placeholder="Device Name">
-			</td>
-		</tr>
-		<tr>
-			<td><label class="col-xs-12 col-sm-2 control-label" for="device-target">Target</label></td>
-
-			<td>
-				<input type="text" class="form-control" id="device-target"
-					ng-model="device.targetDevice" placeholder="default">
-			</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label" for="device-type">Device Type</label></td>
-
-				<td>
-					<select name="device-type" id="device-type"
-						ng-model="device.deviceType">
-						<option value="">---Types if needed---</option>
-						<!-- not selected / blank option -->
-						<option value="custom">Custom</option>
-						<option value="UDP">UDP</option>
-						<option value="TCP">TCP</option>
-						<option value="exec">Execute Script/Program</option>
-						<option value="switch">Switch</option>
-						<option value="scene">Scene</option>
-						<option value="macro">Macro</option>
-						<option value="group">Group</option>
-						<option value="activity">Activity</option>
-						<option value="button">Button</option>
-						<option value="thermo">Thermo</option>
-						<option value="passthru">Pass Thru</option>
-					</select>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label"
-					for="device-map-type">Map Type</label></td>
-
-				<td>
-					<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="mapTypeSelected"></select>
-				</td>
-		</tr>
-		<tr>
-			<td><label class="col-xs-12 col-sm-2 control-label" for="device-unique-id">Unique Id (used for Hue responses)</label></td>
-
-			<td>
-				<input type="text" class="form-control" id="device-unique-id"
-					ng-model="device.uniqueid" placeholder="AA:BB:CC:DD:EE:FF-XX" readonly>
-			</td>
-		</tr>
-		<tr>
-			<td><label class="col-xs-12 col-sm-2 control-label" for="device-map-id">Map ID</label></td>
-
-			<td>
-				<input type="text" class="form-control" id="device-map-id"
-					ng-model="device.mapId" placeholder="1111">
-			</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label" for="device-on-url">On Items</label></td>
-
-				<td>
-					<scrollable-table watch="onDevices">
-					<table class="table table-bordered table-striped table-hover">
-						<thead>
-							<tr>
-								<th>Type</th>
-								<th>Target Item</th>
-								<th>Delay</th>
-								<th>Count</th>
-								<th>Filter IPs</th>
-								<th>Http Verb</th>
-								<th>Http Body</th>
-								<th>Http Headers</th>
-								<th>Content Type</th>
-								<th>Manage</th>
-							</tr>
-						</thead>
-						<tr ng-repeat="onItem in onDevices">
-							<td>
-								<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="onItem.type"></select>
-							</td>
-							<td><textarea rows="1" cols="20" class="form-control" id="item-target"
-							ng-model="onItem.item" placeholder="The Call"></textarea></td>
-							<td><textarea rows="1" cols="4" class="form-control" id="item-delay"
-							ng-model="onItem.delay" placeholder="millis"></textarea></td>
-							<td><textarea rows="1" cols="2" class="form-control" id="item-count"
-							ng-model="onItem.count" placeholder="number"></textarea></td>
-							<td><textarea rows="1" cols="16"class="form-control" id="item-filterIPs"
-							ng-model="onItem.filterIPs" placeholder="restrict IPs"></textarea></td>
-							<td>
-								<select name="item-http-verb" id="item-http-verb" ng-model="onItem.httpVerb">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="GET">GET</option>
-									<option value="PUT">PUT</option>
-									<option value="POST">POST</option>
-								</select>
-							</td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpBody"
-							ng-model="onItem.httpBody" placeholder="body args"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpHeaders"
-							ng-model="onItem.httpHeaders" placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
-							<td>
-								<select name="item-content-type" id="item-content-type"
-									ng-model="onItem.contentType">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="application/atom+xml">application/atom+xml</option>
-									<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
-									<option value="application/json">application/json</option>
-									<option value="application/octet-stream">application/octet-stream</option>
-									<option value="application/svg+xml">application/svg+xml</option>
-									<option value="application/xhtml+xml">application/xhtml+xml</option>
-									<option value="application/xml">application/xml</option>
-									<option value="*">*</option>
-									<option value="multipart/form-data">multipart/form-data</option>
-									<option value="text/html">text/html</option>
-									<option value="text/plain">text/plain</option>
-									<option value="text/xml">text/xml</option>
-									<option value="*/*">*/*</option>
-								</select>
-							</td>
-							<td><button class="btn btn-danger" type="submit"
-									ng-click="removeItemOn(onItem)">Del</button></td>
-						</tr>
-						<tr>
-							<td>
-								<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="newOnItem.type"></select>
-							</td>
-							<td><textarea rows="1" cols="20" class="form-control" id="item-target"
-							ng-model="newOnItem.item" placeholder="The Call"></textarea></td>
-							<td><textarea rows="1" cols="4" class="form-control" id="item-delay"
-							ng-model="newOnItem.delay" placeholder="millis"></textarea></td>
-							<td><textarea rows="1" cols="2" class="form-control" id="item-count"
-							ng-model="newOnItem.count" placeholder="number"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-filterIPs"
-							ng-model="newOnItem.filterIPs" placeholder="restrict IPs"></textarea></td>
-							<td>
-								<select name="item-http-verb" id="item-http-verb" ng-model="newOnItem.httpVerb">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="GET">GET</option>
-									<option value="PUT">PUT</option>
-									<option value="POST">POST</option>
-								</select>
-							</td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpBody"
-							ng-model="newOnItem.httpBody" placeholder="body args"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpHeaders"
-							ng-model="newOnItem.httpHeaders" placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
-							<td>
-								<select name="item-content-type" id="item-content-type"
-									ng-model="newOnItem.contentType">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="application/atom+xml">application/atom+xml</option>
-									<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
-									<option value="application/json">application/json</option>
-									<option value="application/octet-stream">application/octet-stream</option>
-									<option value="application/svg+xml">application/svg+xml</option>
-									<option value="application/xhtml+xml">application/xhtml+xml</option>
-									<option value="application/xml">application/xml</option>
-									<option value="*">*</option>
-									<option value="multipart/form-data">multipart/form-data</option>
-									<option value="text/html">text/html</option>
-									<option value="text/plain">text/plain</option>
-									<option value="text/xml">text/xml</option>
-									<option value="*/*">*/*</option>
-								</select>
-							</td>
-							<td><button class="btn btn-success" type="submit"
-									ng-click="addItemOn(newOnItem)">Add</button></td>
-						</tr>
-					</table>
-					</scrollable-table>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label" for="device-dim-url">Dim Items</label></td>
-
-				<td>
-					<scrollable-table watch="dimDevices">
-					<table class="table table-bordered table-striped table-hover">
-						<thead>
-							<tr>
-								<th>Type</th>
-								<th>Target Item</th>
-								<th>Delay</th>
-								<th>Count</th>
-								<th>Filter IPs</th>
-								<th>Http Verb</th>
-								<th>Http Body</th>
-								<th>Http Headers</th>
-								<th>Content Type</th>
-								<th>Manage</th>
-							</tr>
-						</thead>
-						<tr ng-repeat="dimItem in dimDevices">
-							<td>
-								<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="dimItem.type"></select>
-							</td>
-							<td><textarea rows="1" cols="20" class="form-control" id="item-target"
-							ng-model="dimItem.item" placeholder="The Call"></textarea></td>
-							<td><textarea rows="1" cols="4" class="form-control" id="item-delay"
-							ng-model="dimItem.delay" placeholder="millis"></textarea></td>
-							<td><textarea rows="1" cols="2" class="form-control" id="item-count"
-							ng-model="dimItem.count" placeholder="number"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-filterIPs"
-							ng-model="dimItem.filterIPs" placeholder="restrict IPs"></textarea></td>
-							<td>
-								<select name="item-http-verb" id="item-http-verb" ng-model="dimItem.httpVerb">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="GET">GET</option>
-									<option value="PUT">PUT</option>
-									<option value="POST">POST</option>
-								</select>
-							</td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpBody"
-							ng-model="dimItem.httpBody" placeholder="body args"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpHeaders"
-							ng-model="dimItem.httpHeaders" placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
-							<td>
-								<select name="item-content-type" id="item-content-type"
-									ng-model="dimItem.contentType">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="application/atom+xml">application/atom+xml</option>
-									<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
-									<option value="application/json">application/json</option>
-									<option value="application/octet-stream">application/octet-stream</option>
-									<option value="application/svg+xml">application/svg+xml</option>
-									<option value="application/xhtml+xml">application/xhtml+xml</option>
-									<option value="application/xml">application/xml</option>
-									<option value="*">*</option>
-									<option value="multipart/form-data">multipart/form-data</option>
-									<option value="text/html">text/html</option>
-									<option value="text/plain">text/plain</option>
-									<option value="text/xml">text/xml</option>
-									<option value="*/*">*/*</option>
-								</select>
-							</td>
-							<td><button class="btn btn-danger" type="submit"
-									ng-click="removeItemDim(dimItem)">Del</button></td>
-						</tr>
-						<tr>
-							<td>
-								<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="newDimItem.type"></select>
-							</td>
-							<td><textarea rows="1" cols="20" class="form-control" id="item-target"
-							ng-model="newDimItem.item" placeholder="The Call"></textarea></td>
-							<td><textarea rows="1" cols="4" class="form-control" id="item-delay"
-							ng-model="newDimItem.delay" placeholder="millis"></textarea></td>
-							<td><textarea rows="1" cols="2" class="form-control" id="item-count"
-							ng-model="newDimItem.count" placeholder="number"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-filterIPs"
-							ng-model="newDimItem.filterIPs" placeholder="restrict IPs"></textarea></td>
-							<td>
-								<select name="item-http-verb" id="item-http-verb" ng-model="newDimItem.httpVerb">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="GET">GET</option>
-									<option value="PUT">PUT</option>
-									<option value="POST">POST</option>
-								</select>
-							</td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpBody"
-							ng-model="newDimItem.httpBody" placeholder="body args"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpHeaders"
-							ng-model="newDimItem.httpHeaders" placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
-							<td>
-								<select name="item-content-type" id="item-content-type"
-									ng-model="newDimItem.contentType">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="application/atom+xml">application/atom+xml</option>
-									<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
-									<option value="application/json">application/json</option>
-									<option value="application/octet-stream">application/octet-stream</option>
-									<option value="application/svg+xml">application/svg+xml</option>
-									<option value="application/xhtml+xml">application/xhtml+xml</option>
-									<option value="application/xml">application/xml</option>
-									<option value="*">*</option>
-									<option value="multipart/form-data">multipart/form-data</option>
-									<option value="text/html">text/html</option>
-									<option value="text/plain">text/plain</option>
-									<option value="text/xml">text/xml</option>
-									<option value="*/*">*/*</option>
-								</select>
-							</td>
-							<td><button class="btn btn-success" type="submit"
-									ng-click="addItemDim(newDimItem)">Add</button></td>
-						</tr>
-					</table>
-					</scrollable-table>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label" for="device-off-url">Off Items</label></td>
-
-				<td>
-					<scrollable-table watch="offDevices">
-					<table class="table table-bordered table-striped table-hover">
-						<thead>
-							<tr>
-								<th>Type</th>
-								<th>Target Item</th>
-								<th>Delay</th>
-								<th>Count</th>
-								<th>Filter IPs</th>
-								<th>Http Verb</th>
-								<th>Http Body</th>
-								<th>Http Headers</th>
-								<th>Content Type</th>
-								<th>Manage</th>
-							</tr>
-						</thead>
-						<tr ng-repeat="offItem in offDevices">
-							<td>
-								<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="offItem.type"></select>
-							</td>
-							<td><textarea rows="1" cols="20" class="form-control" id="item-target"
-							ng-model="offItem.item" placeholder="The Call"></textarea></td>
-							<td><textarea rows="1" cols="4" class="form-control" id="item-delay"
-							ng-model="offItem.delay" placeholder="millis"></textarea></td>
-							<td><textarea rows="1" cols="2" class="form-control" id="item-count"
-							ng-model="offItem.count" placeholder="number"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-filterIPs"
-							ng-model="offItem.filterIPs" placeholder="restrict IPs"></textarea></td>
-							<td>
-								<select name="item-http-verb" id="item-http-verb" ng-model="offItem.httpVerb">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="GET">GET</option>
-									<option value="PUT">PUT</option>
-									<option value="POST">POST</option>
-								</select>
-							</td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpBody"
-							ng-model="offItem.httpBody" placeholder="body args"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpHeaders"
-							ng-model="offItem.httpHeaders" placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
-							<td>
-								<select name="item-content-type" id="item-content-type"
-									ng-model="offItem.contentType">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="application/atom+xml">application/atom+xml</option>
-									<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
-									<option value="application/json">application/json</option>
-									<option value="application/octet-stream">application/octet-stream</option>
-									<option value="application/svg+xml">application/svg+xml</option>
-									<option value="application/xhtml+xml">application/xhtml+xml</option>
-									<option value="application/xml">application/xml</option>
-									<option value="*">*</option>
-									<option value="multipart/form-data">multipart/form-data</option>
-									<option value="text/html">text/html</option>
-									<option value="text/plain">text/plain</option>
-									<option value="text/xml">text/xml</option>
-									<option value="*/*">*/*</option>
-								</select>
-							</td>
-							<td><button class="btn btn-danger" type="submit"
-									ng-click="removeItemOff(offItem)">Del</button></td>
-						</tr>
-						<tr>
-							<td>
-								<select ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]" ng-model="newOffItem.type"></select>
-							</td>
-							<td><textarea rows="1" cols="20" class="form-control" id="item-target"
-							ng-model="newOffItem.item" placeholder="The Call"></textarea></td>
-							<td><textarea rows="1" cols="4" class="form-control" id="item-delay"
-							ng-model="newOffItem.delay" placeholder="millis"></textarea></td>
-							<td><textarea rows="1" cols="2" class="form-control" id="item-count"
-							ng-model="newOffItem.count" placeholder="number"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-filterIPs"
-							ng-model="newOffItem.filterIPs" placeholder="restrict IPs"></textarea></td>
-							<td>
-								<select name="item-http-verb" id="item-http-verb" ng-model="newOffItem.httpVerb">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="GET">GET</option>
-									<option value="PUT">PUT</option>
-									<option value="POST">POST</option>
-								</select>
-							</td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpBody"
-							ng-model="newOffItem.httpBody" placeholder="body args"></textarea></td>
-							<td><textarea rows="1" cols="16" class="form-control" id="item-httpHeaders"
-							ng-model="newOffItem.httpHeaders" placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
-							<td>
-								<select name="item-content-type" id="item-content-type"
-									ng-model="newOffItem.contentType">
-									<option value="">---Please select---</option>
-									<!-- not selected / blank option -->
-									<option value="application/atom+xml">application/atom+xml</option>
-									<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
-									<option value="application/json">application/json</option>
-									<option value="application/octet-stream">application/octet-stream</option>
-									<option value="application/svg+xml">application/svg+xml</option>
-									<option value="application/xhtml+xml">application/xhtml+xml</option>
-									<option value="application/xml">application/xml</option>
-									<option value="*">*</option>
-									<option value="multipart/form-data">multipart/form-data</option>
-									<option value="text/html">text/html</option>
-									<option value="text/plain">text/plain</option>
-									<option value="text/xml">text/xml</option>
-									<option value="*/*">*/*</option>
-								</select>
-							</td>
-							<td><button class="btn btn-success" type="submit"
-									ng-click="addItemOff(newOffItem)">Add</button></td>
-						</tr>
-					</table>
-					</scrollable-table>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label" for="device-headers">HTTP Headers</label></td>
-
-				<td>
-					<textarea rows="3" class="form-control" id="device-headers"
-						ng-model="device.headers"
-						placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label"
-					for="device-http-verb">Http Verb</label></td>
-
-				<td>
-					<select name="device-http-verb" id="device-http-verb"
-						ng-model="device.httpVerb">
-						<option value="">---Please select---</option>
-						<!-- not selected / blank option -->
-						<option value="GET">GET</option>
-						<option value="PUT">PUT</option>
-						<option value="POST">POST</option>
-					</select>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label"
-					for="device-content-type">Content Type</label></td>
-
-				<td>
-					<select name="device-content-type" id="device-content-type"
-						ng-model="device.contentType">
-						<option value="">---Please select---</option>
-						<!-- not selected / blank option -->
-						<option value="application/atom+xml">application/atom+xml</option>
-						<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
-						<option value="application/json">application/json</option>
-						<option value="application/octet-stream">application/octet-stream</option>
-						<option value="application/svg+xml">application/svg+xml</option>
-						<option value="application/xhtml+xml">application/xhtml+xml</option>
-						<option value="application/xml">application/xml</option>
-						<option value="*">*</option>
-						<option value="multipart/form-data">multipart/form-data</option>
-						<option value="text/html">text/html</option>
-						<option value="text/plain">text/plain</option>
-						<option value="text/xml">text/xml</option>
-						<option value="*/*">*/*</option>
-					</select>
-				</td>
-		</tr>
-		<tr>
+				<tr>
 					<td><label class="col-xs-12 col-sm-2 control-label"
-					for="device-content-body">Content Body On</label></td>
+						for="device-name">Name</label></td>
 
-				<td>
-					<textarea rows="3" class="form-control" id="device-content-body"
-						ng-model="device.contentBody"
-						placeholder="Content Body On for specific GET/PUT/POST type"></textarea>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label"
-					for="device-content-body-dim">Content Body Dim</label></td>
+					<td><input type="text" class="form-control" id="device-name"
+						ng-model="device.name" placeholder="Device Name"></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-target">Target</label></td>
 
-				<td>
-					<textarea rows="3" class="form-control" id="device-content-body-dim"
-						ng-model="device.contentBodyDim"
-						placeholder="Content Body Dim for specific GET/PUT/POST type"></textarea>
-				</td>
-		</tr>
-		<tr>
-				<td><label class="col-xs-12 col-sm-2 control-label"
-					for="device-content-body-off">Content Body Off</label></td>
+					<td><input type="text" class="form-control" id="device-target"
+						ng-model="device.targetDevice" placeholder="default"></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-type">Device Type</label></td>
 
-				<td>
-					<textarea rows="3" class="form-control"
-						id="device-content-body-off" ng-model="device.contentBodyOff"
-						placeholder="Content Body Off for specific GET/PUT/POST type"></textarea>
-				</td>
-		</tr>
-	</table>
-	</form>
+					<td><select name="device-type" id="device-type"
+						ng-model="device.deviceType">
+							<option value="">---Types if needed---</option>
+							<!-- not selected / blank option -->
+							<option value="custom">Custom</option>
+							<option value="UDP">UDP</option>
+							<option value="TCP">TCP</option>
+							<option value="exec">Execute Script/Program</option>
+							<option value="switch">Switch</option>
+							<option value="scene">Scene</option>
+							<option value="macro">Macro</option>
+							<option value="group">Group</option>
+							<option value="activity">Activity</option>
+							<option value="button">Button</option>
+							<option value="thermo">Thermo</option>
+							<option value="passthru">Pass Thru</option>
+					</select></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-map-type">Map Type</label></td>
+
+					<td><select
+						ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
+						ng-model="mapTypeSelected"></select></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-unique-id">Unique Id (used for Hue responses)</label></td>
+
+					<td><input type="text" class="form-control"
+						id="device-unique-id" ng-model="device.uniqueid"
+						placeholder="AA:BB:CC:DD:EE:FF-XX" readonly></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-map-id">Map ID</label></td>
+
+					<td><input type="text" class="form-control" id="device-map-id"
+						ng-model="device.mapId" placeholder="1111"></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-on-url">On Items</label></td>
+
+					<td><scrollable-table watch="onDevices">
+						<table class="table table-bordered table-striped table-hover">
+							<thead>
+								<tr>
+									<th>Type</th>
+									<th>Target Item</th>
+									<th>Delay</th>
+									<th>Count</th>
+									<th>Filter IPs</th>
+									<th>Http Verb</th>
+									<th>Http Body</th>
+									<th>Http Headers</th>
+									<th>Content Type</th>
+									<th>Manage</th>
+								</tr>
+							</thead>
+							<tr ng-repeat="onItem in onDevices">
+								<td><select
+									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
+									ng-model="onItem.type"></select></td>
+								<td><textarea rows="1" cols="20" class="form-control"
+										id="item-target" ng-model="onItem.item" placeholder="The Call"></textarea></td>
+								<td><textarea rows="1" cols="4" class="form-control"
+										id="item-delay" ng-model="onItem.delay" placeholder="millis"></textarea></td>
+								<td><textarea rows="1" cols="2" class="form-control"
+										id="item-count" ng-model="onItem.count" placeholder="number"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-filterIPs" ng-model="onItem.filterIPs"
+										placeholder="restrict IPs"></textarea></td>
+								<td><select name="item-http-verb" id="item-http-verb"
+									ng-model="onItem.httpVerb">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="GET">GET</option>
+										<option value="PUT">PUT</option>
+										<option value="POST">POST</option>
+								</select></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpBody" ng-model="onItem.httpBody"
+										placeholder="body args"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpHeaders" ng-model="onItem.httpHeaders"
+										placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
+								<td><select name="item-content-type" id="item-content-type"
+									ng-model="onItem.contentType">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="application/atom+xml">application/atom+xml</option>
+										<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
+										<option value="application/json">application/json</option>
+										<option value="application/octet-stream">application/octet-stream</option>
+										<option value="application/svg+xml">application/svg+xml</option>
+										<option value="application/xhtml+xml">application/xhtml+xml</option>
+										<option value="application/xml">application/xml</option>
+										<option value="*">*</option>
+										<option value="multipart/form-data">multipart/form-data</option>
+										<option value="text/html">text/html</option>
+										<option value="text/plain">text/plain</option>
+										<option value="text/xml">text/xml</option>
+										<option value="*/*">*/*</option>
+								</select></td>
+								<td><button class="btn btn-danger" type="submit"
+										ng-click="removeItemOn(onItem)">Del</button></td>
+							</tr>
+							<tr>
+								<td><select
+									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
+									ng-model="newOnItem.type"></select></td>
+								<td><textarea rows="1" cols="20" class="form-control"
+										id="item-target" ng-model="newOnItem.item"
+										placeholder="The Call"></textarea></td>
+								<td><textarea rows="1" cols="4" class="form-control"
+										id="item-delay" ng-model="newOnItem.delay"
+										placeholder="millis"></textarea></td>
+								<td><textarea rows="1" cols="2" class="form-control"
+										id="item-count" ng-model="newOnItem.count"
+										placeholder="number"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-filterIPs" ng-model="newOnItem.filterIPs"
+										placeholder="restrict IPs"></textarea></td>
+								<td><select name="item-http-verb" id="item-http-verb"
+									ng-model="newOnItem.httpVerb">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="GET">GET</option>
+										<option value="PUT">PUT</option>
+										<option value="POST">POST</option>
+								</select></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpBody" ng-model="newOnItem.httpBody"
+										placeholder="body args"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpHeaders" ng-model="newOnItem.httpHeaders"
+										placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
+								<td><select name="item-content-type" id="item-content-type"
+									ng-model="newOnItem.contentType">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="application/atom+xml">application/atom+xml</option>
+										<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
+										<option value="application/json">application/json</option>
+										<option value="application/octet-stream">application/octet-stream</option>
+										<option value="application/svg+xml">application/svg+xml</option>
+										<option value="application/xhtml+xml">application/xhtml+xml</option>
+										<option value="application/xml">application/xml</option>
+										<option value="*">*</option>
+										<option value="multipart/form-data">multipart/form-data</option>
+										<option value="text/html">text/html</option>
+										<option value="text/plain">text/plain</option>
+										<option value="text/xml">text/xml</option>
+										<option value="*/*">*/*</option>
+								</select></td>
+								<td><button class="btn btn-success" type="submit"
+										ng-click="addItemOn(newOnItem)">Add</button></td>
+							</tr>
+						</table>
+						</scrollable-table></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-dim-url">Dim Items</label></td>
+
+					<td><scrollable-table watch="dimDevices">
+						<table class="table table-bordered table-striped table-hover">
+							<thead>
+								<tr>
+									<th>Type</th>
+									<th>Target Item</th>
+									<th>Delay</th>
+									<th>Count</th>
+									<th>Filter IPs</th>
+									<th>Http Verb</th>
+									<th>Http Body</th>
+									<th>Http Headers</th>
+									<th>Content Type</th>
+									<th>Manage</th>
+								</tr>
+							</thead>
+							<tr ng-repeat="dimItem in dimDevices">
+								<td><select
+									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
+									ng-model="dimItem.type"></select></td>
+								<td><textarea rows="1" cols="20" class="form-control"
+										id="item-target" ng-model="dimItem.item"
+										placeholder="The Call"></textarea></td>
+								<td><textarea rows="1" cols="4" class="form-control"
+										id="item-delay" ng-model="dimItem.delay" placeholder="millis"></textarea></td>
+								<td><textarea rows="1" cols="2" class="form-control"
+										id="item-count" ng-model="dimItem.count" placeholder="number"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-filterIPs" ng-model="dimItem.filterIPs"
+										placeholder="restrict IPs"></textarea></td>
+								<td><select name="item-http-verb" id="item-http-verb"
+									ng-model="dimItem.httpVerb">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="GET">GET</option>
+										<option value="PUT">PUT</option>
+										<option value="POST">POST</option>
+								</select></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpBody" ng-model="dimItem.httpBody"
+										placeholder="body args"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpHeaders" ng-model="dimItem.httpHeaders"
+										placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
+								<td><select name="item-content-type" id="item-content-type"
+									ng-model="dimItem.contentType">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="application/atom+xml">application/atom+xml</option>
+										<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
+										<option value="application/json">application/json</option>
+										<option value="application/octet-stream">application/octet-stream</option>
+										<option value="application/svg+xml">application/svg+xml</option>
+										<option value="application/xhtml+xml">application/xhtml+xml</option>
+										<option value="application/xml">application/xml</option>
+										<option value="*">*</option>
+										<option value="multipart/form-data">multipart/form-data</option>
+										<option value="text/html">text/html</option>
+										<option value="text/plain">text/plain</option>
+										<option value="text/xml">text/xml</option>
+										<option value="*/*">*/*</option>
+								</select></td>
+								<td><button class="btn btn-danger" type="submit"
+										ng-click="removeItemDim(dimItem)">Del</button></td>
+							</tr>
+							<tr>
+								<td><select
+									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
+									ng-model="newDimItem.type"></select></td>
+								<td><textarea rows="1" cols="20" class="form-control"
+										id="item-target" ng-model="newDimItem.item"
+										placeholder="The Call"></textarea></td>
+								<td><textarea rows="1" cols="4" class="form-control"
+										id="item-delay" ng-model="newDimItem.delay"
+										placeholder="millis"></textarea></td>
+								<td><textarea rows="1" cols="2" class="form-control"
+										id="item-count" ng-model="newDimItem.count"
+										placeholder="number"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-filterIPs" ng-model="newDimItem.filterIPs"
+										placeholder="restrict IPs"></textarea></td>
+								<td><select name="item-http-verb" id="item-http-verb"
+									ng-model="newDimItem.httpVerb">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="GET">GET</option>
+										<option value="PUT">PUT</option>
+										<option value="POST">POST</option>
+								</select></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpBody" ng-model="newDimItem.httpBody"
+										placeholder="body args"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpHeaders" ng-model="newDimItem.httpHeaders"
+										placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
+								<td><select name="item-content-type" id="item-content-type"
+									ng-model="newDimItem.contentType">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="application/atom+xml">application/atom+xml</option>
+										<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
+										<option value="application/json">application/json</option>
+										<option value="application/octet-stream">application/octet-stream</option>
+										<option value="application/svg+xml">application/svg+xml</option>
+										<option value="application/xhtml+xml">application/xhtml+xml</option>
+										<option value="application/xml">application/xml</option>
+										<option value="*">*</option>
+										<option value="multipart/form-data">multipart/form-data</option>
+										<option value="text/html">text/html</option>
+										<option value="text/plain">text/plain</option>
+										<option value="text/xml">text/xml</option>
+										<option value="*/*">*/*</option>
+								</select></td>
+								<td><button class="btn btn-success" type="submit"
+										ng-click="addItemDim(newDimItem)">Add</button></td>
+							</tr>
+						</table>
+						</scrollable-table></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-off-url">Off Items</label></td>
+
+					<td><scrollable-table watch="offDevices">
+						<table class="table table-bordered table-striped table-hover">
+							<thead>
+								<tr>
+									<th>Type</th>
+									<th>Target Item</th>
+									<th>Delay</th>
+									<th>Count</th>
+									<th>Filter IPs</th>
+									<th>Http Verb</th>
+									<th>Http Body</th>
+									<th>Http Headers</th>
+									<th>Content Type</th>
+									<th>Manage</th>
+								</tr>
+							</thead>
+							<tr ng-repeat="offItem in offDevices">
+								<td><select
+									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
+									ng-model="offItem.type"></select></td>
+								<td><textarea rows="1" cols="20" class="form-control"
+										id="item-target" ng-model="offItem.item"
+										placeholder="The Call"></textarea></td>
+								<td><textarea rows="1" cols="4" class="form-control"
+										id="item-delay" ng-model="offItem.delay" placeholder="millis"></textarea></td>
+								<td><textarea rows="1" cols="2" class="form-control"
+										id="item-count" ng-model="offItem.count" placeholder="number"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-filterIPs" ng-model="offItem.filterIPs"
+										placeholder="restrict IPs"></textarea></td>
+								<td><select name="item-http-verb" id="item-http-verb"
+									ng-model="offItem.httpVerb">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="GET">GET</option>
+										<option value="PUT">PUT</option>
+										<option value="POST">POST</option>
+								</select></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpBody" ng-model="offItem.httpBody"
+										placeholder="body args"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpHeaders" ng-model="offItem.httpHeaders"
+										placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
+								<td><select name="item-content-type" id="item-content-type"
+									ng-model="offItem.contentType">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="application/atom+xml">application/atom+xml</option>
+										<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
+										<option value="application/json">application/json</option>
+										<option value="application/octet-stream">application/octet-stream</option>
+										<option value="application/svg+xml">application/svg+xml</option>
+										<option value="application/xhtml+xml">application/xhtml+xml</option>
+										<option value="application/xml">application/xml</option>
+										<option value="*">*</option>
+										<option value="multipart/form-data">multipart/form-data</option>
+										<option value="text/html">text/html</option>
+										<option value="text/plain">text/plain</option>
+										<option value="text/xml">text/xml</option>
+										<option value="*/*">*/*</option>
+								</select></td>
+								<td><button class="btn btn-danger" type="submit"
+										ng-click="removeItemOff(offItem)">Del</button></td>
+							</tr>
+							<tr>
+								<td><select
+									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
+									ng-model="newOffItem.type"></select></td>
+								<td><textarea rows="1" cols="20" class="form-control"
+										id="item-target" ng-model="newOffItem.item"
+										placeholder="The Call"></textarea></td>
+								<td><textarea rows="1" cols="4" class="form-control"
+										id="item-delay" ng-model="newOffItem.delay"
+										placeholder="millis"></textarea></td>
+								<td><textarea rows="1" cols="2" class="form-control"
+										id="item-count" ng-model="newOffItem.count"
+										placeholder="number"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-filterIPs" ng-model="newOffItem.filterIPs"
+										placeholder="restrict IPs"></textarea></td>
+								<td><select name="item-http-verb" id="item-http-verb"
+									ng-model="newOffItem.httpVerb">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="GET">GET</option>
+										<option value="PUT">PUT</option>
+										<option value="POST">POST</option>
+								</select></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpBody" ng-model="newOffItem.httpBody"
+										placeholder="body args"></textarea></td>
+								<td><textarea rows="1" cols="16" class="form-control"
+										id="item-httpHeaders" ng-model="newOffItem.httpHeaders"
+										placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea></td>
+								<td><select name="item-content-type" id="item-content-type"
+									ng-model="newOffItem.contentType">
+										<option value="">---Please select---</option>
+										<!-- not selected / blank option -->
+										<option value="application/atom+xml">application/atom+xml</option>
+										<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
+										<option value="application/json">application/json</option>
+										<option value="application/octet-stream">application/octet-stream</option>
+										<option value="application/svg+xml">application/svg+xml</option>
+										<option value="application/xhtml+xml">application/xhtml+xml</option>
+										<option value="application/xml">application/xml</option>
+										<option value="*">*</option>
+										<option value="multipart/form-data">multipart/form-data</option>
+										<option value="text/html">text/html</option>
+										<option value="text/plain">text/plain</option>
+										<option value="text/xml">text/xml</option>
+										<option value="*/*">*/*</option>
+								</select></td>
+								<td><button class="btn btn-success" type="submit"
+										ng-click="addItemOff(newOffItem)">Add</button></td>
+							</tr>
+						</table>
+						</scrollable-table></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-headers">HTTP Headers</label></td>
+
+					<td><textarea rows="3" class="form-control"
+							id="device-headers" ng-model="device.headers"
+							placeholder="format like: [{&quot;name&quot;:&quot;A name&quot;,&quot;value&quot;:&quot;a value&quot;}]"></textarea>
+					</td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-http-verb">Http Verb</label></td>
+
+					<td><select name="device-http-verb" id="device-http-verb"
+						ng-model="device.httpVerb">
+							<option value="">---Please select---</option>
+							<!-- not selected / blank option -->
+							<option value="GET">GET</option>
+							<option value="PUT">PUT</option>
+							<option value="POST">POST</option>
+					</select></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-content-type">Content Type</label></td>
+
+					<td><select name="device-content-type"
+						id="device-content-type" ng-model="device.contentType">
+							<option value="">---Please select---</option>
+							<!-- not selected / blank option -->
+							<option value="application/atom+xml">application/atom+xml</option>
+							<option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded</option>
+							<option value="application/json">application/json</option>
+							<option value="application/octet-stream">application/octet-stream</option>
+							<option value="application/svg+xml">application/svg+xml</option>
+							<option value="application/xhtml+xml">application/xhtml+xml</option>
+							<option value="application/xml">application/xml</option>
+							<option value="*">*</option>
+							<option value="multipart/form-data">multipart/form-data</option>
+							<option value="text/html">text/html</option>
+							<option value="text/plain">text/plain</option>
+							<option value="text/xml">text/xml</option>
+							<option value="*/*">*/*</option>
+					</select></td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-content-body">Content Body On</label></td>
+
+					<td><textarea rows="3" class="form-control"
+							id="device-content-body" ng-model="device.contentBody"
+							placeholder="Content Body On for specific GET/PUT/POST type"></textarea>
+					</td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-content-body-dim">Content Body Dim</label></td>
+
+					<td><textarea rows="3" class="form-control"
+							id="device-content-body-dim" ng-model="device.contentBodyDim"
+							placeholder="Content Body Dim for specific GET/PUT/POST type"></textarea>
+					</td>
+				</tr>
+				<tr>
+					<td><label class="col-xs-12 col-sm-2 control-label"
+						for="device-content-body-off">Content Body Off</label></td>
+
+					<td><textarea rows="3" class="form-control"
+							id="device-content-body-off" ng-model="device.contentBodyOff"
+							placeholder="Content Body Off for specific GET/PUT/POST type"></textarea>
+					</td>
+				</tr>
+			</table>
+		</form>
 	</div>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/public/views/editor.html b/src/main/resources/public/views/editor.html
index 4a6499e..96c2274 100644
--- a/src/main/resources/public/views/editor.html
+++ b/src/main/resources/public/views/editor.html
@@ -17,8 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation" class="active"><a href="#/editor">Manual
-			Add</a></li>
+	<li role="presentation" class="active"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/haldevice.html b/src/main/resources/public/views/haldevice.html
index 1ea0ae0..e84d689 100644
--- a/src/main/resources/public/views/haldevice.html
+++ b/src/main/resources/public/views/haldevice.html
@@ -16,7 +16,7 @@
 			Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/harmonyactivity.html b/src/main/resources/public/views/harmonyactivity.html
index 12dd2ea..6c3775d 100644
--- a/src/main/resources/public/views/harmonyactivity.html
+++ b/src/main/resources/public/views/harmonyactivity.html
@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/harmonydevice.html b/src/main/resources/public/views/harmonydevice.html
index 8ac0bcc..bed932e 100644
--- a/src/main/resources/public/views/harmonydevice.html
+++ b/src/main/resources/public/views/harmonydevice.html
@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/hassdevice.html b/src/main/resources/public/views/hassdevice.html
index e534dcd..e5d71b0 100644
--- a/src/main/resources/public/views/hassdevice.html
+++ b/src/main/resources/public/views/hassdevice.html
@@ -17,7 +17,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li role="presentation" class="active"><a href="#/hassdevices">HomeAssistant
 			Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/huedevice.html b/src/main/resources/public/views/huedevice.html
index 295272e..ac50abd 100644
--- a/src/main/resources/public/views/huedevice.html
+++ b/src/main/resources/public/views/huedevice.html
@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/logs.html b/src/main/resources/public/views/logs.html
index 8804ec2..55a8b78 100644
--- a/src/main/resources/public/views/logs.html
+++ b/src/main/resources/public/views/logs.html
@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/mqttpublish.html b/src/main/resources/public/views/mqttpublish.html
index 111e270..c91b8d2 100644
--- a/src/main/resources/public/views/mqttpublish.html
+++ b/src/main/resources/public/views/mqttpublish.html
@@ -11,7 +11,7 @@
 	<li ng-if="bridge.showHal" role="presentation"><a href="#/haldevices">HAL Devices</a></li>
 	<li role="presentation" class="active"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/nestactions.html b/src/main/resources/public/views/nestactions.html
index 828ac80..2bd0bda 100644
--- a/src/main/resources/public/views/nestactions.html
+++ b/src/main/resources/public/views/nestactions.html
@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/system.html b/src/main/resources/public/views/system.html
index 4b6669d..15047bf 100644
--- a/src/main/resources/public/views/system.html
+++ b/src/main/resources/public/views/system.html
@@ -18,7 +18,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/veradevice.html b/src/main/resources/public/views/veradevice.html
index 3c328c8..58f6eaa 100644
--- a/src/main/resources/public/views/veradevice.html
+++ b/src/main/resources/public/views/veradevice.html
@@ -16,7 +16,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">
diff --git a/src/main/resources/public/views/verascene.html b/src/main/resources/public/views/verascene.html
index 4fea6d6..bde29a3 100644
--- a/src/main/resources/public/views/verascene.html
+++ b/src/main/resources/public/views/verascene.html
@@ -16,7 +16,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">