diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e06d208
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/index.js b/index.js
index 25364ee..2e687ab 100644
--- a/index.js
+++ b/index.js
@@ -32,6 +32,7 @@ if (process.env.VCAP_SERVICES) {
 	}
 }
 
+console.log(mongo_url);
 mongoose.connect(mongo_url);
 
 var Account = require('./models/account');
@@ -114,6 +115,10 @@ app.get('/', function(req,res){
 	res.render('pages/index', {user: req.user});
 });
 
+app.get('/docs', function(req,res){
+	res.render('pages/docs', {user: req.user});
+});
+
 app.get('/login', function(req,res){
 	res.render('pages/login',{user: req.user});
 });
@@ -139,7 +144,7 @@ function ensureAuthenticated(req,res,next) {
 }
 
 app.get('/newuser', function(req,res){
-	res.render('pages/register');
+	res.render('pages/register',{user: req.user});
 });
 
 app.post('/newuser', function(req,res){
@@ -152,16 +157,21 @@ app.post('/newuser', function(req,res){
 		var topics = new Topics({topics: [account.username+'/#']});
 		topics.save(function(err){
 			if (!err){
+
 				var s = Buffer.from(account.salt, 'hex').toString('base64');
 				var h = Buffer.from(account.hash, 'hex').toString(('base64'));
 
-				var mqttPass = "PBKDF2$sha256$25000$" + s + "$" + h;
+				var mqttPass = "PBKDF2$sha256$901$" + account.salt + "$" + account.hash;
 
 				Account.update(
 					{username: account.username}, 
 					{$set: {mqttPass: mqttPass, topics: topics._id}}, 
 					{ multi: false },
-					function(err, count){}
+					function(err, count){
+						if (err) {
+							console.log(err);
+						}
+					}
 				);
 			}
 		});
@@ -278,18 +288,13 @@ app.get('/devices',
 		});
 });
 
-app.post('/devices',
+app.put('/devices',
 	ensureAuthenticated,
 	function(req,res){
 
 		var user = req.user.username;
 		var device = req.body;
 
-		console.log("headers");
-		console.log(req.headers);
-		console.log("post devices");
-		console.log(device);
-
 		device.username = user;
 		device.isReachable = true;
 
@@ -306,6 +311,49 @@ app.post('/devices',
 
 });
 
+app.post('/device/:dev_id',
+	ensureAuthenticated,
+	function(req,res){
+		var user = req.user.username;
+		var id = req.params.dev_id;
+		var device = req.body;
+		if (user === device.username) {
+			Devices.findOne({_id: device._id, username: device.username},
+				function(err, data){
+					if (err) {
+						res.status(500);
+						res.send(err);
+					} else {
+						data.friendlyDescription = device.friendlyDescription;
+						data.actions = device.actions;
+						data.save(function(err, d){
+							res.status(201);
+							res.send(d);
+						});
+					}
+				});
+		}
+});
+
+app.delete('/device/:dev_id',
+	ensureAuthenticated,
+	function(req,res){
+		var user = req.user.username;
+		var id = req.params.dev_id;
+		console.log(id);
+		Devices.remove({_id: id, username: user},
+			function(err) {
+				if (err) {
+					console.log(err);
+					res.status(500);
+					res.send(err);
+				} else {
+					res.status(202);
+					res.send();
+				}
+			});
+});
+
 app.post('/api/v1/devices',
 	passport.authenticate('bearer', { session: false }),
 	function(req,res,next){
diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 0000000..f6fb11a
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,5 @@
+---
+application:
+- name: alexa-node-red
+  memory: 128M
+  host: alexa-node-red
\ No newline at end of file
diff --git a/models/account.js b/models/account.js
index 9b9ef0e..796bbc8 100644
--- a/models/account.js
+++ b/models/account.js
@@ -11,6 +11,14 @@ var Account = new Schema({
     topics: { type: Number}
 });
 
-Account.plugin(passportLocalMongoose);
+var options = {
+	usernameUnique: true,
+	saltlen: 12,
+	keylen: 24,
+	iterations: 901,
+	encoding: 'base64'
+};
+
+Account.plugin(passportLocalMongoose,options);
 
 module.exports = mongoose.model('Account', Account);
diff --git a/package.json b/package.json
index 6b8e06a..65e94fc 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node index.js"
   },
   "keywords": [
     "alexa",
diff --git a/static/css/basic.css b/static/css/basic.css
index c768607..26bba49 100644
--- a/static/css/basic.css
+++ b/static/css/basic.css
@@ -38,4 +38,10 @@ body {
 .deviceDescription {
 	float: left;
 	width: 500px;
+}
+
+.action {
+	padding: 1px;
+	margin: 1px;
+	border: 1px solid;
 }
\ No newline at end of file
diff --git a/static/docs/docs.html b/static/docs/docs.html
deleted file mode 100644
index 9d9598b..0000000
--- a/static/docs/docs.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<title>Node-RED Alexa Home Skill Bridge</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<!-- Latest compiled and minified CSS -->
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-
-	<!-- Optional theme -->
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
-
-  <link rel="stylesheet" href="/css/basic.css">
-
-</head>
-<body>
-  <nav class="navbar navbar-inverse navbar-fixed-top">
-    <div class="container">
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Node-RED Alexa Home Skill Bridge</a>
-      </div>
-      <div id="navbar" class="collapse navbar-collapse">
-        <ul class="nav navbar-nav">
-          <li><a href="/">Home</a></li>
-          <li class="active"><a href="/docs/docs.html">Documentation</a></li>
-          <li><a href="/about.html">About</a></li>
-        </ul>
-      </div><!--/.nav-collapse -->
-    </div>
-  </nav>
-
-  <div class="container main">
-    <nav class="side-menu">
-      <ul class="nav nav-pills nav-stacked">
-        <li><a href="#createAccount">Create Account</a></li>
-        <li><a href="#linkAccount">Link Account</a></li>
-        <li><a href="#installNodes">Install Nodes</a></li>
-        <li><a href="#configNodes">Configure Nodes</a></li>
-      </ul>
-    </nav>
-
-    <div class="container main-content">
-      <h1>Documentation</h1>
-      <p>Welcome to the Node-RED Alexa Home Skill Bridge documentation</p>
-      <h2 id="createAccount">Create Account</h2>
-      <p>Before you start the first thing that needs to be done is to create an account on this site.
-      You can do this by clicking <a href="/newuser">here</a></p>
-      <p></p>
-      <h2 id="linkAccount">Link Account</h2>
-      <p>Once you have an account you need to add the Skill to your Alexa powered device</p>
-      <h2 id="installNodes">Install Nodes</h2>
-      <p>There are serveral ways to install new nodes into Node-RED</p>
-      <p>The simplest is to use the installer built into the Node-RED admin UI.</p>
-      <p>You can also install the nodes from the command line</p>
-      <p>And finally if you are embedding Node-RED into your own application you can add the node to 
-      the package.json file for your project and it will be included when you do an install.</p>
-      <h2 id="configNodes">Configure Nodes</h2>
-      <p></p>
-    </div>
-  </div>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-  <!-- Latest compiled and minified JavaScript -->
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/static/images/devices.png b/static/images/devices.png
index 6aa1147..35d178a 100644
Binary files a/static/images/devices.png and b/static/images/devices.png differ
diff --git a/views/fragments/footer.ejs b/views/fragments/footer.ejs
index 45b0ee5..206f80e 100644
--- a/views/fragments/footer.ejs
+++ b/views/fragments/footer.ejs
@@ -1,6 +1,4 @@
   </div>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
   <!-- Latest compiled and minified JavaScript -->
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 </body>
diff --git a/views/fragments/header.ejs b/views/fragments/header.ejs
index a3957e5..c61747c 100644
--- a/views/fragments/header.ejs
+++ b/views/fragments/header.ejs
@@ -13,6 +13,9 @@
   <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
 
   <link rel="stylesheet" href="/css/basic.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
   
 </head>
 <body>
@@ -30,7 +33,7 @@
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
           <li class="active"><a href="/">Home</a></li>
-          <li><a href="/docs/docs.html">Documentation</a></li>
+          <li><a href="/docs">Documentation</a></li>
           <% if (user) { %>
           <li><a href="/devices">Devices</a></li>
           <% } %>
diff --git a/views/pages/devices.ejs b/views/pages/devices.ejs
index fceae47..70ad406 100644
--- a/views/pages/devices.ejs
+++ b/views/pages/devices.ejs
@@ -12,11 +12,11 @@
 			<div class="deviceDescription"><%= device.friendlyDescription %></div>
 			<div class="deviceActions">
 				<% device.actions.forEach(function(action){ %>
-					<img src="/images/<%= action %>.png" title="<%= action %>">
+					<img class="action" src="/images/<%= action %>.png" title="<%= action %>">
 				<% }); %>
 			</div>
 			<button onclick="edit('<%= device._id %>')">Edit</button>
-			<button onclick="edit('<%= device._id%>')">Delete</button>
+			<button onclick="deleteDevice('<%= device._id%>')">Delete</button>
 		</div>
 		<% }); %>
 		<div style="padding-top: 10px;">
@@ -24,6 +24,7 @@
 		</div>
 	</div>
 	<div id="dialog" hidden>
+		<input id="devID" type="hidden">
 		<label for="friendlyName">Name: </label>
 		<input id="friendlyName" type="text">
 		<label for="friendlyDescription">Description: </label>
@@ -31,27 +32,37 @@
 		<textarea id="friendlyDescription" rows="2"></textarea>
 		<fieldset>
 			<legend>Actions</legend>
-			<label for="action-on">On: </label>
-			<input type="checkbox" name="actions" id="action-on" value="turnOn">
-			<label for="action-off">Off: </label>
-			<input type="checkbox" name="actions" id="action-off" value="turnOff">
-			<label for="action-perc">%: </label>
-			<input type="checkbox" name="actions" id="action-perc" value="setPercentage">
-			<label for="action-inc-perc">+%: </label>
-			<input type="checkbox" name="actions" id="action-inc-perc" value="incrementPercentage">
-			<label for="action-dec-perc">-%: </label>
-			<input type="checkbox" name="actions" id="action-dec-perc" value="decrementPercentage">
+			<label for="turnOn">On: </label>
+			<input type="checkbox" name="actions" id="turnOn" value="turnOn">
+			<label for="turnOff">Off: </label>
+			<input type="checkbox" name="actions" id="turnOff" value="turnOff">
+			<br>
+			<label for="setPercentage">%: </label>
+			<input type="checkbox" name="actions" id="setPercentage" value="setPercentage">
+			<label for="incrementPercentage">+%: </label>
+			<input type="checkbox" name="actions" id="incrementPercentage" value="incrementPercentage">
+			<label for="decrementPercentage">-%: </label>
+			<input type="checkbox" name="actions" id="decrementPercentage" value="decrementPercentage">
+			<br>
+			<label for="setTargetTemperature">&deg;C: </label>
+			<input type="checkbox" name="actions" id="setTargetTemperature" value="setTargetTemperature">
+			<label for="incrementTargetTemperature">+&deg;C: </label>
+			<input type="checkbox" name="actions" id="incrementTargetTemperature" value="incrementTargetTemperature">
+			<label for="decrementTargetTemperature">-&deg;C: </label>
+			<input type="checkbox" name="actions" id="decrementTargetTemperature" value="decrementTargetTemperature">
 		</fieldset>
 	</div>
 	<script>
-	function addDevice() {
-		$( "#dialog" ).dialog({
-			title: "Add New Device",
-			dialogClass: "no-close",
-			buttons: [
-				{
-					text: "OK",
-					click: function(){
+	$( "#dialog" ).dialog({
+		autoOpen: false,
+		title: "Add New Device",
+		dialogClass: "no-close",
+		buttons: [
+			{
+				text: "OK",
+				click: function(){
+					var devID = $('#devID').val();
+					if ( devID === "") {
 						var device = {
 							actions: []
 						};
@@ -66,9 +77,40 @@
 						if (device.friendlyName && 
 							device.friendlyDescription && 
 							device.actions.length > 1) {
-
 							$.ajax({
 								url:"/devices",
+								type: 'PUT',
+								data: JSON.stringify(device),
+								contentType: "application/json",
+								success: function(data){
+									console.log("put response");
+									console.log(data);
+									//reload
+									document.location.reload();
+								},
+								dataType   : 'json'
+							}).fail(function(){
+								alert("failed to create device");
+							});
+							$(this).dialog( "close" );
+						} else {
+							alert("Name or desciption can not be empty and at least one action is needed");
+						}
+					} else {
+						var device = devices[devID];
+						device.friendlyDescription = $('#friendlyDescription').val();
+						device.actions = [];
+						$('input[name=actions]').each(function(index){
+							if (this.checked) {
+								device.actions.push(this.value);
+							}
+						});
+						if (device.friendlyName && 
+							device.friendlyDescription && 
+							device.actions.length > 1) {
+							//post update
+							$.ajax({
+								url: '/device/' + device._id,
 								type: 'POST',
 								data: JSON.stringify(device),
 								contentType: "application/json",
@@ -78,35 +120,69 @@
 									//reload
 									document.location.reload();
 								},
-								dataType   : 'json'
-							}).fail(function(){
-								alert("failed to create device");
 							});
-
-							$(this).dialog( "close" );
+							console.log(device);
+							$(this).dialog("close");
 						} else {
 							alert("Name or desciption can not be empty and at least one action is needed");
 						}
-					}				
-				},
-				{
-					text: "Cancel",
-					click: function() {
-						clearDevice();
-						$(this).dialog( "close" );
 					}
+				}				
+			},
+			{
+				text: "Cancel",
+				click: function() {
+					clearDevice();
+					$(this).dialog( "close" );
 				}
-			]
-		});
-		$("#dialog").show();
+			}
+		]
+	});
+
+	function addDevice() {
+		clearDevice();
+		$("#dialog").dialog("open");
 	}
 
 	function clearDevice() {
+		$('#devID').val("");
 		$('#friendlyName').val("");
+		$('#friendlyName').prop('readonly', false);
 		$('#friendlyDescription').val("");
 		$('input[name=actions]').each(function(index){
 			this.checked = false;
 		});
 	}
+
+	function edit(id) {
+		clearDevice();
+		$("#dialog").dialog("open");
+		var device = devices[id];
+		$('#devID').val(device._id);
+		$('#friendlyName').val(device.friendlyName);
+		$('#friendlyName').prop('readonly', true);
+		$('#friendlyDescription').val(device.friendlyDescription);
+		device.actions.forEach(function(action){
+			$('#'+action).prop('checked',true);
+		});
+	}
+
+	function deleteDevice(id) {
+		var answer = confirm("Are you sure you want to delete this device?");
+		if(answer) {
+			$.ajax({
+				url:"/device/" + id,
+				type: 'DELETE',
+				success: function(data){
+					document.location.reload();
+				}
+			});
+		}
+	}
+
+	var devices = {};
+	<%- JSON.stringify(devices) %>.forEach(function(device){
+		devices[device._id] = device;
+	});
 	</script>
 <% include ../fragments/footer.ejs %>
\ No newline at end of file
diff --git a/views/pages/docs.ejs b/views/pages/docs.ejs
new file mode 100644
index 0000000..7e10974
--- /dev/null
+++ b/views/pages/docs.ejs
@@ -0,0 +1,46 @@
+<% include ../fragments/header.ejs %>
+<div class="container main">
+    <nav class="side-menu">
+      <ul class="nav nav-pills nav-stacked">
+        <li><a href="#createAccount">Create Account</a></li>
+        <li><a href="#linkAccount">Link Account</a></li>
+        <li><a href="#installNodes">Install Nodes</a></li>
+        <li><a href="#configNodes">Configure Nodes</a></li>
+      </ul>
+    </nav>
+
+    <div class="container main-content">
+      <h1>Documentation</h1>
+      <p>Welcome to the Node-RED Alexa Home Skill Bridge documentation</p>
+      <h2 id="createAccount">Create Account</h2>
+      <p>Before you start the first thing that needs to be done is to create an account on this site.
+      You can do this by clicking <a href="/newuser">here</a></p>
+      <p>While your here you can define some devices to control. Once you are logged ina "Devices" 
+      tab should appear in the menu at the top of the page. From here you can add new,
+      edit or delete existing devices.</p>
+      <img width="1133" height="276" src="/images/devices.png">
+      The name you give to the device will be how you access it from Alexa.
+      <h2 id="linkAccount">Link Account</h2>
+      <p>Once you have an account you need to add the Skill to your Alexa powered device. You can do 
+      this from Alexa app on your phone/tablet by searching for 'Node-RED'</p>
+      <h2 id="installNodes">Install Nodes</h2>
+      <p>node-red-contrib-alexa-home-skill provides the end point node to bring your commands into Node-RED.</p>
+      <p>There are serveral ways to install new nodes into Node-RED</p>
+      <p>The simplest is to use the installer built into the Node-RED admin UI.</p>
+      <p>You can also install the nodes from the command line</p>
+      <pre>
+cd ~/.node-red
+npm install node-red-contrib-alexa-home-skill</pre>
+      <p>And finally if you are embedding Node-RED into your own application you can add the node to 
+      the package.json file for your project and it will be included when you do an install.</p>
+      <pre>
+...
+  "dependencies": {
+    "node-red": "~0.15.x",
+    "node-red-contrib-alexa-home-skill": "*",
+...</pre>
+      <h2 id="configNodes">Configure Nodes</h2>
+      <p></p>
+    </div>
+</div>
+<% include ../fragments/footer.ejs %>
\ No newline at end of file
diff --git a/views/pages/index.ejs b/views/pages/index.ejs
index b039f0a..a087e74 100644
--- a/views/pages/index.ejs
+++ b/views/pages/index.ejs
@@ -7,6 +7,10 @@
     <p>This node allows you to create your own "devices" to 
     work with the Amazon Echo's Home Skill system, giving 
     you voice control over basically anything you can 
-    interface with Node-RED.</p>
+    interface with Node-RED. There is support for not only 
+    things like Belkin WeMo and Philps Hue, but also a whole
+    range of homebrew devices. You can also use Alexa to kick
+    off seqences of events not just descrete on/off type 
+    actions</p>
   </div
 <% include ../fragments/footer.ejs %>
\ No newline at end of file