diff --git a/.gitignore b/.gitignore
index 3206a9e..86f091d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,49 @@
 *.log
 sftp-config.json
 .remote-sync.json
+
+########################
+# sails
+########################
+.sails
+.waterline
+.rigging
+.tmp
+
+
+########################
+# node.js / npm
+########################
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+node_modules
+
+npm-debug.log
+
+
+########################
+# misc / editors
+########################
+*~
+*#
+.DS_STORE
+.netbeans
+nbproject
+.idea
+
+
+########################
+# local config
+########################
+config/local.js
diff --git a/www/.tmp/public/favicon.ico b/www/.tmp/public/favicon.ico
index 0092ec9..648ddb6 100644
Binary files a/www/.tmp/public/favicon.ico and b/www/.tmp/public/favicon.ico differ
diff --git a/www/.tmp/public/js/ng/controller_config.js b/www/.tmp/public/js/ng/controller_config.js
index ad8a752..12566bd 100644
--- a/www/.tmp/public/js/ng/controller_config.js
+++ b/www/.tmp/public/js/ng/controller_config.js
@@ -32,9 +32,18 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
             }
             config.submitParameter($scope.newParam);
             $scope.loadConfig();
+			$scope.newParam.pEntry = "";
+			$scope.newParam.val = "";
         }
     };
 
+	$scope.deleteParameter = function(id){
+		var deleteParam = config.deleteParameter(id);
+		deleteParam.then(function(d){
+			$scope.loadConfig();
+		});
+	};
+
     $scope.checkLogger = function(){
         $scope.loggerLoading = true;
         var checkLoggerStatus = config.getLoggerStatus();
@@ -73,11 +82,19 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
 
     $scope.addDevice = function(dev){
         var addDevice = devices.addDevice(dev);
-        getDevices.then(function(d){
+        addDevice.then(function(d){
             $scope.getDevices();
+			$scope.newDevice.address = "";
         });
     };
 
+	$scope.deleteDevice = function(id){
+		var deleteDevice = devices.deleteDevice(id);
+		deleteDevice.then(function(d){
+			$scope.getDevices();
+		});
+	};
+
     var getDeviceTypes = devices.getDeviceTypes();
     getDeviceTypes.then(function(d){
         $scope.device_types = d.device_types;
diff --git a/www/.tmp/public/js/ng/controller_tags.js b/www/.tmp/public/js/ng/controller_tags.js
index 49bbc7c..c7d3dd0 100644
--- a/www/.tmp/public/js/ng/controller_tags.js
+++ b/www/.tmp/public/js/ng/controller_tags.js
@@ -89,4 +89,8 @@ poconsole.controller('tagsCtrl', function($scope, $route, $http, $routeParams, P
         $scope.tags_to_plot = tags_to_plot.join();
     };
 
+	$scope.device_label = function(data_type_obj){
+		return data_type_obj.address + " - " + data_type_obj.device_type.dType;
+	};
+
 });
diff --git a/www/.tmp/public/js/ng/factory_config.js b/www/.tmp/public/js/ng/factory_config.js
index 34f8a83..a1abc40 100644
--- a/www/.tmp/public/js/ng/factory_config.js
+++ b/www/.tmp/public/js/ng/factory_config.js
@@ -11,27 +11,39 @@ poconsole.factory('config',function($q, $http, $log){
     };
 
     var submitParameter = function(entry){
+        var deferred = $q.defer();
         $http.post('/config', {
             parameter: entry.parameter,
             val: entry.val
         }).success(function(data){
-            return data;
+            deferred.resolve({
+    			data:data
+    		});
         });
+        return deferred.promise;
     };
 
     var updateParameter = function(entry){
+        var deferred = $q.defer();
         $http.post('/config/update/' + entry.id, {
             parameter: entry.parameter,
             val: entry.val
         }).success(function(data){
-            return data;
+            deferred.resolve({
+    			data:data
+    		});
         });
+        return deferred.promise;
     };
 
     var deleteParameter = function(id){
+        var deferred = $q.defer();
         $http.delete('/config/' + id).success(function(data){
-            return data;
+            deferred.resolve({
+    			data:data
+    		});
         });
+        return deferred.promise;
     };
 
     var getLoggerStatus = function(){
diff --git a/www/.tmp/public/js/ng/factory_devices.js b/www/.tmp/public/js/ng/factory_devices.js
index c9d2c42..e2395c1 100644
--- a/www/.tmp/public/js/ng/factory_devices.js
+++ b/www/.tmp/public/js/ng/factory_devices.js
@@ -21,21 +21,29 @@ poconsole.factory('devices', function($q, $http, $log){
 
     var addDevice = function(d){
         $log.info(d);
+        var deferred = $q.defer();
         $http.post('/device/create', {
             address: d.address,
             device_type: d.device_type.id
         }).success(function(data){
-            return data;
+            deferred.resolve({
+                data:data
+            });
         });
+        return deferred.promise;
     };
 
     var updateDevice = function(d){
+        var deferred = $q.defer();
         $http.post('/device/update/' + d.id, {
             address: d.address,
             device_type: d.device_type.id
         }).success(function(data){
-            return data;
+            deferred.resolve({
+                data:data
+            });
         });
+        return deferred.promise;
     };
 
     var deleteDevice = function(id){
diff --git a/www/.tmp/public/jst.js b/www/.tmp/public/jst.js
index d19218a..e54c4f7 100644
--- a/www/.tmp/public/jst.js
+++ b/www/.tmp/public/jst.js
@@ -4,7 +4,7 @@ this["JST"]["assets/templates/config.html"] = function(obj) {
 obj || (obj = {});
 var __t, __p = '', __e = _.escape;
 with (obj) {
-__p += '<div ng-if="loading" class="container">\n\t<div class="row">\n\t\t<div class="col-md-12 well" style="text-align:center;">\n\t\t\t<h1>Loading Config...</h1>\n\t\t\t<img class="img-responsive" src="/images/loading.gif"  style="margin:0 auto;"/>\n\t\t</div>\n\t</div>\n</div>\n\n<div ng-if="!loading">\n\t<div ng-if="error" class="container">\n\t\t<div class="row">\n\t\t\t<div class="col-md=12">\n\t\t\t\t<h1>Error Caught!</h1>\n\t\t\t\t<pre>{{message}}</pre>\n\t\t\t\t<button ng-click="loadDashboard()" class="btn btn-large btn-danger"><i class="fa fa-refresh"></i> Reload Dashboard</button>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\n\t<div ng-if="!error" class="container">\n\t\t<div class="row well">\n\t\t\t<div class="col-md-12">\n\t\t\t\t<h1 ng-if="!loggerLoading">Logger Status:\n\t\t\t\t\t<span ng-if="loggerRunning" class="label label-success">Running</span>\n\t\t\t\t\t<span ng-if="!loggerRunning" class="label label-danger">Not Running</span>\n\t\t\t\t</h1>\n\t\t\t\t<h1 ng-if="loggerLoading">\n\t\t\t\t\t<span class="label label-warning">Checking Logger Status...</span>\n\t\t\t\t</h1>\n\t\t\t\t<button class="btn btn-primary btn-large" ng-click="checkLogger()">Check Logger</button> <button class="btn btn-warning btn-large" ng-click="restartLogger()">Restart Logger</button>\n\t\t\t</div>\n\t\t</div>\n\n\t\t<div class="row">\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h1>Devices</h1>\n\t\t\t\t<button ng-click="getDevices()" class="btn btn-large btn-success"><i class="fa fa-refresh"></i> Reload Devices</button>\n\t\t\t\t<table class="table">\n\t\t\t\t\t<thead>\n\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t<th>ID</th>\n\t\t\t\t\t\t\t<th>Address</th>\n\t\t\t\t\t\t\t<th>Type</th>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</thead>\n\n\t\t\t\t\t<tbody>\n\t\t\t\t\t\t<tr ng-repeat="device in devices">\n\t\t\t\t\t\t\t<td>{{device.id}}</td>\n\t\t\t\t\t\t\t<td>{{device.address}}</td>\n\t\t\t\t\t\t\t<td>{{device.device_type.dType}}</td>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</tbody>\n\t\t\t\t</table>\n\t\t\t</div>\n\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h1>Configuration Parameters</h1>\n\t\t\t\t<button ng-click="loadConfig()" class="btn btn-large btn-success"><i class="fa fa-refresh"></i> Reload Config</button>\n\t\t\t\t<table class="table">\n\t\t\t\t\t<thead>\n\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t<th>Parameter</th>\n\t\t\t\t\t\t\t<th>Value</th>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</thead>\n\n\t\t\t\t\t<tbody>\n\t\t\t\t\t\t<tr ng-repeat="param in config">\n\t\t\t\t\t\t\t<td>{{param.parameter}}</td>\n\t\t\t\t\t\t\t<td>{{param.val}}</td>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</tbody>\n\t\t\t\t</table>\n\t\t\t</div>\n\t\t</div>\n\t\t<div class="row">\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h2>New Device</h2>\n\t\t\t\t<form>\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="ip_address">IP Address</label>\n\t\t\t\t\t\t<input type="text" class="form-control" id="ip_address" ng-model="newDevice.address" placeholder="###.###.###.###">\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="device_type">Device Type</label>\n\t\t\t\t\t\t<select ng-model="newDevice.device_type" ng-options="t as t.dType for t in device_types track by t.id" class="form-control" id="device_type"></select>\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<button class="btn btn-primary" ng-click="addDevice(newDevice)">Add Device</button>\n\t\t\t\t</form>\n\t\t\t</div>\n\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h2>New Parameter</h2>\n\t\t\t\t<form>\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="pSelected">Parameter</label>\n\t\t\t\t\t\t<select class="form-control" id="pSelected" ng-model="newParam.pSelected">\n\t\t\t\t\t\t\t<option value="ip_address">PLC IP Address</option>\n\t\t\t\t\t\t\t<option value="scan_rate">Scan Rate</option>\n\t\t\t\t\t\t\t<option value="other">Other</option>\n\t\t\t\t\t\t</select>\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<div class="form-group" ng-if="newParam.pSelected==\'other\'">\n\t\t\t\t\t\t<label for="pEntry">Parameter Entry</label>\n\t\t\t\t\t\t<input type="text" class="form-control" id="val" ng-model="newParam.pEntry" placeholder="Parameter Name">\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="val">Value</label>\n\t\t\t\t\t\t<input type="text" class="form-control" id="val" ng-model="newParam.val" placeholder="Parameter Value">\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<button class="btn btn-primary" ng-click="addParameter()">Set Parameter</button>\n\t\t\t\t</form>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>\n';
+__p += '<div ng-if="loading" class="container">\n\t<div class="row">\n\t\t<div class="col-md-12 well" style="text-align:center;">\n\t\t\t<h1>Loading Config...</h1>\n\t\t\t<img class="img-responsive" src="/images/loading.gif"  style="margin:0 auto;"/>\n\t\t</div>\n\t</div>\n</div>\n\n<div ng-if="!loading">\n\t<div ng-if="error" class="container">\n\t\t<div class="row">\n\t\t\t<div class="col-md=12">\n\t\t\t\t<h1>Error Caught!</h1>\n\t\t\t\t<pre>{{message}}</pre>\n\t\t\t\t<button ng-click="loadDashboard()" class="btn btn-large btn-danger"><i class="fa fa-refresh"></i> Reload Dashboard</button>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\n\t<div ng-if="!error" class="container">\n\t\t<div class="row well">\n\t\t\t<div class="col-md-12">\n\t\t\t\t<h1 ng-if="!loggerLoading">Logger Status:\n\t\t\t\t\t<span ng-if="loggerRunning" class="label label-success">Running</span>\n\t\t\t\t\t<span ng-if="!loggerRunning" class="label label-danger">Not Running</span>\n\t\t\t\t</h1>\n\t\t\t\t<h1 ng-if="loggerLoading">\n\t\t\t\t\t<span class="label label-warning">Checking Logger Status...</span>\n\t\t\t\t</h1>\n\t\t\t\t<button class="btn btn-primary btn-large" ng-click="checkLogger()">Check Logger</button> <button class="btn btn-warning btn-large" ng-click="restartLogger()">Restart Logger</button>\n\t\t\t</div>\n\t\t</div>\n\n\t\t<div class="row">\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h1>Devices</h1>\n\t\t\t\t<button ng-click="getDevices()" class="btn btn-large btn-success"><i class="fa fa-refresh"></i> Reload Devices</button>\n\t\t\t\t<table class="table">\n\t\t\t\t\t<thead>\n\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t<!-- <th>ID</th> -->\n\t\t\t\t\t\t\t<th>Address</th>\n\t\t\t\t\t\t\t<th>Type</th>\n\t\t\t\t\t\t\t<!-- <th></th> -->\n\t\t\t\t\t\t\t<th></th>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</thead>\n\n\t\t\t\t\t<tbody>\n\t\t\t\t\t\t<tr ng-repeat="device in devices">\n\t\t\t\t\t\t\t<!-- <td>{{device.id}}</td> -->\n\t\t\t\t\t\t\t<td>{{device.address}}</td>\n\t\t\t\t\t\t\t<td>{{device.device_type.dType}}</td>\n\t\t\t\t\t\t\t<!-- <td><i class="fa fa-pencil"></i></td> -->\n\t\t\t\t\t\t\t<td><i class="fa fa-times" ng-click="deleteDevice(device.id)"></i></td>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</tbody>\n\t\t\t\t</table>\n\t\t\t</div>\n\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h1>Configuration Parameters</h1>\n\t\t\t\t<button ng-click="loadConfig()" class="btn btn-large btn-success"><i class="fa fa-refresh"></i> Reload Config</button>\n\t\t\t\t<table class="table">\n\t\t\t\t\t<thead>\n\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t<th>Parameter</th>\n\t\t\t\t\t\t\t<th>Value</th>\n\t\t\t\t\t\t\t<!-- <th></th> -->\n\t\t\t\t\t\t\t<th></th>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</thead>\n\n\t\t\t\t\t<tbody>\n\t\t\t\t\t\t<tr ng-repeat="param in config">\n\t\t\t\t\t\t\t<td>{{param.parameter}}</td>\n\t\t\t\t\t\t\t<td>{{param.val}}</td>\n\t\t\t\t\t\t\t<!-- <td><i class="fa fa-pencil"></i></td> -->\n\t\t\t\t\t\t\t<td><i class="fa fa-times" ng-click="deleteParameter(param.id)"></i></td>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</tbody>\n\t\t\t\t</table>\n\t\t\t</div>\n\t\t</div>\n\t\t<div class="row">\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h2>New Device</h2>\n\t\t\t\t<form>\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="ip_address">IP Address</label>\n\t\t\t\t\t\t<input type="text" class="form-control" id="ip_address" ng-model="newDevice.address" placeholder="###.###.###.###">\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="device_type">Device Type</label>\n\t\t\t\t\t\t<select ng-model="newDevice.device_type" ng-options="t as t.dType for t in device_types track by t.id" class="form-control" id="device_type"></select>\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<button class="btn btn-primary" ng-click="addDevice(newDevice)">Add Device</button>\n\t\t\t\t</form>\n\t\t\t</div>\n\n\t\t\t<div class="col-md-6">\n\t\t\t\t<h2>New Parameter</h2>\n\t\t\t\t<form>\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="pSelected">Parameter</label>\n\t\t\t\t\t\t<select class="form-control" id="pSelected" ng-model="newParam.pSelected">\n\t\t\t\t\t\t\t<option value="ip_address">PLC IP Address</option>\n\t\t\t\t\t\t\t<option value="scan_rate">Scan Rate</option>\n\t\t\t\t\t\t\t<option value="other">Other</option>\n\t\t\t\t\t\t</select>\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<div class="form-group" ng-if="newParam.pSelected==\'other\'">\n\t\t\t\t\t\t<label for="pEntry">Parameter Entry</label>\n\t\t\t\t\t\t<input type="text" class="form-control" id="val" ng-model="newParam.pEntry" placeholder="Parameter Name">\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<div class="form-group">\n\t\t\t\t\t\t<label for="val">Value</label>\n\t\t\t\t\t\t<input type="text" class="form-control" id="val" ng-model="newParam.val" placeholder="Parameter Value">\n\t\t\t\t\t</div>\n\n\t\t\t\t\t<button class="btn btn-primary" ng-click="addParameter()">Set Parameter</button>\n\t\t\t\t</form>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>\n';
 
 }
 return __p
@@ -34,7 +34,7 @@ this["JST"]["assets/templates/tags.html"] = function(obj) {
 obj || (obj = {});
 var __t, __p = '', __e = _.escape;
 with (obj) {
-__p += '<div class="modal fade" id="addModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Add a New Tag...</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <form>\n                    <div class="form-group">\n                        <label for="data_source">Data Source</label>\n                        <select ng-model="newTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>\n                    </div>\n                    <div class="form-group">\n                        <label for="tag">Tag</label>\n                        <input type="text" ng-model="newTag.tag" class="form-control" id="tag" placeholder="Tag Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="name">Name</label>\n                        <input type="text" ng-model="newTag.name" class="form-control" id="name" placeholder="Vanity Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="description">Description</label>\n                        <input type="textarea" ng-model="newTag.description" class="form-control" id="description" placeholder="Tag Description Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="data_type">Data Type</label>\n                        <select ng-model="newTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="minExpected">Minimum Value Expected</label>\n                            <input type="number" ng-model="newTag.minExpected" class="form-control" id="minExpected" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="maxExpected">Maximum Value Expected</label>\n                            <input type="number" ng-model="newTag.maxExpected" class="form-control" id="maxExpected" placeholder="100">\n                        </div>\n                    </div>\n                    <div class="col-md-2">\n                        <div class="form-group">\n                            <label for="units">Units</label>\n                            <input type="text" ng-model="newTag.units" class="form-control" id="units" placeholder="lbs, PSI, in, etc.">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="change_threshold">Change Threshold</label>\n                            <input type="number" ng-model="newTag.change_threshold" class="form-control" id="change_threshold" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="guarantee_sec">Guarantee Sec.</label>\n                            <input type="number" ng-model="newTag.guarantee_sec" class="form-control" id="guarantee_sec" placeholder="3600">\n                        </div>\n                    </div>\n                </form>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>\n                <button type="button" class="btn btn-primary" ng-click="submitAddTag();" data-dismiss="modal">Add Tag</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n\n<div class="modal fade" id="editModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Edit a Tag...</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <form>\n                    <div class="form-group">\n                        <label for="data_source">Data Source</label>\n                        <select ng-model="editTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>\n                    </div>\n                    <div class="form-group">\n                        <label for="tag">Tag Name</label>\n                        <input type="text" ng-model="editTag.tag" class="form-control" id="tag" placeholder="Tag Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="name">Vanity Name</label>\n                        <input type="text" ng-model="editTag.name" class="form-control" id="name" placeholder="Vanity Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="description">Description</label>\n                        <input type="textarea" ng-model="editTag.description" class="form-control" id="description" placeholder="Tag Description Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="data_type">Data Type</label>\n                        <select ng-model="editTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="minExpected">Minimum Value Expected</label>\n                            <input type="number" ng-model="editTag.minExpected" class="form-control" id="minExpected" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="maxExpected">Maximum Value Expected</label>\n                            <input type="number" ng-model="editTag.maxExpected" class="form-control" id="maxExpected" placeholder="100">\n                        </div>\n                    </div>\n                    <div class="col-md-2">\n                        <div class="form-group">\n                            <label for="units">Units</label>\n                            <input type="text" ng-model="editTag.units" class="form-control" id="units" placeholder="lbs, PSI, in, etc.">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="change_threshold">Change Threshold</label>\n                            <input type="number" ng-model="editTag.change_threshold" class="form-control" id="change_threshold" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="guarantee_sec">Guarantee Sec.</label>\n                            <input type="number" ng-model="editTag.guarantee_sec" class="form-control" id="guarantee_sec" placeholder="3600">\n                        </div>\n                    </div>\n                </form>\n                <pre>{{editTag}}</pre>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>\n                <button type="button" class="btn btn-primary" ng-click="submitEditTag();" data-dismiss="modal">Submit Tag Edits</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n\n<div class="modal fade" id="deleteModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Are you sure?</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <h3>Are you sure you want to delete the tag {{dTag.name}} ({{dTag.tag}})?</h3>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-primary" data-dismiss="modal">NO!!!!!!</button>\n                <button type="button" class="btn btn-danger" ng-click="deleteTag(dTag.id);" data-dismiss="modal">Heck yes, delete it!</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n<div class="modal fade" id="clearTagDataModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Are you sure?</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <h3>Are you sure you want to delete the data for tag {{dTagValues.name}} ({{dTagValues.tag}})?</h3>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-primary" data-dismiss="modal">NO!!!!!!</button>\n                <button type="button" class="btn btn-danger" ng-click="deleteTagValues(dTagValues.id);" data-dismiss="modal">Heck yes, delete it!</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n\n\n\n<div ng-if="loading" class="container">\n\t<div class="row">\n\t\t<div class="col-md-12 well" style="text-align:center;">\n\t\t\t<h1>Loading Tags..</h1>\n\t\t\t<img class="img-responsive" src="/images/loading.gif"  style="margin:0 auto;"/>\n\t\t</div>\n\t</div>\n</div>\n\n<div ng-if="!loading">\n\t<div ng-if="error" class="container">\n\t\t<div class="row">\n\t\t\t<div class="col-md=12">\n\t\t\t\t<h1>Error Caught!</h1>\n\t\t\t\t<pre>{{message}}</pre>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\n\t<div ng-if="!error" class="container">\n\t\t<div class="row">\n\t\t\t<div class="col-md-12">\n                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addModal">\n                    Add Tag\n                </button>\n\t\t\t\t<table class="table">\n\t\t\t\t\t<thead>\n\t\t\t\t\t\t<tr>\n                            <td></td>\n\t\t\t\t\t\t\t<td>ID</td>\n\t\t\t\t\t\t\t<td>Name</td>\n\t\t\t\t\t\t\t<td>Min Expected Value</td>\n\t\t\t\t\t\t\t<td>Max Expected Value</td>\n\t\t\t\t\t\t\t<td>Units</td>\n\t\t\t\t\t\t\t<td></td>\n                            <td></td>\n\t\t\t\t\t\t\t<td></td>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</thead>\n\t\t\t\t\t<tbody>\n\t\t\t\t\t\t<tr ng-repeat="tag in tags">\n                            <td><input type="checkbox" ng-model="tag.selectedForPlot" ng-change="getPlotTags()"></input></td>\n\t\t\t\t\t\t\t<td>{{tag.id}}</td>\n\t\t\t\t\t\t\t<td><a href="/#/tag/{{tag.id}}">{{tag.name}}</a>  <i class="fa fa-info-circle" data-toggle="popover" title="{{tag.name}}" data-content="Tag Name: {{tag.tag}} </br>Details: {{tag.description}}<br/>Type: {{tag.data_type}}"></i></td>\n\t\t\t\t\t\t\t<td>{{tag.minExpected}}</td>\n\t\t\t\t\t\t\t<td>{{tag.maxExpected}}</td>\n\t\t\t\t\t\t\t<td>{{tag.units}}</td>\n\t\t\t\t\t\t\t<td><button data-toggle="modal" data-target="#editModal" ng-click="openEditTag(tag.id)" class="btn btn-primary">Edit</button></td>\n                            <td><button data-toggle="modal" data-target="#clearTagDataModal" ng-click="openClearTagData(tag.id)" class="btn btn-primary">Clear Data</button></td>\n\t\t\t\t\t\t\t<td><button data-toggle="modal" data-target="#deleteModal" ng-click="openDeleteTag(tag.id)" class="btn btn-danger">Delete</button></td>\n\t\t\t\t\t\t\t<script>\n\t\t\t\t\t\t\t\t$(document).ready(function(){\n\t\t\t\t\t\t\t\t    $(\'[data-toggle="popover"]\').popover({html: true});\n\t\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\t</script>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</tbody>\n\t\t\t\t</table>\n                <a ng-if="tags_to_plot" class="btn btn-success" href="/#/tag/{{tags_to_plot}}">\n                    Compare Tags\n                </a>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>\n';
+__p += '<div class="modal fade" id="addModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Add a New Tag...</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <form>\n                    <div class="form-group">\n                        <label for="data_source">Data Source</label>\n                        <select ng-model="newTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>\n                    </div>\n                    <div class="form-group">\n                        <label for="tag">Tag</label>\n                        <input type="text" ng-model="newTag.tag" class="form-control" id="tag" placeholder="Tag Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="name">Name</label>\n                        <input type="text" ng-model="newTag.name" class="form-control" id="name" placeholder="Vanity Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="description">Description</label>\n                        <input type="textarea" ng-model="newTag.description" class="form-control" id="description" placeholder="Tag Description Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="data_type">Data Type</label>\n                        <select ng-model="newTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="minExpected">Minimum Value Expected</label>\n                            <input type="number" ng-model="newTag.minExpected" class="form-control" id="minExpected" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="maxExpected">Maximum Value Expected</label>\n                            <input type="number" ng-model="newTag.maxExpected" class="form-control" id="maxExpected" placeholder="100">\n                        </div>\n                    </div>\n                    <div class="col-md-2">\n                        <div class="form-group">\n                            <label for="units">Units</label>\n                            <input type="text" ng-model="newTag.units" class="form-control" id="units" placeholder="lbs, PSI, in, etc.">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="change_threshold">Change Threshold</label>\n                            <input type="number" ng-model="newTag.change_threshold" class="form-control" id="change_threshold" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="guarantee_sec">Guarantee Sec.</label>\n                            <input type="number" ng-model="newTag.guarantee_sec" class="form-control" id="guarantee_sec" placeholder="3600">\n                        </div>\n                    </div>\n                </form>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>\n                <button type="button" class="btn btn-primary" ng-click="submitAddTag();" data-dismiss="modal">Add Tag</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n\n<div class="modal fade" id="editModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Edit a Tag...</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <form>\n                    <div class="form-group">\n                        <label for="data_source">Data Source</label>\n                        <select ng-model="editTag.deviceID" ng-options="d as device_label(d) for d in devices track by d.id" class="form-control" id="data_source"></select>\n                    </div>\n                    <div class="form-group">\n                        <label for="tag">Tag Name</label>\n                        <input type="text" ng-model="editTag.tag" class="form-control" id="tag" placeholder="Tag Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="name">Vanity Name</label>\n                        <input type="text" ng-model="editTag.name" class="form-control" id="name" placeholder="Vanity Name Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="description">Description</label>\n                        <input type="textarea" ng-model="editTag.description" class="form-control" id="description" placeholder="Tag Description Here">\n                    </div>\n                    <div class="form-group">\n                        <label for="data_type">Data Type</label>\n                        <select ng-model="editTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="minExpected">Minimum Value Expected</label>\n                            <input type="number" ng-model="editTag.minExpected" class="form-control" id="minExpected" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-5">\n                        <div class="form-group">\n                            <label for="maxExpected">Maximum Value Expected</label>\n                            <input type="number" ng-model="editTag.maxExpected" class="form-control" id="maxExpected" placeholder="100">\n                        </div>\n                    </div>\n                    <div class="col-md-2">\n                        <div class="form-group">\n                            <label for="units">Units</label>\n                            <input type="text" ng-model="editTag.units" class="form-control" id="units" placeholder="lbs, PSI, in, etc.">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="change_threshold">Change Threshold</label>\n                            <input type="number" ng-model="editTag.change_threshold" class="form-control" id="change_threshold" placeholder="0">\n                        </div>\n                    </div>\n                    <div class="col-md-6">\n                        <div class="form-group">\n                            <label for="guarantee_sec">Guarantee Sec.</label>\n                            <input type="number" ng-model="editTag.guarantee_sec" class="form-control" id="guarantee_sec" placeholder="3600">\n                        </div>\n                    </div>\n                </form>\n                <pre>{{editTag}}</pre>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>\n                <button type="button" class="btn btn-primary" ng-click="submitEditTag();" data-dismiss="modal">Submit Tag Edits</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n\n<div class="modal fade" id="deleteModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Are you sure?</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <h3>Are you sure you want to delete the tag {{dTag.name}} ({{dTag.tag}})?</h3>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-primary" data-dismiss="modal">NO!!!!!!</button>\n                <button type="button" class="btn btn-danger" ng-click="deleteTag(dTag.id);" data-dismiss="modal">Heck yes, delete it!</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n<div class="modal fade" id="clearTagDataModal">\n    <div class="modal-dialog">\n        <div class="modal-content">\n            <div class="modal-header">\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n                <h4 class="modal-title">Are you sure?</h4>\n            </div>\n            <div class="modal-body">\n                <div class="well" ng-if="message"><h3 class="text-danger">{{message}}</h3></div>\n                <h3>Are you sure you want to delete the data for tag {{dTagValues.name}} ({{dTagValues.tag}})?</h3>\n            </div>\n            <div class="modal-footer">\n                <button type="button" class="btn btn-primary" data-dismiss="modal">NO!!!!!!</button>\n                <button type="button" class="btn btn-danger" ng-click="deleteTagValues(dTagValues.id);" data-dismiss="modal">Heck yes, delete it!</button>\n            </div>\n        </div><!-- /.modal-content -->\n    </div><!-- /.modal-dialog -->\n</div><!-- /.modal -->\n\n\n\n\n<div ng-if="loading" class="container">\n\t<div class="row">\n\t\t<div class="col-md-12 well" style="text-align:center;">\n\t\t\t<h1>Loading Tags..</h1>\n\t\t\t<img class="img-responsive" src="/images/loading.gif"  style="margin:0 auto;"/>\n\t\t</div>\n\t</div>\n</div>\n\n<div ng-if="!loading">\n\t<div ng-if="error" class="container">\n\t\t<div class="row">\n\t\t\t<div class="col-md=12">\n\t\t\t\t<h1>Error Caught!</h1>\n\t\t\t\t<pre>{{message}}</pre>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\n\t<div ng-if="!error" class="container">\n\t\t<div class="row">\n\t\t\t<div class="col-md-12">\n                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addModal">\n                    Add Tag\n                </button>\n\t\t\t\t<table class="table">\n\t\t\t\t\t<thead>\n\t\t\t\t\t\t<tr>\n                            <td></td>\n\t\t\t\t\t\t\t<td>ID</td>\n\t\t\t\t\t\t\t<td>Name</td>\n\t\t\t\t\t\t\t<td>Min Expected Value</td>\n\t\t\t\t\t\t\t<td>Max Expected Value</td>\n\t\t\t\t\t\t\t<td>Units</td>\n\t\t\t\t\t\t\t<td></td>\n                            <td></td>\n\t\t\t\t\t\t\t<td></td>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</thead>\n\t\t\t\t\t<tbody>\n\t\t\t\t\t\t<tr ng-repeat="tag in tags">\n                            <td><input type="checkbox" ng-model="tag.selectedForPlot" ng-change="getPlotTags()"></input></td>\n\t\t\t\t\t\t\t<td>{{tag.id}}</td>\n\t\t\t\t\t\t\t<td><a href="/#/tag/{{tag.id}}">{{tag.name}}</a>  <i class="fa fa-info-circle" data-toggle="popover" title="{{tag.name}}" data-content="Tag Name: {{tag.tag}} </br>Details: {{tag.description}}<br/>Type: {{tag.data_type}}"></i></td>\n\t\t\t\t\t\t\t<td>{{tag.minExpected}}</td>\n\t\t\t\t\t\t\t<td>{{tag.maxExpected}}</td>\n\t\t\t\t\t\t\t<td>{{tag.units}}</td>\n\t\t\t\t\t\t\t<td><button data-toggle="modal" data-target="#editModal" ng-click="openEditTag(tag.id)" class="btn btn-primary">Edit</button></td>\n                            <td><button data-toggle="modal" data-target="#clearTagDataModal" ng-click="openClearTagData(tag.id)" class="btn btn-primary">Clear Data</button></td>\n\t\t\t\t\t\t\t<td><button data-toggle="modal" data-target="#deleteModal" ng-click="openDeleteTag(tag.id)" class="btn btn-danger">Delete</button></td>\n\t\t\t\t\t\t\t<script>\n\t\t\t\t\t\t\t\t$(document).ready(function(){\n\t\t\t\t\t\t\t\t    $(\'[data-toggle="popover"]\').popover({html: true});\n\t\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\t</script>\n\t\t\t\t\t\t</tr>\n\t\t\t\t\t</tbody>\n\t\t\t\t</table>\n                <a ng-if="tags_to_plot" class="btn btn-success" href="/#/tag/{{tags_to_plot}}">\n                    Compare Tags\n                </a>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>\n';
 
 }
 return __p
diff --git a/www/.tmp/public/templates/config.html b/www/.tmp/public/templates/config.html
index 6f29b44..e05344c 100644
--- a/www/.tmp/public/templates/config.html
+++ b/www/.tmp/public/templates/config.html
@@ -39,17 +39,21 @@
 				<table class="table">
 					<thead>
 						<tr>
-							<th>ID</th>
+							<!-- <th>ID</th> -->
 							<th>Address</th>
 							<th>Type</th>
+							<!-- <th></th> -->
+							<th></th>
 						</tr>
 					</thead>
 
 					<tbody>
 						<tr ng-repeat="device in devices">
-							<td>{{device.id}}</td>
+							<!-- <td>{{device.id}}</td> -->
 							<td>{{device.address}}</td>
 							<td>{{device.device_type.dType}}</td>
+							<!-- <td><i class="fa fa-pencil"></i></td> -->
+							<td><i class="fa fa-times" ng-click="deleteDevice(device.id)"></i></td>
 						</tr>
 					</tbody>
 				</table>
@@ -63,6 +67,8 @@
 						<tr>
 							<th>Parameter</th>
 							<th>Value</th>
+							<!-- <th></th> -->
+							<th></th>
 						</tr>
 					</thead>
 
@@ -70,6 +76,8 @@
 						<tr ng-repeat="param in config">
 							<td>{{param.parameter}}</td>
 							<td>{{param.val}}</td>
+							<!-- <td><i class="fa fa-pencil"></i></td> -->
+							<td><i class="fa fa-times" ng-click="deleteParameter(param.id)"></i></td>
 						</tr>
 					</tbody>
 				</table>
diff --git a/www/.tmp/public/templates/tags.html b/www/.tmp/public/templates/tags.html
index 6e93f3e..c5a103f 100644
--- a/www/.tmp/public/templates/tags.html
+++ b/www/.tmp/public/templates/tags.html
@@ -81,7 +81,7 @@
                 <form>
                     <div class="form-group">
                         <label for="data_source">Data Source</label>
-                        <select ng-model="editTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>
+                        <select ng-model="editTag.deviceID" ng-options="d as device_label(d) for d in devices track by d.id" class="form-control" id="data_source"></select>
                     </div>
                     <div class="form-group">
                         <label for="tag">Tag Name</label>
diff --git a/www/assets/favicon.ico b/www/assets/favicon.ico
index 0092ec9..648ddb6 100644
Binary files a/www/assets/favicon.ico and b/www/assets/favicon.ico differ
diff --git a/www/assets/js/ng/controller_config.js b/www/assets/js/ng/controller_config.js
index ad8a752..12566bd 100644
--- a/www/assets/js/ng/controller_config.js
+++ b/www/assets/js/ng/controller_config.js
@@ -32,9 +32,18 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
             }
             config.submitParameter($scope.newParam);
             $scope.loadConfig();
+			$scope.newParam.pEntry = "";
+			$scope.newParam.val = "";
         }
     };
 
+	$scope.deleteParameter = function(id){
+		var deleteParam = config.deleteParameter(id);
+		deleteParam.then(function(d){
+			$scope.loadConfig();
+		});
+	};
+
     $scope.checkLogger = function(){
         $scope.loggerLoading = true;
         var checkLoggerStatus = config.getLoggerStatus();
@@ -73,11 +82,19 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices)
 
     $scope.addDevice = function(dev){
         var addDevice = devices.addDevice(dev);
-        getDevices.then(function(d){
+        addDevice.then(function(d){
             $scope.getDevices();
+			$scope.newDevice.address = "";
         });
     };
 
+	$scope.deleteDevice = function(id){
+		var deleteDevice = devices.deleteDevice(id);
+		deleteDevice.then(function(d){
+			$scope.getDevices();
+		});
+	};
+
     var getDeviceTypes = devices.getDeviceTypes();
     getDeviceTypes.then(function(d){
         $scope.device_types = d.device_types;
diff --git a/www/assets/js/ng/controller_tags.js b/www/assets/js/ng/controller_tags.js
index 49bbc7c..c7d3dd0 100644
--- a/www/assets/js/ng/controller_tags.js
+++ b/www/assets/js/ng/controller_tags.js
@@ -89,4 +89,8 @@ poconsole.controller('tagsCtrl', function($scope, $route, $http, $routeParams, P
         $scope.tags_to_plot = tags_to_plot.join();
     };
 
+	$scope.device_label = function(data_type_obj){
+		return data_type_obj.address + " - " + data_type_obj.device_type.dType;
+	};
+
 });
diff --git a/www/assets/js/ng/factory_config.js b/www/assets/js/ng/factory_config.js
index 34f8a83..a1abc40 100644
--- a/www/assets/js/ng/factory_config.js
+++ b/www/assets/js/ng/factory_config.js
@@ -11,27 +11,39 @@ poconsole.factory('config',function($q, $http, $log){
     };
 
     var submitParameter = function(entry){
+        var deferred = $q.defer();
         $http.post('/config', {
             parameter: entry.parameter,
             val: entry.val
         }).success(function(data){
-            return data;
+            deferred.resolve({
+    			data:data
+    		});
         });
+        return deferred.promise;
     };
 
     var updateParameter = function(entry){
+        var deferred = $q.defer();
         $http.post('/config/update/' + entry.id, {
             parameter: entry.parameter,
             val: entry.val
         }).success(function(data){
-            return data;
+            deferred.resolve({
+    			data:data
+    		});
         });
+        return deferred.promise;
     };
 
     var deleteParameter = function(id){
+        var deferred = $q.defer();
         $http.delete('/config/' + id).success(function(data){
-            return data;
+            deferred.resolve({
+    			data:data
+    		});
         });
+        return deferred.promise;
     };
 
     var getLoggerStatus = function(){
diff --git a/www/assets/js/ng/factory_devices.js b/www/assets/js/ng/factory_devices.js
index c9d2c42..e2395c1 100644
--- a/www/assets/js/ng/factory_devices.js
+++ b/www/assets/js/ng/factory_devices.js
@@ -21,21 +21,29 @@ poconsole.factory('devices', function($q, $http, $log){
 
     var addDevice = function(d){
         $log.info(d);
+        var deferred = $q.defer();
         $http.post('/device/create', {
             address: d.address,
             device_type: d.device_type.id
         }).success(function(data){
-            return data;
+            deferred.resolve({
+                data:data
+            });
         });
+        return deferred.promise;
     };
 
     var updateDevice = function(d){
+        var deferred = $q.defer();
         $http.post('/device/update/' + d.id, {
             address: d.address,
             device_type: d.device_type.id
         }).success(function(data){
-            return data;
+            deferred.resolve({
+                data:data
+            });
         });
+        return deferred.promise;
     };
 
     var deleteDevice = function(id){
diff --git a/www/assets/templates/config.html b/www/assets/templates/config.html
index 6f29b44..e05344c 100644
--- a/www/assets/templates/config.html
+++ b/www/assets/templates/config.html
@@ -39,17 +39,21 @@
 				<table class="table">
 					<thead>
 						<tr>
-							<th>ID</th>
+							<!-- <th>ID</th> -->
 							<th>Address</th>
 							<th>Type</th>
+							<!-- <th></th> -->
+							<th></th>
 						</tr>
 					</thead>
 
 					<tbody>
 						<tr ng-repeat="device in devices">
-							<td>{{device.id}}</td>
+							<!-- <td>{{device.id}}</td> -->
 							<td>{{device.address}}</td>
 							<td>{{device.device_type.dType}}</td>
+							<!-- <td><i class="fa fa-pencil"></i></td> -->
+							<td><i class="fa fa-times" ng-click="deleteDevice(device.id)"></i></td>
 						</tr>
 					</tbody>
 				</table>
@@ -63,6 +67,8 @@
 						<tr>
 							<th>Parameter</th>
 							<th>Value</th>
+							<!-- <th></th> -->
+							<th></th>
 						</tr>
 					</thead>
 
@@ -70,6 +76,8 @@
 						<tr ng-repeat="param in config">
 							<td>{{param.parameter}}</td>
 							<td>{{param.val}}</td>
+							<!-- <td><i class="fa fa-pencil"></i></td> -->
+							<td><i class="fa fa-times" ng-click="deleteParameter(param.id)"></i></td>
 						</tr>
 					</tbody>
 				</table>
diff --git a/www/assets/templates/tags.html b/www/assets/templates/tags.html
index 6e93f3e..c5a103f 100644
--- a/www/assets/templates/tags.html
+++ b/www/assets/templates/tags.html
@@ -81,7 +81,7 @@
                 <form>
                     <div class="form-group">
                         <label for="data_source">Data Source</label>
-                        <select ng-model="editTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>
+                        <select ng-model="editTag.deviceID" ng-options="d as device_label(d) for d in devices track by d.id" class="form-control" id="data_source"></select>
                     </div>
                     <div class="form-group">
                         <label for="tag">Tag Name</label>