diff --git a/app.js b/app.js
index 26603c278..08e5d14f5 100644
--- a/app.js
+++ b/app.js
@@ -128,6 +128,7 @@ if (hash === helper.getHash()) {
 	console.log('');
 	logger.debug('Detected that we have launched successfully before');
 	logger.debug('Welcome back - Initiating start up\n\n');
+	process.env.app_state = 'start_waiting';
 	process.env.app_first_setup = 'no';
 	enroll_admin(1, function (e) {
 		if (e == null) {
diff --git a/views/marbles.pug b/views/marbles.pug
index 088fd0925..685baa148 100644
--- a/views/marbles.pug
+++ b/views/marbles.pug
@@ -3,10 +3,10 @@ extends ./template/layout.pug
 	
 block custom_header
 	// --------------- Header -------------- //
-	script(src='/js/ui_events.js?v=#{bag.jshash}')
-	script(src='/js/websocket.js?v=#{bag.jshash}')
-	script(src='/js/startup.js?v=#{bag.jshash}')
-	script(src='/js/tx_story.js?v=#{bag.jshash}')
+	script(src='/js/ui_events.js?v=' + bag.jshash)
+	script(src='/js/websocket.js?v=' + bag.jshash)
+	script(src='/js/startup.js?v=' + bag.jshash)
+	script(src='/js/tx_story.js?v=' + bag.jshash)
 	script(type='text/javascript').
 		$(document).ready(function(){
 			
diff --git a/views/panel_startup.pug b/views/panel_startup.pug
index 1d15e56d2..2610b3f62 100644
--- a/views/panel_startup.pug
+++ b/views/panel_startup.pug
@@ -89,13 +89,13 @@
 			p Edit the details below to try again.
 		br
 		.stepInputLegend CA
-		input(type="text" placeholder="CA ex: 192.168.99.100:8888" name="caUrl" value="#{bag.creds.ca}").longer
+		input(type="text" placeholder="CA ex: 192.168.99.100:8888" name="caUrl" value=bag.creds.ca).longer
 		br
 		.stepInputLegend Enroll ID 
-		input(type="text" placeholder="Enroll Id" name="enrollId" value="#{bag.creds.admin_id}").longer
+		input(type="text" placeholder="Enroll Id" name="enrollId" value=bag.creds.admin_id).longer
 		br
 		.stepInputLegend Enroll Secret 
-		input(type="text" placeholder="Enroll Secret" name="enrollSecret" value="#{bag.creds.admin_secret}").longer
+		input(type="text" placeholder="Enroll Secret" name="enrollSecret" value=bag.creds.admin_secret).longer
 		br
 		br
 		button(type="button")#enrollAdmin Retry
@@ -117,16 +117,16 @@
 
 		br
 		.stepInputLegend Orderer 
-		input(type="text" placeholder="Orderer ex: 192.168.99.100:5151" name="ordererUrl" value="#{bag.creds.orderer}").longer
+		input(type="text" placeholder="Orderer ex: 192.168.99.100:5151" name="ordererUrl" value=bag.creds.orderer).longer
 		br
 		.stepInputLegend Peer 
-		input(type="text" placeholder="Peer ex: 192.168.99.100:7051" name="peerUrl" value="#{bag.creds.peer}").longer
+		input(type="text" placeholder="Peer ex: 192.168.99.100:7051" name="peerUrl" value=bag.creds.peer).longer
 		br
 		.stepInputLegend Chaincode ID 
-		input(type="text" placeholder="Chaincode ID" name="chaincodeId" value="#{bag.creds.chaincode_id}").longer
+		input(type="text" placeholder="Chaincode ID" name="chaincodeId" value=bag.creds.chaincode_id).longer
 		br
 		.stepInputLegend Chaincode Version 
-		input(type="text" placeholder="Chaincode Version" name="chaincodeVersion" value="#{bag.creds.chaincode_version}").longer
+		input(type="text" placeholder="Chaincode Version" name="chaincodeVersion" value=bag.creds.chaincode_version).longer
 		br
 		button(type="button")#retryDeploy Retry
 
@@ -140,11 +140,11 @@
 			p These are the identies that can own marbles.
 		br
 		.stepInputLegend Company 
-		input(type="text" value="#{bag.marble_company}" disabled="disabled").longer
+		input(type="text" value=bag.marble_company disabled="disabled").longer
 		br
 
 		.stepInputLegend Owners 
-		input(type="text" placeholder="bob, bill, amy" name="marbleOwners" value="#{bag.creds.marble_owners}").longer
+		input(type="text" placeholder="bob, bill, amy" name="marbleOwners" value=bag.creds.marble_owners).longer
 		br
 		br
 		button(type="button")#registerOwners Register
\ No newline at end of file
diff --git a/views/template/layout.pug b/views/template/layout.pug
index 9f7d4a594..209415203 100644
--- a/views/template/layout.pug
+++ b/views/template/layout.pug
@@ -12,13 +12,13 @@ html
 		link(rel="icon" href="/imgs/favicon-32.png" sizes="32x32")
 		link(rel="icon" href="/imgs/favicon-96.png" sizes="96x96")
 		link(rel="stylesheet" href="/css/font-awesome-4.5.0/css/font-awesome.min.css")
-		link(type="text/css" rel="stylesheet" href="/css/main.min.css?v=#{bag.csshash}")
+		link(type="text/css" rel="stylesheet" href="/css/main.min.css?v=" + bag.csshash)
 		script(src='/js/util/jquery-2.2.4.min.js')
 		script(src='/js/util/jquery-ui-1.11.4/jquery-ui.min.js')
 		script(src='/js/util/jquery.ui.touch-punch.min.js')
-		script(src='/js/funk.js?v=#{bag.jshash}')
-		script(src='/js/blockchain.js?v=#{bag.jshash}')
-		script(src='/js/ui_building.js?v=#{bag.jshash}')
+		script(src='/js/funk.js?v=' + bag.jshash)
+		script(src='/js/blockchain.js?v=' + bag.jshash)
+		script(src='/js/ui_building.js?v=' + bag.jshash)
 		script(type='text/javascript').
 			var bag = !{JSON.stringify(bag)};						//throw json over to JS
 			console.log('bag', bag);