diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 8c040a5359..7174ab1524 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -64,9 +64,6 @@ frappe.ui.form.Layout = Class.extend({
 		});
 		if(this.frm)
 			$(this.frm.wrapper).trigger("refresh-fields");
-
-			console.log(this.wrapper.find(".frappe-control:visible"));
-
 		setTimeout(function() {
 			if(!(me.wrapper.find(".frappe-control:visible").length)) {
 				$('<div class="alert alert-info empty-form-alert">'+__("This form does not have any input")+'</div>')
diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index 29f0cfabb4..098e5b44f5 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -4,6 +4,8 @@
 frappe.provide("frappe.ui.form");
 
 frappe.ui.form.save = function(frm, action, callback, btn) {
+	$(btn).prop("disabled", true);
+
 	var save = function() {
 		check_name();
 		if(check_mandatory()) {
@@ -16,6 +18,8 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 				},
 				btn: btn
 			});
+		} else {
+			$(btn).prop("disabled", false);
 		}
 	};
 
@@ -41,6 +45,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 				doc.__newname = strip(newname);
 			} else {
 				msgprint(__("Name is required"));
+				$(btn).prop("disabled", false);
 				throw "name required";
 			}
 		}
@@ -96,7 +101,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
 	var scroll_to = function(fieldname) {
 		var f = cur_frm.fields_dict[fieldname];
 		if(f) {
-			$(document).scrollTop($(f.wrapper).offset().top + 100);
+			$(document).scrollTop($(f.wrapper).offset().top - 80);
 		}
 		frm.scroll_set = true;
 	};
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index a1b34feba1..b649ab00e7 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -166,7 +166,7 @@ $.extend(frappe.ui.toolbar, {
 			.insertBefore(menu.find(".divider"))
 			.find("a")
 			.click(function() {
-				click();
+				click.apply(this);
 			});
 	},
 	get_menu: function(label) {