diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js
index f7e476a..3ca51b8 100644
--- a/accounts/page/accounts_home/accounts_home.js
+++ b/accounts/page/accounts_home/accounts_home.js
@@ -3,6 +3,7 @@
 
 wn.module_page["Accounts"] = [
 	{
+		top: true,
 		title: wn._("Documents"),
 		icon: "icon-copy",
 		items: [
diff --git a/buying/page/buying_home/buying_home.js b/buying/page/buying_home/buying_home.js
index 0151a60..1db8d41 100644
--- a/buying/page/buying_home/buying_home.js
+++ b/buying/page/buying_home/buying_home.js
@@ -4,6 +4,7 @@
 wn.module_page["Buying"] = [
 	{
 		title: wn._("Documents"),
+		top: true,
 		icon: "icon-copy",
 		items: [
 			{
diff --git a/hr/page/hr_home/hr_home.js b/hr/page/hr_home/hr_home.js
index bee05f6..517fb77 100644
--- a/hr/page/hr_home/hr_home.js
+++ b/hr/page/hr_home/hr_home.js
@@ -3,10 +3,16 @@
 
 wn.module_page["HR"] = [
 	{
-		title: wn._("Documents"),
+		title: wn._("Top"),
+		top: true,
 		icon: "icon-copy",
 		items: [
 			{
+				label: wn._("Employee"),
+				description: wn._("Employee records."),
+				doctype:"Employee"
+			},
+			{
 				label: wn._("Leave Application"),
 				description: wn._("Applications for leave."),
 				doctype:"Leave Application"
@@ -17,6 +23,17 @@
 				doctype:"Expense Claim"
 			},
 			{
+				label: wn._("Job Applicant"),
+				description: wn._("Applicant for a Job."),
+				doctype:"Job Applicant"
+			},
+		]
+	},
+	{
+		title: wn._("Documents"),
+		icon: "icon-copy",
+		items: [
+			{
 				label: wn._("Attendance"),
 				description: wn._("Attendance record."),
 				doctype:"Attendance"
@@ -31,22 +48,6 @@
 				description: wn._("Performance appraisal."),
 				doctype:"Appraisal"
 			},
-			{
-				label: wn._("Job Applicant"),
-				description: wn._("Applicant for a Job."),
-				doctype:"Job Applicant"
-			},
-		]
-	},
-	{
-		title: wn._("Masters"),
-		icon: "icon-book",
-		items: [
-			{
-				label: wn._("Employee"),
-				description: wn._("Employee records."),
-				doctype:"Employee"
-			},
 		]
 	},
 	{
diff --git a/manufacturing/page/manufacturing_home/manufacturing_home.js b/manufacturing/page/manufacturing_home/manufacturing_home.js
index d4841df..7085f9a 100644
--- a/manufacturing/page/manufacturing_home/manufacturing_home.js
+++ b/manufacturing/page/manufacturing_home/manufacturing_home.js
@@ -4,9 +4,15 @@
 wn.module_page["Manufacturing"] = [
 	{
 		title: wn._("Documents"),
+		top: true,
 		icon: "icon-copy",
 		items: [
 			{
+				label: wn._("Bill of Materials"),
+				description: wn._("Bill of Materials (BOM)"),
+				doctype:"BOM"
+			},
+			{
 				label: wn._("Production Order"),
 				description: wn._("Orders released for production."),
 				doctype:"Production Order"
@@ -30,11 +36,6 @@
 		icon: "icon-book",
 		items: [
 			{
-				label: wn._("Bill of Materials"),
-				description: wn._("Bill of Materials (BOM)"),
-				doctype:"BOM"
-			},
-			{
 				label: wn._("Item"),
 				description: wn._("All Products or Services."),
 				doctype:"Item"
diff --git a/projects/page/projects_home/projects_home.js b/projects/page/projects_home/projects_home.js
index fd13a67..ea078e8 100644
--- a/projects/page/projects_home/projects_home.js
+++ b/projects/page/projects_home/projects_home.js
@@ -3,8 +3,9 @@
 
 wn.module_page["Projects"] = [
 	{
-		title: wn._("Documents"),
+		title: wn._("Top"),
 		icon: "icon-copy",
+		top: true,
 		items: [
 			{
 				label: wn._("Task"),
@@ -21,6 +22,12 @@
 				description: wn._("Time Log for tasks."),
 				doctype:"Time Log"
 			},
+		]
+	},
+	{
+		title: wn._("Documents"),
+		icon: "icon-copy",
+		items: [
 			{
 				label: wn._("Time Log Batch"),
 				description: wn._("Batch Time Logs for billing."),
diff --git a/selling/page/selling_home/selling_home.js b/selling/page/selling_home/selling_home.js
index 388fa42..8eae737 100644
--- a/selling/page/selling_home/selling_home.js
+++ b/selling/page/selling_home/selling_home.js
@@ -3,6 +3,7 @@
 
 wn.module_page["Selling"] = [
 	{
+		top: true,
 		title: wn._("Documents"),
 		icon: "icon-copy",
 		items: [
diff --git a/setup/page/setup/setup.py b/setup/page/setup/setup.py
index 10fc2a4..348fce9 100644
--- a/setup/page/setup/setup.py
+++ b/setup/page/setup/setup.py
@@ -93,6 +93,19 @@
 	{ "doctype": "Purchase Taxes and Charges Master" },
 	{
 		"type": "Section",
+		"title": "Opening Accounts and Stock",
+		"icon": "icon-eye-open"
+	},
+	{ "doctype": "Stock Reconciliation" },
+	{ 
+		"doctype": "Journal Voucher",
+		"title": "Opening Accounting Entries",
+		"filter": {
+			"is_opening": "Yes"
+		}
+	},
+	{
+		"type": "Section",
 		"title": "Human Resource",
 		"icon": "icon-group"
 	},
@@ -150,19 +163,6 @@
 	},
 	{
 		"type": "Section",
-		"title": "Opening Accounts and Stock",
-		"icon": "icon-eye-open"
-	},
-	{ "doctype": "Stock Reconciliation" },
-	{ 
-		"doctype": "Journal Voucher",
-		"title": "Opening Accounting Entries",
-		"filter": {
-			"is_opening": "Yes"
-		}
-	},
-	{
-		"type": "Section",
 		"title": "Customization",
 		"icon": "icon-glass"
 	},
@@ -244,8 +244,8 @@
 	elif "filter" in item:
 		key = item["filter"].keys()[0]
 		item["count"] = webnotes.conn.sql("""select count(*) from `tab%s` where
-			%s = %s""" % (item["doctype"], key, "%s"),
+			%s = %s and docstatus < 2""" % (item["doctype"], key, "%s"),
 			item["filter"][key])[0][0]
 	elif "doctype" in item:
-		item["count"] = webnotes.conn.sql("select count(*) from `tab%s`" \
+		item["count"] = webnotes.conn.sql("select count(*) from `tab%s` where docstatus<2" \
 			% item["doctype"])[0][0]
diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js
index c92c6fe..b17784f 100644
--- a/stock/page/stock_home/stock_home.js
+++ b/stock/page/stock_home/stock_home.js
@@ -4,6 +4,7 @@
 wn.module_page["Stock"] = [
 	{
 		title: wn._("Documents"),
+		top: true,
 		icon: "icon-copy",
 		items: [
 			{
diff --git a/support/page/support_home/support_home.js b/support/page/support_home/support_home.js
index 65ea4b8..ea8474c 100644
--- a/support/page/support_home/support_home.js
+++ b/support/page/support_home/support_home.js
@@ -3,7 +3,8 @@
 
 wn.module_page["Support"] = [
 	{
-		title: wn._("Documents"),
+		title: wn._("Top"),
+		top: true,
 		icon: "icon-copy",
 		items: [
 			{
@@ -16,6 +17,13 @@
 				description: wn._("Customer Issue against Serial No."),
 				doctype:"Customer Issue"
 			},
+		]
+	},
+
+	{
+		title: wn._("Documents"),
+		icon: "icon-copy",
+		items: [
 			{
 				label: wn._("Maintenance Schedule"),
 				description: wn._("Plan for maintenance visits."),
diff --git a/utilities/doctype/address/address.py b/utilities/doctype/address/address.py
index c475da1..4020766 100644
--- a/utilities/doctype/address/address.py
+++ b/utilities/doctype/address/address.py
@@ -27,13 +27,13 @@
 
 	def autoname(self):
 		if not self.doc.address_title:
-			self.doc.address_title = self.doc.customer or self.doc.supplier or self.doc.sales_partner or self.doc.lead
-			
+			self.doc.address_title = self.doc.customer \
+				or self.doc.supplier or self.doc.sales_partner or self.doc.lead
+				
 		if self.doc.address_title:
 			self.doc.name = cstr(self.doc.address_title).strip() + "-" + cstr(self.doc.address_type).strip()
-			
 		else:
-			webnotes.msgprint("""Address Title is mandatory.""", raise_exception=True)
+			webnotes.msgprint("""Address Title is mandatory.""" + self.doc.customer, raise_exception=True)
 		
 	def validate(self):
 		self.validate_primary_address()
diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt
index ed39c75..827331d 100644
--- a/utilities/doctype/address/address.txt
+++ b/utilities/doctype/address/address.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "modified": "2013-06-28 17:06:32", 
+  "modified": "2013-07-01 15:56:39", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -59,7 +59,7 @@
   "fieldname": "address_title", 
   "fieldtype": "Data", 
   "label": "Address Title", 
-  "reqd": 1
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
diff --git a/website/page/website_home/website_home.js b/website/page/website_home/website_home.js
index fb612df..bdedcc9 100644
--- a/website/page/website_home/website_home.js
+++ b/website/page/website_home/website_home.js
@@ -5,6 +5,7 @@
 	{
 		title: wn._("Web Content"),
 		icon: "icon-copy",
+		top: true,
 		items: [
 			{
 				label: wn._("Web Page"),
@@ -12,20 +13,20 @@
 				doctype:"Web Page"
 			},
 			{
-				label: wn._("Website Slideshow"),
-				description: wn._("Embed image slideshows in website pages."),
-				doctype:"Website Slideshow"
+				label: wn._("Blog Post"),
+				description: wn._("Single Post (article)."),
+				doctype:"Blog Post"
 			},
 		]
 	},
 	{
-		title: wn._("Blog"),
+		title: wn._("Documents"),
 		icon: "icon-edit",
 		items: [
 			{
-				label: wn._("Blog Post"),
-				description: wn._("Single Post (article)."),
-				doctype:"Blog Post"
+				label: wn._("Website Slideshow"),
+				description: wn._("Embed image slideshows in website pages."),
+				doctype:"Website Slideshow"
 			},
 			{
 				label: wn._("Blogger"),