diff --git a/erpnext/public/js/account_tree_grid.js b/erpnext/public/js/account_tree_grid.js
index 87fb7a9..4bc93ea 100644
--- a/erpnext/public/js/account_tree_grid.js
+++ b/erpnext/public/js/account_tree_grid.js
@@ -20,7 +20,7 @@
 			title: title,
 			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
-			appframe: wrapper.appframe,
+			page: wrapper.page,
 			doctypes: ["Company", "Fiscal Year", "Account", "GL Entry", "Cost Center"],
 			tree_grid: {
 				show: true,
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index 091836f..d32afeb 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -9,7 +9,7 @@
 			title: __("Stock Analytics"),
 			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
-			appframe: wrapper.appframe,
+			page: wrapper.page,
 			doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand",
 				"Fiscal Year", "Serial No"],
 			tree_grid: {
diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js
index 5bbfae4..ab1f7d2 100644
--- a/erpnext/public/js/transaction.js
+++ b/erpnext/public/js/transaction.js
@@ -82,9 +82,9 @@
 
 			this.$pos_btn && this.$pos_btn.remove();
 
-			this.$pos_btn = this.frm.appframe.add_primary_action(btn_label, function() {
+			this.$pos_btn = this.frm.page.add_menu_item(btn_label, function() {
 				me.toggle_pos();
-			}, icon, "btn-default");
+			});
 		} else {
 			// hack: will avoid calling refresh from refresh
 			setTimeout(function() { me.toggle_pos(false); }, 100);
@@ -105,12 +105,12 @@
 
 		// make pos
 		if(!this.frm.pos) {
-			var wrapper = this.frm.appframe.add_view("pos", "<div>");
+			var wrapper = this.frm.page.add_view("pos", "<div>");
 			this.frm.pos = new erpnext.POS(wrapper, this.frm);
 		}
 
 		// toggle view
-		this.frm.appframe.set_view(this.pos_active ? "main" : "pos");
+		this.frm.page.set_view(this.pos_active ? "main" : "pos");
 		this.pos_active = !this.pos_active;
 
 		// refresh
