diff --git a/luciexpress/htdocs/css/checkbox.css b/luciexpress/htdocs/css/checkbox.css
index 200cdc7e3..45477a62e 100644
--- a/luciexpress/htdocs/css/checkbox.css
+++ b/luciexpress/htdocs/css/checkbox.css
@@ -1,7 +1,10 @@
+.checkbox-info input[type="checkbox"] {
+    cursor: pointer; 
+}
 .checkbox-info input[type="checkbox"]:checked + label::before {
     background-color: #a8b400;
     border-color: #808080;
 }
 .checkbox-info input[type="checkbox"]:checked + label::after {
     color: #fff;
-}
\ No newline at end of file
+}
diff --git a/luciexpress/htdocs/js/juci.js b/luciexpress/htdocs/js/juci.js
index b3f30b765..35fe9c664 100644
--- a/luciexpress/htdocs/js/juci.js
+++ b/luciexpress/htdocs/js/juci.js
@@ -41,7 +41,11 @@
 		var deferred = $.Deferred(); 
 		async.series([
 			function(next){
-				scope.UBUS.$init().fail(function(){
+				scope.UBUS.$init().done(function(){
+					if(!scope.UBUS.router && !scope.UBUS.router.info){
+						alert("Questd must have crashed or is not running. Restart it on the router!"); 
+					}
+				}).fail(function(){
 					console.error("UBUS failed to initialize!"); 
 				}).always(function(){ next(); }); 
 			},  
diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.config.js b/luciexpress/htdocs/plugins/core/widgets/luci.config.js
index 3775420b7..26cbb4d7f 100644
--- a/luciexpress/htdocs/plugins/core/widgets/luci.config.js
+++ b/luciexpress/htdocs/plugins/core/widgets/luci.config.js
@@ -89,5 +89,9 @@ $juci.module("core")
 			setTimeout(function(){$scope.$apply();}, 0); 
 		}); 
 	}
+	$scope.onCancel = function(){
+		// simple way to reset
+		window.location.reload(); 
+	}
 }); 
 
diff --git a/luciexpress/htdocs/plugins/phone/pages/phone.numbers.html b/luciexpress/htdocs/plugins/phone/pages/phone.numbers.html
index ad6f24617..fd9141d11 100644
--- a/luciexpress/htdocs/plugins/phone/pages/phone.numbers.html
+++ b/luciexpress/htdocs/plugins/phone/pages/phone.numbers.html
@@ -12,9 +12,11 @@
 						{{num.username.value}}
 					</luci-config-line>
 					<luci-config-line title="Incoming Phone Lines">
-						<div class="form-group col-md-6" ng-repeat="line in phone_lines">
-							<label>{{line.name.value}}</label>
-							<input type="checkbox"/>
+						<div class="form-group col-md-6 " ng-repeat="line in phone_lines track by $index">
+							<div class="checkbox checkbox-info">
+								<input type="checkbox" checklist-model="num.call_lines.value" checklist-value="line['.name']"/>
+								<label>{{line.name.value}}</label>
+							</div>
 						</div>
 					</luci-config-line>
 				</luci-config-lines>
diff --git a/luciexpress/htdocs/plugins/phone/phone.js b/luciexpress/htdocs/plugins/phone/phone.js
index f8ece26ce..e6b8a7c3b 100644
--- a/luciexpress/htdocs/plugins/phone/phone.js
+++ b/luciexpress/htdocs/plugins/phone/phone.js
@@ -67,7 +67,7 @@ UCI.voice_client.$registerSectionType("sip_service_provider",  {
 	"priority_g726":		{ dvalue: 0, type: Number },   
 	"enabled":					{ dvalue: true, type: Boolean },
 	"target":						{ dvalue: "direct", type: String },       
-	"call_lines":				{ dvalue: "BRCM/4", type: String },
+	"call_lines":				{ dvalue: [], type: Array },
 	"mailbox":					{ dvalue: "", type: String },     
 	"call_filter":			{ dvalue: "", type: String },     
 	"domain":						{ dvalue: "", type: String },      
diff --git a/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.schedule.edit.html b/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.schedule.edit.html
index 530a730d4..622e605d3 100644
--- a/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.schedule.edit.html
+++ b/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.schedule.edit.html
@@ -8,9 +8,9 @@
 				<div class="row" ng-class="{'field-error': schedule.days.error}" >
 					<div class="col-xs-6 " ng-repeat="day in allDayNames">
 						<div class="checkbox checkbox-info">
-                            <input type="checkbox" checklist-model="schedule.days.value" checklist-value="day.value">
-                            <label><strong>{{day.label}}</strong></label>
-                        </div>
+							<input type="checkbox" checklist-model="schedule.days.value" checklist-value="day.value">
+							<label><strong>{{day.label}}</strong></label>
+						</div>
 					</div>
 				</div>
 			</luci-config-line>