diff --git a/erpnext/config/accounting.py b/erpnext/config/accounting.py
index 0db5ff053bb..a8b944705b0 100644
--- a/erpnext/config/accounting.py
+++ b/erpnext/config/accounting.py
@@ -36,7 +36,7 @@ def get_data():
 					"name": "Account",
 					"icon": "fa fa-sitemap",
 					"label": _("Chart of Accounts"),
-					"route": "Tree/Account",
+					"route": "#Tree/Account",
 					"description": _("Tree of financial accounts."),
 					"onboard": 1,
 				},
@@ -111,11 +111,6 @@ def get_data():
 			"label": _("Setup"),
 			"icon": "fa fa-cog",
 			"items": [
-				{
-					"type": "doctype",
-					"name": "Opening Invoice Creation Tool",
-					"description": _("Create Opening Sales and Purchase Invoices")
-				},
 				{
 					"type": "doctype",
 					"name": "Accounts Settings",
@@ -163,7 +158,12 @@ def get_data():
 					"name": "C-Form",
 					"description": _("C-Form records"),
 					"country": "India"
-				}
+				},
+				{
+					"type": "doctype",
+					"name": "Cheque Print Template",
+					"description": _("Setup cheque dimensions for printing")
+				},
 			]
 		},
 		{
@@ -223,6 +223,34 @@ def get_data():
 		{
 			"label": _("Banking and Payments"),
 			"items": [
+				{
+					"type": "doctype",
+					"label": _("Bank"),
+					"name": "Bank",
+				},
+				{
+					"type": "doctype",
+					"label": _("Bank Account"),
+					"name": "Bank Account",
+				},
+				{
+					"type": "doctype",
+					"label": _("Bank Statement Transaction Entry List"),
+					"name": "Bank Statement Transaction Entry",
+					"route": "#List/Bank Statement Transaction Entry",
+				},
+				{
+					"type": "doctype",
+					"label": _("Bank Statement Transaction Entry Report"),
+					"name": "Bank Statement Transaction Entry",
+					"route": "#Report/Bank Statement Transaction Entry",
+				},
+				{
+					"type": "doctype",
+					"label": _("Bank Statement Settings"),
+					"name": "Bank Statement Settings",
+				},
+
 				{
 					"type": "doctype",
 					"label": _("Update Bank Transaction Dates"),
@@ -254,6 +282,40 @@ def get_data():
 				},
 			]
 		},
+		{
+			"label": _("Cost Center and Budgeting"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Cost Center",
+					"icon": "fa fa-sitemap",
+					"label": _("Chart of Cost Centers"),
+					"route": "#Tree/Cost Center",
+					"description": _("Tree of financial Cost Centers."),
+				},
+				{
+					"type": "doctype",
+					"name": "Budget",
+					"description": _("Define budget for a financial year.")
+				},
+				{
+					"type": "report",
+					"name": "Budget Variance Report",
+					"is_query_report": True,
+					"doctype": "Cost Center"
+				},
+				{
+					"type": "doctype",
+					"name": "Monthly Distribution",
+					"description": _("Seasonality for setting budgets, targets etc.")
+				},
+				{
+					"type": "doctype",
+					"name": "Period Closing Voucher",
+					"description": _("Close Balance Sheet and book Profit or Loss.")
+				},
+			]
+		},
 		{
 			"label": _("Taxes"),
 			"items": [
@@ -290,42 +352,25 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Cost Center and Budgeting"),
+			"label": _("Subscription Management"),
+			"icon": "fa fa-microchip ",
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Cost Center",
-					"icon": "fa fa-sitemap",
-					"label": _("Chart of Cost Centers"),
-					"route": "Tree/Cost Center",
-					"description": _("Tree of financial Cost Centers."),
+					"name": "Subscriber",
 				},
 				{
 					"type": "doctype",
-					"name": "Budget",
-					"description": _("Define budget for a financial year.")
-				},
-				{
-					"type": "report",
-					"name": "Budget Variance Report",
-					"is_query_report": True,
-					"doctype": "Cost Center"
+					"name": "Subscription Plan",
 				},
 				{
 					"type": "doctype",
-					"name": "Monthly Distribution",
-					"description": _("Seasonality for setting budgets, targets etc.")
+					"name": "Subscription"
 				},
 				{
 					"type": "doctype",
-					"name": "Period Closing Voucher",
-					"description": _("Close Balance Sheet and book Profit or Loss.")
-				},
-				{
-					"type": "doctype",
-					"name": "Cheque Print Template",
-					"description": _("Setup cheque dimensions for printing")
-				},
+					"name": "Subscription Settings"
+				}
 			]
 		},
 		{
@@ -542,37 +587,10 @@ def get_data():
 		]
 	}
 
-	subscriptions = {
-		"label": _("Subscription Management"),
-		"icon": "fa fa-microchip ",
-		"items": [
-			{
-				"type": "doctype",
-				"name": "Subscriber",
-			},
-			{
-				"type": "doctype",
-				"name": "Subscription Plan",
-			},
-			{
-				"type": "doctype",
-				"name": "Subscription"
-			},
-			{
-				"type": "doctype",
-				"name": "Subscription Settings"
-			}
-		]
-	}
-
 
 	countries = frappe.get_all("Company", fields="country")
 	countries = [country["country"] for country in countries]
 	if "India" in countries:
 		config.insert(7, gst)
 	domains = frappe.get_active_domains()
-	if "Services" in domains:
-		config.insert(5, subscriptions)
-	else:
-		config.insert(7, subscriptions)
 	return config
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index 735d7b909ec..c52b9a2a1f1 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -3,6 +3,39 @@ from frappe import _
 
 def get_data():
 	return [
+		{
+			"label": _("Purchasing"),
+			"icon": "fa fa-star",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Purchase Order",
+					"onboard": 1,
+					"dependencies": ["Item", "Supplier"],
+					"description": _("Purchase Orders given to Suppliers."),
+				},
+				{
+					"type": "doctype",
+					"name": "Material Request",
+					"onboard": 1,
+					"dependencies": ["Item"],
+					"description": _("Request for purchase."),
+				},
+				{
+					"type": "doctype",
+					"name": "Request for Quotation",
+					"onboard": 1,
+					"dependencies": ["Item", "Supplier"],
+					"description": _("Request for quotation."),
+				},
+				{
+					"type": "doctype",
+					"name": "Supplier Quotation",
+					"dependencies": ["Item", "Supplier"],
+					"description": _("Quotations received from Suppliers."),
+				},
+			]
+		},
 		{
 			"label": _("Items and Pricing"),
 			"items": [
@@ -45,35 +78,25 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Purchasing"),
-			"icon": "fa fa-star",
+			"label": _("Setup"),
+			"icon": "fa fa-cog",
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Purchase Order",
+					"name": "Buying Settings",
 					"onboard": 1,
-					"dependencies": ["Item", "Supplier"],
-					"description": _("Purchase Orders given to Suppliers."),
+					"description": _("Default settings for buying transactions.")
 				},
 				{
 					"type": "doctype",
-					"name": "Material Request",
-					"onboard": 1,
-					"dependencies": ["Item"],
-					"description": _("Request for purchase."),
+					"name": "Purchase Taxes and Charges Template",
+					"description": _("Tax template for buying transactions.")
 				},
 				{
 					"type": "doctype",
-					"name": "Request for Quotation",
-					"onboard": 1,
-					"dependencies": ["Item", "Supplier"],
-					"description": _("Request for quotation."),
-				},
-				{
-					"type": "doctype",
-					"name": "Supplier Quotation",
-					"dependencies": ["Item", "Supplier"],
-					"description": _("Quotations received from Suppliers."),
+					"name":"Terms and Conditions",
+					"label": _("Terms and Conditions Template"),
+					"description": _("Template of terms or contract.")
 				},
 			]
 		},
@@ -105,30 +128,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
-			"icon": "fa fa-cog",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Buying Settings",
-					"onboard": 1,
-					"description": _("Default settings for buying transactions.")
-				},
-				{
-					"type": "doctype",
-					"name":"Terms and Conditions",
-					"label": _("Terms and Conditions Template"),
-					"description": _("Template of terms or contract.")
-				},
-				{
-					"type": "doctype",
-					"name": "Purchase Taxes and Charges Template",
-					"description": _("Tax template for buying transactions.")
-				},
-			]
-		},
-		{
-			"label": _("Analytics"),
+			"label": _("Key Reports"),
 			"icon": "fa fa-table",
 			"items": [
 				{
@@ -152,6 +152,13 @@ def get_data():
 					"reference_doctype": "Purchase Order",
 					"onboard": 1,
 				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Requested Items To Be Ordered",
+					"reference_doctype": "Material Request",
+					"onboard": 1,
+				},
 			]
 		},
 		{
@@ -191,13 +198,6 @@ def get_data():
 					"reference_doctype": "Item",
 					"onboard": 1,
 				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Requested Items To Be Ordered",
-					"reference_doctype": "Material Request",
-					"onboard": 1,
-				},
 				{
 					"type": "report",
 					"is_query_report": True,
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index 3ea0d9c083b..3119824fdb6 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -43,80 +43,6 @@ def get_data():
 				},
 			]
 		},
-		{
-			"label": _("Support"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Issue",
-					"description": _("Support queries from customers."),
-					"onboard": 1,
-				},
-				{
-					"type": "doctype",
-					"name": "Communication",
-					"description": _("Communication log."),
-				},
-				{
-					"type": "doctype",
-					"name": "Warranty Claim",
-					"description": _("Warranty Claim against Serial No."),
-				},
-				{
-					"type": "doctype",
-					"name": "Serial No",
-					"description": _("Single unit of an Item."),
-				},
-				{
-					"type": "page",
-					"name": "support-analytics",
-					"label": _("Support Analytics"),
-					"icon": "fa fa-bar-chart"
-				},
-				{
-					"type": "report",
-					"name": "Minutes to First Response for Issues",
-					"doctype": "Issue",
-					"is_query_report": True,
-					"dependencies": ["Issue"],
-				},
-				{
-					"type": "report",
-					"name": "Support Hours",
-					"doctype": "Issue",
-					"is_query_report": True,
-					"dependencies": ["Issue"]
-				},
-			]
-		},
-		{
-			"label": _("Maintenance"),
-			"icon": "fa fa-star",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Maintenance Schedule",
-					"description": _("Plan for maintenance visits."),
-					"onboard": 1,
-				},
-				{
-					"type": "doctype",
-					"name": "Maintenance Visit",
-					"description": _("Visit report for maintenance call."),
-				},
-				{
-					"type": "report",
-					"name": "Maintenance Schedules",
-					"is_query_report": True,
-					"doctype": "Maintenance Schedule"
-				},
-				{
-					"type": "doctype",
-					"name": "Warranty Claim",
-					"description": _("Warranty Claim against Serial No."),
-				},
-			]
-		},
 		{
 			"label": _("Reports"),
 			"icon": "fa fa-list",
@@ -232,6 +158,80 @@ def get_data():
 				}
 			]
 		},
+		{
+			"label": _("Support"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Issue",
+					"description": _("Support queries from customers."),
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Communication",
+					"description": _("Communication log."),
+				},
+				{
+					"type": "doctype",
+					"name": "Warranty Claim",
+					"description": _("Warranty Claim against Serial No."),
+				},
+				{
+					"type": "doctype",
+					"name": "Serial No",
+					"description": _("Single unit of an Item."),
+				},
+				{
+					"type": "page",
+					"name": "support-analytics",
+					"label": _("Support Analytics"),
+					"icon": "fa fa-bar-chart"
+				},
+				{
+					"type": "report",
+					"name": "Minutes to First Response for Issues",
+					"doctype": "Issue",
+					"is_query_report": True,
+					"dependencies": ["Issue"],
+				},
+				{
+					"type": "report",
+					"name": "Support Hours",
+					"doctype": "Issue",
+					"is_query_report": True,
+					"dependencies": ["Issue"]
+				},
+			]
+		},
+		{
+			"label": _("Maintenance"),
+			"icon": "fa fa-star",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Maintenance Schedule",
+					"description": _("Plan for maintenance visits."),
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Maintenance Visit",
+					"description": _("Visit report for maintenance call."),
+				},
+				{
+					"type": "report",
+					"name": "Maintenance Schedules",
+					"is_query_report": True,
+					"doctype": "Maintenance Schedule"
+				},
+				{
+					"type": "doctype",
+					"name": "Warranty Claim",
+					"description": _("Warranty Claim against Serial No."),
+				},
+			]
+		},
 		# {
 		# 	"label": _("Help"),
 		# 	"items": [
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index b15e8ce41f5..8484c64c1a2 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -5,6 +5,99 @@ from frappe import _
 
 def get_data():
 	return [
+		# Modules
+		{
+			"module_name": "Accounting",
+			"category": "Modules",
+			"label": _("Accounting"),
+			"color": "#3498db",
+			"icon": "octicon octicon-repo",
+			"type": "module",
+			"hidden": 1,
+			"description": "Accounts, Billing, Payments, Cost Center and Budgeting."
+		},
+		{
+			"module_name": "Selling",
+			"category": "Modules",
+			"label": _("Selling"),
+			"color": "#1abc9c",
+			"icon": "octicon octicon-tag",
+			"type": "module",
+			"hidden": 1,
+			"description": "All things Sales, Customer and Products."
+		},
+		{
+			"module_name": "Buying",
+			"category": "Modules",
+			"label": _("Buying"),
+			"color": "#c0392b",
+			"icon": "octicon octicon-briefcase",
+			"type": "module",
+			"hidden": 1,
+			"description": "Purchasing, Suppliers and Products."
+		},
+		{
+			"module_name": "Stock",
+			"category": "Modules",
+			"label": _("Stock"),
+			"color": "#f39c12",
+			"icon": "octicon octicon-package",
+			"type": "module",
+			"hidden": 1,
+			"description": "Track Stock Transactions, Reports, and Serialized Items and Batches."
+		},
+		{
+			"module_name": "Assets",
+			"category": "Modules",
+			"label": _("Assets"),
+			"color": "#4286f4",
+			"icon": "octicon octicon-database",
+			"hidden": 1,
+			"type": "module",
+			"description": "Asset Maintainance and Tools."
+		},
+		{
+			"module_name": "Projects",
+			"category": "Modules",
+			"label": _("Projects"),
+			"color": "#8e44ad",
+			"icon": "octicon octicon-rocket",
+			"type": "module",
+			"hidden": 1,
+			"description": "Updates, Timesheets and Activities."
+		},
+		{
+			"module_name": "CRM",
+			"category": "Modules",
+			"label": _("CRM"),
+			"color": "#EF4DB6",
+			"icon": "octicon octicon-broadcast",
+			"type": "module",
+			"hidden": 1,
+			"description": "Everything in your sales pipeline, from Leads to Customers, to Support."
+		},
+		{
+			"module_name": "HR",
+			"category": "Modules",
+			"label": _("Human Resources"),
+			"color": "#2ecc71",
+			"icon": "octicon octicon-organization",
+			"type": "module",
+			"hidden": 1,
+			"description": "Employee Lifecycle, Payroll, Shifts and Leaves."
+		},
+		{
+			"module_name": "Quality Management",
+			"category": "Modules",
+			"label": _("Quality"),
+			"color": "#1abc9c",
+			"icon": "fa fa-check-square-o",
+			"type": "module",
+			"hidden": 1,
+			"description": "Volunteers, Memberships, Grants and Chapters."
+		},
+
+
 		# Category: "Domains"
 		{
 			"module_name": "Manufacturing",
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index cf7612db390..93a9f4106d8 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -9,83 +9,182 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Employee",
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Transfer",
+					"name": "Employee Attendance Tool",
+					"hide_count": True,
+					"onboard": 1,
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Promotion",
+					"name": "Attendance",
+					"onboard": 1,
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Separation",
+					"name": "Attendance Request",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Onboarding"
+					"name": "Upload Attendance",
+					"hide_count": True,
+					"dependencies": ["Employee"]
+				},
+			]
+		},
+		{
+			"label": _("Payroll"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Salary Structure",
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Separation Template",
+					"name": "Salary Structure Assignment",
+					"onboard": 1,
+					"dependencies": ["Salary Structure", "Employee"],
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Onboarding Template"
+					"name": "Salary Slip",
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Payroll Entry",
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Benefit Application",
+					"dependencies": ["Employee"]
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Benefit Claim",
+					"dependencies": ["Employee"]
+				},
+				{
+					"type": "doctype",
+					"name": "Additional Salary",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Declaration",
+					"dependencies": ["Employee"]
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Proof Submission",
+					"dependencies": ["Employee"]
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Incentive",
+					"dependencies": ["Employee"]
+				},
+				{
+					"type": "doctype",
+					"name": "Retention Bonus",
+					"dependencies": ["Employee"]
+				},
+				{
+					"type": "doctype",
+					"name": "Payroll Period",
+				},
+				{
+					"type": "doctype",
+					"name": "Salary Component",
+				},
+			]
+		},
+		{
+			"label": _("Setup"),
+			"icon": "fa fa-cog",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "HR Settings",
+				},
+				{
+					"type": "doctype",
+					"name": "Employment Type",
+				},
+				{
+					"type": "doctype",
+					"name": "Branch",
+				},
+				{
+					"type": "doctype",
+					"name": "Department",
+				},
+				{
+					"type": "doctype",
+					"name": "Designation",
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Grade",
+				},
+				{
+					"type": "doctype",
+					"name": "Daily Work Summary Group"
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Health Insurance"
+				},
+				{
+					"type": "doctype",
+					"name": "Staffing Plan",
 				}
 			]
 		},
 
 		{
-			"label": _("Attendance and Leaves"),
+			"label": _("Leaves"),
 			"items": [
-				{
-					"type": "doctype",
-					"name": "Employee Attendance Tool",
-					"hide_count": True
-				},
-				{
-					"type": "doctype",
-					"name": "Attendance",
-				},
-				{
-					"type": "doctype",
-					"name": "Attendance Request",
-				},
-				{
-					"type": "doctype",
-					"name": "Upload Attendance",
-					"hide_count": True
-				},
 				{
 					"type": "doctype",
 					"name": "Leave Application",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
 					"name": "Leave Allocation",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
 					"name": "Compensatory Leave Request",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
 					"name": "Leave Encashment",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
 					"name": "Leave Period",
-				},
-				{
-					"type": "doctype",
-					"name": "Leave Policy",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
 					"name":"Leave Type",
 				},
+				{
+					"type": "doctype",
+					"name": "Leave Policy",
+					"dependencies": ["Leave Type"]
+				},
 				{
 					"type": "doctype",
 					"name": "Holiday List",
@@ -97,68 +196,74 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Payroll"),
+			"label": _("Recruitment and Training"),
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Salary Structure Assignment",
+					"name": "Job Applicant",
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
-					"name": "Salary Slip",
+					"name": "Job Opening",
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
-					"name": "Payroll Entry"
+					"name": "Job Offer",
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Benefit Application",
+					"name": "Training Program"
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Benefit Claim",
+					"name": "Training Event"
 				},
 				{
 					"type": "doctype",
-					"name": "Additional Salary",
+					"name": "Training Result"
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Tax Exemption Declaration",
+					"name": "Training Feedback"
+				},
+			]
+		},
+		{
+			"label": _("Employee Lifecycle"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Employee Transfer",
+					"dependencies": ["Employee"],
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Tax Exemption Proof Submission",
+					"name": "Employee Promotion",
+					"dependencies": ["Employee"],
 				},
 				{
 					"type": "doctype",
-					"name": "Employee Incentive",
+					"name": "Employee Separation",
+					"dependencies": ["Employee"],
 				},
 				{
 					"type": "doctype",
-					"name": "Retention Bonus",
+					"name": "Employee Onboarding",
+					"dependencies": ["Job Applicant"],
 				},
 				{
 					"type": "doctype",
-					"name": "Payroll Period",
+					"name": "Employee Separation Template",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
-					"name": "Salary Component",
-				},
-				{
-					"type": "doctype",
-					"name": "Salary Structure",
-				},
-				# {
-				# 	"type": "doctype",
-				# 	"name": "Employee Tax Exemption Category",
-				# },
-				# {
-				# 	"type": "doctype",
-				# 	"name": "Employee Tax Exemption Sub Category"
-				# }
+					"name": "Employee Onboarding Template",
+					"dependencies": ["Employee"]
+				}
 			]
 		},
 		{
@@ -180,18 +285,7 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Employee Advance",
-				},
-				{
-					"type": "doctype",
-					"name": "Expense Claim",
-				},
-				{
-					"type": "doctype",
-					"name": "Expense Claim Type",
-				},
-				{
-					"type": "doctype",
-					"name": "Travel Request",
+					"dependencies": ["Employee"]
 				},
 				{
 					"type": "doctype",
@@ -200,39 +294,7 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Loan Application",
-				},
-			]
-		},
-		{
-			"label": _("Recruitment and Training"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Job Applicant",
-				},
-				{
-					"type": "doctype",
-					"name": "Job Opening",
-				},
-				{
-					"type": "doctype",
-					"name": "Job Offer",
-				},
-				{
-					"type": "doctype",
-					"name": "Training Program"
-				},
-				{
-					"type": "doctype",
-					"name": "Training Event"
-				},
-				{
-					"type": "doctype",
-					"name": "Training Result"
-				},
-				{
-					"type": "doctype",
-					"name": "Training Feedback"
+					"dependencies": ["Employee"]
 				},
 			]
 		},
@@ -314,48 +376,6 @@ def get_data():
 				},
 			]
 		},
-		{
-			"label": _("Setup"),
-			"icon": "fa fa-cog",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "HR Settings",
-				},
-				{
-					"type": "doctype",
-					"name": "Employment Type",
-				},
-				{
-					"type": "doctype",
-					"name": "Branch",
-				},
-				{
-					"type": "doctype",
-					"name": "Department",
-				},
-				{
-					"type": "doctype",
-					"name": "Designation",
-				},
-				{
-					"type": "doctype",
-					"name": "Employee Grade",
-				},
-				{
-					"type": "doctype",
-					"name": "Daily Work Summary Group"
-				},
-				{
-					"type": "doctype",
-					"name": "Employee Health Insurance"
-				},
-				{
-					"type": "doctype",
-					"name": "Staffing Plan",
-				}
-			]
-		},
 		# {
 		# 	"label": _("Help"),
 		# 	"icon": "fa fa-facetime-video",
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index b6fa1cf17fc..e1b6980ac56 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -11,32 +11,51 @@ def get_data():
 					"type": "doctype",
 					"name": "Work Order",
 					"description": _("Orders released for production."),
+					"onboard": 1,
+					"dependencies": ["Item", "BOM"]
 				},
 				{
 					"type": "doctype",
 					"name": "Production Plan",
 					"description": _("Generate Material Requests (MRP) and Work Orders."),
+					"onboard": 1,
+					"dependencies": ["Item", "BOM"]
 				},
 				{
 					"type": "doctype",
 					"name": "Stock Entry",
+					"onboard": 1,
+					"dependencies": ["Item"]
 				},
 				{
 					"type": "doctype",
 					"name": "Timesheet",
 					"description": _("Time Sheet for manufacturing."),
+					"onboard": 1,
+					"dependencies": ["Activity Type"]
 				},
-
+				{
+					"type": "doctype",
+					"name": "Job Card"
+				}
 			]
 		},
 		{
 			"label": _("Bill of Materials"),
 			"items": [
+				{
+					"type": "doctype",
+					"name": "Item",
+					"description": _("All Products or Services."),
+					"onboard": 1,
+				},
 				{
 					"type": "doctype",
 					"name": "BOM",
 					"description": _("Bill of Materials (BOM)"),
-					"label": _("Bill of Materials")
+					"label": _("Bill of Materials"),
+					"onboard": 1,
+					"dependencies": ["Item"]
 				},
 				{
 					"type": "doctype",
@@ -45,12 +64,10 @@ def get_data():
 					"label": _("BOM Browser"),
 					"description": _("Tree of Bill of Materials"),
 					"link": "Tree/BOM",
+					"onboard": 1,
+					"dependencies": ["Item"]
 				},
-				{
-					"type": "doctype",
-					"name": "Item",
-					"description": _("All Products or Services."),
-				},
+
 				{
 					"type": "doctype",
 					"name": "Workstation",
@@ -61,6 +78,10 @@ def get_data():
 					"name": "Operation",
 					"description": _("Details of the operations carried out."),
 				},
+				{
+					"type": "doctype",
+					"name": "Routing"
+				}
 
 			]
 		},
diff --git a/erpnext/config/quality_management.py b/erpnext/config/quality_management.py
index a17b9f55412..5844846b1db 100644
--- a/erpnext/config/quality_management.py
+++ b/erpnext/config/quality_management.py
@@ -10,11 +10,13 @@ def get_data():
 					"type": "doctype",
 					"name": "Quality Goal",
 					"description":_("Quality Goal."),
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
 					"name": "Quality Procedure",
 					"description":_("Quality Procedure."),
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
@@ -33,6 +35,7 @@ def get_data():
 					"type": "doctype",
 					"name": "Quality Review",
 					"description":_("Quality Review"),
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
@@ -58,6 +61,7 @@ def get_data():
 					"type": "doctype",
 					"name": "Customer Feedback",
 					"description":_("Customer Feedback"),
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
diff --git a/erpnext/config/retail.py b/erpnext/config/retail.py
index 7852f3bf3f7..738be7eb173 100644
--- a/erpnext/config/retail.py
+++ b/erpnext/config/retail.py
@@ -6,28 +6,31 @@ def get_data():
 		{
             "label": _("Retail Operations"),
             "items": [
+                {
+                    "type": "doctype",
+                    "name": "POS Profile",
+                    "label": _("Point-of-Sale Profile"),
+                    "description": _("Setup default values for POS Invoices"),
+					"onboard": 1,
+                },
                 {
                     "type": "page",
                     "name": "pos",
                     "label": _("POS"),
-                    "description": _("Point of Sale")
+                    "description": _("Point of Sale"),
+					"onboard": 1,
+					"dependencies": ["POS Profile"]
                 },
                 {
                     "type": "doctype",
                     "name": "Cashier Closing",
-                    "description": _("Cashier Closing")
+                    "description": _("Cashier Closing"),
                 },
                 {
                     "type": "doctype",
                     "name": "POS Settings",
                     "description": _("Setup mode of POS (Online / Offline)")
                 },
-                {
-                    "type": "doctype",
-                    "name": "POS Profile",
-                    "label": _("Point-of-Sale Profile"),
-                    "description": _("Setup default values for POS Invoices")
-                },
                 {
                     "type": "doctype",
                     "name": "Loyalty Program",
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index be44e4c7ba8..9e190a730a6 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -42,16 +42,6 @@ def get_data():
 					"description": _("Manage Sales Person Tree."),
 					"dependencies": ["Item", "Customer"],
 				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Address And Contacts",
-					"label": _("Sales Partner Addresses And Contacts"),
-					"doctype": "Address",
-					"route_options": {
-						"party_type": "Sales Partner"
-					}
-				},
 				{
 					"type": "report",
 					"is_query_report": True,
@@ -78,6 +68,20 @@ def get_data():
 					"description": _("All Products or Services."),
 					"onboard": 1,
 				},
+				{
+					"type": "doctype",
+					"name": "Item Price",
+					"description": _("Multiple Item prices."),
+					"route": "Report/Item Price",
+					"dependencies": ["Item", "Price List"],
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Price List",
+					"description": _("Price List master."),
+					"onboard": 1,
+				},
 				{
 					"type": "doctype",
 					"name": "Item Group",
@@ -93,19 +97,6 @@ def get_data():
 					"description": _("Bundle items at time of sale."),
 					"dependencies": ["Item"],
 				},
-				{
-					"type": "doctype",
-					"name": "Price List",
-					"description": _("Price List master."),
-					"dependencies": ["Item"],
-				},
-				{
-					"type": "doctype",
-					"name": "Item Price",
-					"description": _("Multiple Item prices."),
-					"route": "Report/Item Price",
-					"dependencies": ["Item", "Price List"],
-				},
 				{
 					"type": "doctype",
 					"name": "Pricing Rule",
@@ -130,28 +121,18 @@ def get_data():
 					"description": _("Default settings for selling transactions."),
 					"onboard": 1,
 				},
-				{
-					"type": "doctype",
-					"name": "Campaign",
-					"description": _("Sales campaigns."),
-					"onboard": 1,
-				},
-				{
-					"type": "doctype",
-					"name": "Industry Type",
-					"description": _("Track Leads by Industry Type."),
-					"onboard": 1,
-				},
 				{
 					"type": "doctype",
 					"name":"Terms and Conditions",
 					"label": _("Terms and Conditions Template"),
-					"description": _("Template of terms or contract.")
+					"description": _("Template of terms or contract."),
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
 					"name": "Sales Taxes and Charges Template",
-					"description": _("Tax template for selling transactions.")
+					"description": _("Tax template for selling transactions."),
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
@@ -184,10 +165,15 @@ def get_data():
 					"link": "Tree/Territory",
 					"description": _("Manage Territory Tree."),
 				},
+				{
+					"type": "doctype",
+					"name": "Campaign",
+					"description": _("Sales campaigns."),
+				},
 			]
 		},
 		{
-			"label": _("Analytics"),
+			"label": _("Key Reports"),
 			"icon": "fa fa-table",
 			"items": [
 				{
@@ -211,6 +197,30 @@ def get_data():
 					"doctype": "Customer",
 					"icon": "fa fa-bar-chart",
 				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Inactive Customers",
+					"doctype": "Sales Order"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Ordered Items To Be Delivered",
+					"doctype": "Sales Order"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Sales Person-wise Transaction Summary",
+					"doctype": "Sales Order"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Item-wise Sales History",
+					"doctype": "Item"
+				},
 				{
 					"type": "report",
 					"is_query_report": True,
@@ -245,36 +255,12 @@ def get_data():
 						"party_type": "Customer"
 					}
 				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Ordered Items To Be Delivered",
-					"doctype": "Sales Order"
-				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Sales Person-wise Transaction Summary",
-					"doctype": "Sales Order"
-				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Item-wise Sales History",
-					"doctype": "Item"
-				},
 				{
 					"type": "report",
 					"is_query_report": True,
 					"name": "BOM Search",
 					"doctype": "BOM"
 				},
-				{
-					"type": "report",
-					"is_query_report": True,
-					"name": "Inactive Customers",
-					"doctype": "Sales Order"
-				},
 				{
 					"type": "report",
 					"is_query_report": True,
diff --git a/erpnext/config/settings.py b/erpnext/config/settings.py
index 2978bc300e5..0bbf6ec7efe 100644
--- a/erpnext/config/settings.py
+++ b/erpnext/config/settings.py
@@ -13,7 +13,8 @@ def get_data():
 					"name": "Global Defaults",
 					"label": _("Global Settings"),
 					"description": _("Set Default Values like Company, Currency, Current Fiscal Year, etc."),
-					"hide_count": True
+					"hide_count": True,
+					"onboard": 1,
 				}
 			]
 		},
@@ -24,7 +25,8 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Letter Head",
-					"description": _("Letter Heads for print templates.")
+					"description": _("Letter Heads for print templates."),
+					"onboard": 1,
 				},
 				{
 					"type": "doctype",
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 185d029bc00..6c06733d933 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -30,6 +30,10 @@ def get_data():
 					"onboard": 1,
 					"dependencies": ["Item"],
 				},
+				{
+					"type": "doctype",
+					"name": "Delivery Trip"
+				},
 			]
 		},
 		{
@@ -81,6 +85,41 @@ def get_data():
 				}
 			]
 		},
+		{
+			"label": _("Setup"),
+			"icon": "fa fa-cog",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Stock Settings",
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Warehouse",
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "UOM",
+					"label": _("Unit of Measure") + " (UOM)",
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Brand",
+					"onboard": 1,
+				},
+				{
+					"type": "doctype",
+					"name": "Item Attribute",
+				},
+				{
+					"type": "doctype",
+					"name": "Item Variant Settings",
+				},
+			]
+		},
 		{
 			"label": _("Items and Pricing"),
 			"items": [
@@ -165,21 +204,6 @@ def get_data():
 				},
 			]
 		},
-		{
-			"label": _("Fulfilment"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Delivery Note",
-					"description": _("Delivery Trip service tours to customers."),
-					"onboard": 1
-				},
-				{
-					"type": "doctype",
-					"name": "Delivery Trip"
-				},
-			]
-		},
 		{
 			"label": _("Tools"),
 			"icon": "fa fa-wrench",
@@ -189,6 +213,11 @@ def get_data():
 					"name": "Stock Reconciliation",
 					"onboard": 1,
 				},
+				{
+					"type": "doctype",
+					"name": "Landed Cost Voucher",
+					"onboard": 1,
+				},
 				{
 					"type": "doctype",
 					"name": "Packing Slip",
@@ -197,55 +226,15 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Quality Inspection",
-					"onboard": 1,
 				},
 				{
 					"type": "doctype",
 					"name": "Quality Inspection Template",
 				},
-				{
-					"type": "doctype",
-					"name": "Landed Cost Voucher",
-				}
 			]
 		},
 		{
-			"label": _("Setup"),
-			"icon": "fa fa-cog",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Stock Settings",
-					"onboard": 1,
-				},
-				{
-					"type": "doctype",
-					"name": "Warehouse",
-					"onboard": 1,
-				},
-				{
-					"type": "doctype",
-					"name": "UOM",
-					"label": _("Unit of Measure") + " (UOM)",
-					"onboard": 1,
-				},
-				{
-					"type": "doctype",
-					"name": "Brand",
-					"onboard": 1,
-				},
-				{
-					"type": "doctype",
-					"name": "Item Attribute",
-				},
-				{
-					"type": "doctype",
-					"name": "Item Variant Settings",
-				},
-			]
-		},
-		{
-			"label": _("Analytics"),
+			"label": _("Key Reports"),
 			"icon": "fa fa-table",
 			"items": [
 				{
@@ -274,13 +263,6 @@ def get_data():
 					"name": "Purchase Receipt Trends",
 					"doctype": "Purchase Receipt"
 				},
-
-			]
-		},
-		{
-			"label": _("Reports"),
-			"icon": "fa fa-list",
-			"items": [
 				{
 					"type": "report",
 					"is_query_report": True,
@@ -302,14 +284,20 @@ def get_data():
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Requested Items To Be Transferred",
-					"doctype": "Material Request"
+					"name": "Batch-Wise Balance History",
+					"doctype": "Batch"
 				},
+			]
+		},
+		{
+			"label": _("Other Reports"),
+			"icon": "fa fa-list",
+			"items": [
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Batch-Wise Balance History",
-					"doctype": "Batch"
+					"name": "Requested Items To Be Transferred",
+					"doctype": "Material Request"
 				},
 				{
 					"type": "report",
diff --git a/erpnext/public/js/hub/hub_factory.js b/erpnext/public/js/hub/hub_factory.js
index 2efc8261106..8dab2d62510 100644
--- a/erpnext/public/js/hub/hub_factory.js
+++ b/erpnext/public/js/hub/hub_factory.js
@@ -36,18 +36,3 @@ function is_marketplace_disabled() {
 		method: "erpnext.hub_node.doctype.marketplace_settings.marketplace_settings.is_marketplace_enabled"
 	}).then(r => r.message)
 }
-
-$(document).on('toolbar_setup', () => {
-	$('#toolbar-user .navbar-reload').after(`
-		<li>
-			<a class="marketplace-link" href="#marketplace/home">${__('Marketplace')}
-		</li>
-	`);
-
-	is_marketplace_disabled()
-		.then(disabled => {
-			if (disabled) {
-				$('#toolbar-user .marketplace-link').hide();
-			}
-		});
-});