diff --git a/src/se/koc/hal/page/PCConfigureHttpPage.java b/src/se/koc/hal/page/PCConfigureHttpPage.java
index 9726267b..f509d00a 100755
--- a/src/se/koc/hal/page/PCConfigureHttpPage.java
+++ b/src/se/koc/hal/page/PCConfigureHttpPage.java
@@ -28,19 +28,42 @@ public class PCConfigureHttpPage extends HalHttpPage {
         // Save new input
         if(request.containsKey("action")){
             String action = request.get("action");
+            int id = (request.containsKey("id") ? Integer.parseInt(request.get("id")) : -1);
             Sensor sensor;
             User user;
             switch(action) {
+                // Local User
                 case "modify_local_user":
                     localUser.setUserName(request.get("username"));
                     localUser.setAddress(request.get("address"));
                     localUser.save(db);
                     break;
 
-                case "create_local_sensor": break;
-                case "modify_local_sensor": break;
-                case "remove_local_sensor": break;
+                // Local Sensors
+                case "create_local_sensor":
+                    sensor = new Sensor();
+                    sensor.setName(request.get("name"));
+                    sensor.setType(request.get("type"));
+                    sensor.setConfig(request.get("config"));
+                    sensor.setUserId(localUser);
+                    sensor.setSynced(true);
+                    sensor.save(db);
+                case "modify_local_sensor":
+                    sensor = Sensor.getSensor(db, id);
+                    if(sensor != null){
+                        sensor.setName(request.get("name"));
+                        sensor.setType(request.get("type"));
+                        sensor.setConfig(request.get("config"));
+                        sensor.save(db);
+                    }
+                    break;
+                case "remove_local_sensor":
+                    sensor = Sensor.getSensor(db, id);
+                    if(sensor != null)
+                        sensor.delete(db);
+                    break;
 
+                // External Users
                 case "create_external_user":
                     user = new User();
                     user.setHostname(request.get("hostname"));
@@ -49,7 +72,7 @@ public class PCConfigureHttpPage extends HalHttpPage {
                     user.save(db);
                     break;
                 case "modify_external_user":
-                    user = User.getUser(db, Integer.parseInt(request.get("id")));
+                    user = User.getUser(db, id);
                     if(user != null){
                         user.setHostname(request.get("hostname"));
                         user.setPort(Integer.parseInt(request.get("port")));
@@ -57,14 +80,14 @@ public class PCConfigureHttpPage extends HalHttpPage {
                     }
                     break;
                 case "remove_external_user":
-                    user = User.getUser(db, Integer.parseInt(request.get("id")));
-                    if(user != null){
+                    user = User.getUser(db, id);
+                    if(user != null)
                         user.delete(db);
-                    }
                     break;
 
+                // External Sensors
                 case "modify_external_sensor":
-                    sensor = Sensor.getSensor(db, Integer.parseInt(request.get("id")));
+                    sensor = Sensor.getSensor(db, id);
                     if(sensor != null){
                         sensor.setSynced(Boolean.parseBoolean(request.get("sync")));
                         sensor.save(db);
diff --git a/src/se/koc/hal/struct/Sensor.java b/src/se/koc/hal/struct/Sensor.java
index b2bff403..ff9b1e73 100755
--- a/src/se/koc/hal/struct/Sensor.java
+++ b/src/se/koc/hal/struct/Sensor.java
@@ -19,9 +19,9 @@ public class Sensor extends DBBean{
 
 	// User configuration
 	private long user_id;
-	private long external_id;
+	private long external_id = -1;
     /** local sensor= if sensor should be public. external sensor= if sensor should be requested from host **/
-    private boolean sync;
+    private boolean sync = false;
 
 
 
@@ -66,18 +66,25 @@ public class Sensor extends DBBean{
 	public void setName(String name) {
 		this.name = name;
 	}
-	public long getUserId() {
-		return user_id;
-	}
-	public void setUserId(long user_id) {
-		this.user_id = user_id;
-	}
 	public String getType() {
 		return type;
 	}
 	public void setType(String type) {
 		this.type = type;
 	}
+	public String getConfig() {
+		return config;
+	}
+	public void setConfig(String config) {
+		this.config = config;
+	}
+
+	public long getUserId() {
+		return user_id;
+	}
+	public void setUserId(User user) {
+		this.user_id = user.getId();
+	}
 	public long getExternalId() {
 		return external_id;
 	}
diff --git a/web-resource/configure.tmpl b/web-resource/configure.tmpl
index 8b6b3d07..857b0a8a 100755
--- a/web-resource/configure.tmpl
+++ b/web-resource/configure.tmpl
@@ -40,7 +40,10 @@
                     <th>Type</th>
                     <th>Configuration</th>
                     <th>
-                        <button class="btn btn-default btn-xs pull-right"><span class="glyphicon glyphicon-plus"></span></button>
+                        <button class="btn btn-default btn-xs pull-right" data-toggle="modal"
+                                data-target="#sensorModal">
+                            <span class="glyphicon glyphicon-plus"></span>
+                        </button>
                     </th>
                 </thead>
                 {{#localSensor}}
@@ -49,10 +52,25 @@
                     <td>{{.type}}</td>
                     <td>{{.config}}</td>
                     <td>
-                        <div class="btn-toolbar pull-right">
-                            <button class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></button>
-                            <button class="btn btn-danger btn-xs"> <span class="glyphicon glyphicon-trash"></span></button>
-                        </div>
+                        <form method="POST">
+                            <input type="hidden" name="action" value="remove_local_sensor">
+                            <input type="hidden" name="id" value="{{.getId()}}">
+
+                            <div class="btn-toolbar pull-right">
+                                <button type="button" class="btn btn-default btn-xs" data-toggle="modal"
+                                        data-target="#sensorModal"
+                                        data-id="{{.getId()}}"
+                                        data-name="{{.name}}"
+                                        data-type="{{.type}}"
+                                        data-config="{{.config}}">
+                                    <span class="glyphicon glyphicon-pencil"></span>
+                                </button>
+
+                                <button type="submit" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
+                            </div>
+                        </form>
                     </td>
                 </tr>
                 {{/localSensor}}
@@ -75,8 +93,7 @@
                 <th>Port</th>
                 <th>
                     <button class="btn btn-default btn-xs pull-right" data-toggle="modal"
-                            data-target="#extUserModal"
-                            data-id="-1">
+                            data-target="#userModal">
                         <span class="glyphicon glyphicon-plus"></span>
                     </button>
                 </th>
@@ -94,7 +111,7 @@
 
                             <div class="btn-toolbar pull-right">
                                 <button type="button" class="btn btn-default btn-xs" data-toggle="modal"
-                                        data-target="#extUserModal"
+                                        data-target="#userModal"
                                         data-id="{{.getId()}}"
                                         data-hostname="{{.hostname}}"
                                         data-port="{{.port}}">
@@ -163,27 +180,45 @@
 <!------------- MODALS --------------->
 <script>
     $(function(){
-        $("#extUserModal").on('show.bs.modal', function (event) {
+        $("#sensorModal").on('show.bs.modal', function (event) {
             var button = $(event.relatedTarget);
             var modal = $(this);
+            modal.find("input").val(""); // Reset all inputs
             if(button.data("id") >= 0){ // edit
-                modal.find("#action").val("modify_external_user");
-                modal.find("#id").val(button.data("id"));
-                modal.find("#hostname").val(button.data("hostname"));
-                modal.find("#port").val(button.data("port"));
+                modal.find("input[name=action]").val("modify_local_sensor");
+                modal.find("input[name=id]").val(button.data("id"));
+                modal.find("input[name=name]").val(button.data("name"));
+                modal.find("input[name=type]").val(button.data("type"));
+                modal.find("input[name=config]").val(button.data("config"));
             }
             else{ // create
-                modal.find("#action").val("create_external_user");
-                modal.find("#id").val(-1);
-                modal.find("#hostname").val("");
-                modal.find("#port").val("");
+                modal.find("input[name=action]").val("create_local_sensor");
+                modal.find("input[name=id]").val(-1);
+            }
+        });
+
+
+        $("#userModal").on('show.bs.modal', function (event) {
+            var button = $(event.relatedTarget);
+            var modal = $(this);
+            modal.find("input").val(""); // Reset all inputs
+            if(button.data("id") >= 0){ // edit
+                modal.find("input[name=action]").val("modify_external_user");
+                modal.find("input[name=id]").val(button.data("id"));
+                modal.find("input[name=hostname]").val(button.data("hostname"));
+                modal.find("input[name=port]").val(button.data("port"));
+            }
+            else{ // create
+                modal.find("input[name=action]").val("create_external_user");
+                modal.find("input[name=id]").val(-1);
             }
         });
     });
 </script>
 
-<div class="modal fade" id="extUserModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
+
+<div class="modal fade" id="sensorModal" tabindex="-1">
+    <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">
@@ -196,12 +231,19 @@
                     <input type="hidden" id="action" name="action" value="">
                     <input type="hidden" id="id" name="id">
                     <div class="form-group">
-                        <label for="hostname" class="control-label">Hostname/IP:</label>
-                        <input type="text" class="form-control" id="hostname" name="hostname">
+                        <label class="control-label">Name:</label>
+                        <input type="text" class="form-control" name="name">
                     </div>
                     <div class="form-group">
-                        <label for="port" class="control-label">Port:</label>
-                        <input type="number" class="form-control" id="port" name="port" min="1">
+                        <label class="control-label">Type:</label>
+                        <select class="form-control" name="type">
+                            <option>TellStickController</option>
+                            <option>RPiLocalController</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Config:</label> <!-- Should be improved, dynamic forms? -->
+                        <input type="text" class="form-control" name="config">
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -211,4 +253,39 @@
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+
+<div class="modal fade" id="userModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title">External User</h4>
+            </div>
+            <form method="POST">
+                <div class="modal-body">
+                    <input type="hidden" name="action" value="">
+                    <input type="hidden" name="id">
+                    <div class="form-group">
+                        <label class="control-label">Hostname/IP:</label>
+                        <input type="text" class="form-control" name="hostname">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">Port:</label>
+                        <input type="number" class="form-control" name="port" min="1">
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="reset" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary">Save</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+
+