3 files changed, 9 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index c8c8880..256bffe 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -52,7 +52,7 @@ var BuilderSettings = FormView.extend({
 		this.$name.val( names.join(" ") )
 		this.action = this.createAction
 		
-		window.history.pushState(null, document.title, "/builder/new")
+		window.history.pushState(null, document.title, "/layout/new")
 	},
 	
 	clear: function(){
diff --git a/public/assets/javascripts/ui/builder/BuilderToolbar.js b/public/assets/javascripts/ui/builder/BuilderToolbar.js
index 6c218be..e9dcce3 100644
--- a/public/assets/javascripts/ui/builder/BuilderToolbar.js
+++ b/public/assets/javascripts/ui/builder/BuilderToolbar.js
@@ -60,6 +60,9 @@ var BuilderToolbar = View.extend({
 		var state = map.ui.permissions.toggle("destroy")
 		$(".inuse").removeClass("inuse")
 		$(e.currentTarget).toggleClass("inuse", state)
+		if (! state) {
+		  this.resetPermissions()
+		}
 	},
 
 })
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 33effc8..a952ecb 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -69,7 +69,9 @@ var FormView = View.extend({
       var errors = this.validate()
       if (errors && errors.length) {
         if (errorCallback) {
-          errorCallback(errors)
+          setTimeout(function(){
+            errorCallback(errors)
+          })
         }
         else {
           this.showErrors(errors)
@@ -77,7 +79,6 @@ var FormView = View.extend({
         return
       }
     }
-    
     var action = typeof this.action == "function" ? this.action() : this.action
     if (! action) return
 
@@ -112,7 +113,9 @@ var FormView = View.extend({
         return
       }
       else {
+        console.log("ok")
         if (successCallback) {
+        console.log("use cb")
           successCallback(response)
         }
         if (this.success) {