diff --git a/projects/page/projects/projects.txt b/projects/page/projects/projects.txt
index 69f3afa..170134e 100644
--- a/projects/page/projects/projects.txt
+++ b/projects/page/projects/projects.txt
@@ -2,19 +2,30 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2010-12-14 10:23:31", 
+  "creation": "2012-06-14 18:44:57", 
   "modified_by": "Administrator", 
-  "modified": "2010-12-30 14:43:47"
+  "modified": "2013-01-09 17:19:26"
  }, 
  {
   "name": "__common__", 
+  "doctype": "Page", 
   "module": "Projects", 
   "standard": "Yes", 
-  "page_name": "Projects", 
-  "doctype": "Page"
+  "page_name": "Projects"
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Projects", 
+  "doctype": "Page Role", 
+  "parenttype": "Page", 
+  "role": "Projects User", 
+  "parentfield": "roles"
  }, 
  {
   "name": "Projects", 
   "doctype": "Page"
+ }, 
+ {
+  "doctype": "Page Role"
  }
 ]
\ No newline at end of file
diff --git a/setup/page/setup/setup.html b/setup/page/setup/setup.html
deleted file mode 100644
index 33dd460..0000000
--- a/setup/page/setup/setup.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<div class="layout-wrapper layout-wrapper-appframe">
-	<div class="appframe-area"></div>
-	<div class="layout-main">
-		<div class="setup-column">
-			<h3>Company</h3>
-			<p>
-				<b><a href="#List/Company">Companies</a></b><br>
-				<span class="help">List of companies (not customers / suppliers)</span>
-			</p>
-			<p>
-				<b><a href="#List/Fiscal Year">Fiscal Years</a></b><br>
-				<span class="help">Financial Years for books of accounts</span>
-			</p>
-			<p>
-				<b><a href="#List/Currency">Currencies</a></b><br>
-				<span class="help">Currency Master</span>
-			</p>
-		</div>
-		<div class="setup-column">
-			<h3>Users and Permissions</h3>
-			<p>
-				<b><a href="#List/Profile">Users</a></b><br>
-				<span class="help">Add/remove users, set roles, passwords etc</span>
-			</p>
-			<p>
-				<b><a href="#permission-manager">Permission Manager</a></b><br>
-				<span class="help">Set permissions on transactions / masters</span>
-			</p>
-			<p>
-				<b><a href="#user-properties">User Properties</a></b><br>
-				<span class="help">Set default values for users (also used for permissions).</span>
-			</p>
-			<p>
-				<b><a href="#List/Workflow">Workflow Manager</a></b><br>
-				<span class="help">Set workflow rules.</span>
-			</p>
-			<p>
-				<b><a href="#List/Authorization Rule">Amount based Authorization Rules</a></b><br>
-				<span class="help">Restrict submission rights based on amount</span>
-			</p>
-		</div>
-		<div class="setup-column">
-			<h3>Data</h3>
-			<p>
-				<b><a href="#data-import-tool">Data Import Tool</a></b><br>
-				<span class="help">Import data from spreadsheet (csv) files</span>
-			</p>
-			<p>
-				<b><a href="#Form/Global Defaults/Global Defaults">Global Defaults</a></b><br>
-				<span class="help">Set default values for entry</span>
-			</p>
-			<p>
-				<b><a href="#Trash">Recycle Bin</a></b><br>
-				<span class="help">Un-trash items</span>
-			</p>
-		</div>
-		<div class="setup-column">
-			<h3>Email and Notifications</h3>
-			<p>
-				<b><a href="#Form/Email Settings/Email Settings">Email Settings</a></b><br>
-				<span class="help">Out going mail server and support ticket mailbox</span>
-			</p>
-			<p>
-				<b><a href="#Form/Notification Control/Notification Control">Auto Notifications</a></b><br>
-				<span class="help">Automatic email sending to customers and suppliers</span>
-			</p>
-			<p>
-				<b><a href="#List/Email Digest">Email Digests</a></b><br>
-				<span class="help">Daily, weekly, monthly email Digests</span>
-			</p>
-			<p>
-				<b><a href="#Form/SMS Settings/SMS Settings">SMS Setup</a></b><br>
-				<span class="help">Setup outgoing SMS via your bulk SMS provider</span>
-			</p>
-			<p>
-				<b><a href="#Form/SMS Center/SMS Center">Send Bulk SMS</a></b><br>
-				<span class="help">Send bulk SMS to leads, customers, contacts</span>
-			</p>
-		</div>
-		<div class="setup-column">
-			<h3>Customize ERPNext</h3>
-			<p>
-				<b><a href="#Form/Customize Form/Customize Form">Customize Forms</a></b><br>
-				<span class="help">Change entry properties (hide fields, make mandatory etc)</span>
-			</p>
-			<p>
-				<b><a href="#List/Custom Field">Custom Fields</a></b><br>
-				<span class="help">Add fields to forms</span>
-			</p>
-			<p>
-				<b><a href="#List/Custom Script">Custom Scripts</a></b><br>
-				<span class="help">Add custom code to forms</span>
-			</p>
-			<p>
-				<b><a href="#Form/Features Setup/Features Setup">Disable Features</a></b><br>
-				<span class="help">Simplify entry forms by disabling features</span>
-			</p>
-			<p>
-				<b><a href="#modules_setup">Modules Setup</a></b><br>
-				<span class="help">Show, hide modules</span>
-			</p>
-			<p>
-				<b><a href="#Form/Naming Series/Naming Series">Numbering Series</a></b><br>
-				<span class="help">Set multiple numbering series for transactions</span>
-			</p>
-		</div>
-		<div class="setup-column">
-			<h3>Branding and Printing</h3>
-			<p>
-				<b><a href="#List/Letter Head">Letter Heads</a></b><br>
-				<span class="help">Letter heads for print</span>
-			</p>
-			<p>
-				<b><a href="#List/Print Format">Print Formats</a></b><br>
-				<span class="help">HTML print formats for quotes, invoices etc</span>
-			</p>
-			<p>
-				<b><a href="#List/Print Heading">Print Headings</a></b><br>
-				<span class="help">Add headers for standard print formats</span>
-			</p>
-			<p>
-				<b><a href="#Form/Style Settings/Style Settings">Style Settings</a></b><br>
-				<span class="help">Change background fonts etc</span>
-			</p>
-		</div>
-		<div style="clear: both"></div>
-	</div>
-</div>
diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js
index a1b9f2d..a54b605 100644
--- a/setup/page/setup/setup.js
+++ b/setup/page/setup/setup.js
@@ -1,27 +1,185 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// ERPNext: Copyright 2013 Web Notes Technologies Pvt Ltd
+// GNU General Public License. See "license.txt"
 
-pscript.onload_Setup = function(wrapper) {
-	wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'Setup');
-	wrapper.appframe.add_home_breadcrumb();
-	wrapper.appframe.add_breadcrumb(wn.modules["Setup"].icon);
-	
-	erpnext.module_page.hide_links(wrapper);
+wn.module_page["Setup"] = [
+	{
+		title: wn._("Organization"),
+		icon: "icon-building",
+		items: [
+			{
+				"label":wn._("Company"),
+				"doctype":"Company",
+				"description":wn._("List of companies (not customers / suppliers)")
+			},
+			{
+				"doctype":"Fiscal Year",
+				"label": wn._("Fiscal Year"),
+				"description":wn._("Financial Years for books of accounts")
+			},
+			{
+				"doctype":"Currency",
+				"label": wn._("Currency"),
+				"description": wn._("Currency Master")
+			},
+		]
+	},
+	{
+		title: wn._("Users"),
+		icon: "icon-group",
+		right: true,
+		items: [
+			{
+				"doctype":"Profile",
+				"label": wn._("Profile"),
+				"description": wn._("Add/remove users, set roles, passwords etc")
+			},
+			{
+				"page":"permission-manager",
+				label: wn._("Permission Manager"),
+				"description": wn._("Set permissions on transactions / masters")
+			},
+			{
+				"page":"user-properties",
+				label: wn._("User Properties"),
+				"description":wn._("Set default values for users (also used for permissions).")
+			},
+			{
+				"doctype":"Workflow",
+				label:wn._("Workfow"),
+				"description":wn._("Set workflow rules.")
+			},
+			{
+				"doctype":"Authorization Rule",
+				label:wn._("Authorization Rule"),
+				"description":wn._("Restrict submission rights based on amount")
+			},
+		]
+	},
+	{
+		title: wn._("Data"),
+		icon: "icon-table",
+		items: [
+			{
+				"page":"data-import-tool",
+				label: wn._("Data Import"),
+				"description":wn._("Import data from spreadsheet (csv) files")
+			},
+			{
+				"route":"Form/Global Defaults",
+				doctype: "Global Defaults",
+				label: wn._("Global Defaults"),
+				"description":wn._("Set default values for entry"),
+			},
+			{
+				"route":"Form/Naming Series/Naming Series",
+				doctype: "Naming Series",
+				label: wn._("Manage numbering series"),
+				"description":wn._("Set multiple numbering series for transactions")
+			},
+		]
+	},
+	{
+		title: wn._("Branding and Printing"),
+		icon: "icon-printer",
+		right: true,
+		items: [
+			{
+				"doctype":"Letter Head",
+				label:wn._("Letter Head"),
+				"description":wn._("Letter heads for print")
+			},
+			{
+				"doctype":"Print Format",
+				label:wn._("Print Format"),
+				"description":wn._("HTML print formats for quotes, invoices etc")
+			},
+			{
+				"doctype":"Print Heading",
+				label:wn._("Print Heading"),
+				"description":wn._("Add headers for standard print formats")
+			},
+			{
+				"route":"Form/Style Settings/Style Settings",
+				doctype:wn._("Style Settings"),
+				label:wn._("Style Settings"),
+				"description":wn._("Change background fonts etc")
+			}
+		]
+	},
+	{
+		title: wn._("Email Settings"),
+		icon: "icon-envelope",
+		items: [
+			{
+				"route":"Form/Email Settings/Email Settings",
+				doctype:"Email Settings",
+				label: wn._("Email Settings"),
+				"description":wn._("Out going mail server and support ticket mailbox")
+			},
+			{
+				"route":"Form/Notification Control/Notification Control",
+				doctype:"Notification Control",
+				label: wn._("Notification Control"),
+				"description":wn._("Prompt email sending to customers and suppliers"),
+			},
+			{
+				"doctype":"Email Digest",
+				label: wn._("Email Digest"),
+				"description":wn._("Daily, weekly, monthly email Digests")
+			},
+			{
+				"route":"Form/SMS Settings/SMS Settings",
+				doctype:"SMS Settings",
+				label: wn._("SMS Settings"),
+				"description":wn._("Setup outgoing SMS via your bulk SMS provider")
+			},
+			{
+				"route":"Form/SMS Center/SMS Center",
+				doctype:"SMS Center",
+				label: wn._("SMS Center"),
+				"description":wn._("Send bulk SMS to leads, customers, contacts")
+			},
+		]
+	},
+	{
+		title: wn._("Customize"),
+		icon: "icon-wrench",
+		items: [			
+			{
+				"route":"Form/Customize Form/Customize Form",
+				doctype:"Customize Form",
+				label: wn._("Customize Form"),
+				"description":wn._("Change entry properties (hide fields, make mandatory etc)")
+			},
+			{
+				"doctype":"Custom Field",
+				label: wn._("Custom Field"),
+				"description":wn._("Add fields to forms")
+			},
+			{
+				"doctype":"Custom Script",
+				label: wn._("Custom Script"),
+				"description":wn._("Add custom code to forms")
+			},
+			{
+				"route":"Form/Features Setup/Features Setup",
+				"description":wn._("Simplify entry forms by disabling features"),
+				doctype:"Features Setup",
+				label: wn._("Features Setup"),
+			},
+			{
+				"page":"modules_setup",
+				label: wn._("Show / Hide Modules"),
+				"description":wn._("Show, hide modules")
+			},
+		]
+	},
+]
+
+pscript['onload_Setup'] = function(wrapper) {
+	wn.views.moduleview.make(wrapper, "Setup");
 	if(wn.boot.expires_on) {
-		$(wrapper).find(".layout-main")
+		$(wrapper).find(".main-section")
 			.prepend("<div class='alert'>Your ERPNext account will expire on "
 				+ wn.datetime.global_date_format(wn.boot.expires_on) + "</div>");
 	}
diff --git a/stock/page/stock_balance/stock_balance.txt b/stock/page/stock_balance/stock_balance.txt
index 0f8e7fa..24fffc2 100644
--- a/stock/page/stock_balance/stock_balance.txt
+++ b/stock/page/stock_balance/stock_balance.txt
@@ -2,9 +2,9 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-12-25 13:02:32", 
+  "creation": "2012-12-27 18:57:47", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-25 13:02:32"
+  "modified": "2013-01-09 17:16:51"
  }, 
  {
   "name": "__common__", 
@@ -15,7 +15,22 @@
   "page_name": "stock-balance"
  }, 
  {
+  "name": "__common__", 
+  "parent": "stock-balance", 
+  "doctype": "Page Role", 
+  "parenttype": "Page", 
+  "parentfield": "roles"
+ }, 
+ {
   "name": "stock-balance", 
   "doctype": "Page"
+ }, 
+ {
+  "role": "Material Manager", 
+  "doctype": "Page Role"
+ }, 
+ {
+  "role": "Analytics", 
+  "doctype": "Page Role"
  }
 ]
\ No newline at end of file
diff --git a/stock/page/stock_level/stock_level.txt b/stock/page/stock_level/stock_level.txt
index 6bf5c41..4b56713 100644
--- a/stock/page/stock_level/stock_level.txt
+++ b/stock/page/stock_level/stock_level.txt
@@ -2,9 +2,9 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-12-28 11:02:23", 
+  "creation": "2012-12-31 10:52:14", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-28 11:02:23"
+  "modified": "2013-01-09 17:16:57"
  }, 
  {
   "name": "__common__", 
@@ -15,7 +15,22 @@
   "page_name": "stock-level"
  }, 
  {
+  "name": "__common__", 
+  "parent": "stock-level", 
+  "doctype": "Page Role", 
+  "parenttype": "Page", 
+  "parentfield": "roles"
+ }, 
+ {
   "name": "stock-level", 
   "doctype": "Page"
+ }, 
+ {
+  "role": "Material Manager", 
+  "doctype": "Page Role"
+ }, 
+ {
+  "role": "Analytics", 
+  "doctype": "Page Role"
  }
 ]
\ No newline at end of file