diff --git a/docs/docs.download.md b/docs/docs.download.md
index 2b9a9e8..27a95ec 100644
--- a/docs/docs.download.md
+++ b/docs/docs.download.md
@@ -1,6 +1,7 @@
 ---
 {
-	"_label": "Download ERPNext"
+	"_label": "Download ERPNext",
+	"_icon": "download"
 }
 ---
 ### Download a pre-installed Virtual Box Image
diff --git a/docs/docs.md b/docs/docs.md
index 6000ec3..1e516ca 100644
--- a/docs/docs.md
+++ b/docs/docs.md
@@ -9,7 +9,8 @@
 		"docs.community",
 		"docs.blog",
 		"docs.about"
-	]
+	],
+	"_no_toc": 1
 }
 ---
 <br>
diff --git a/docs/docs.user.intro.md b/docs/docs.user.intro.md
index 4aada62..19f8d98 100644
--- a/docs/docs.user.intro.md
+++ b/docs/docs.user.intro.md
@@ -1,14 +1,21 @@
 ---
 {
 	"_label": "Introduction",
-	"_title_image": "img/why-erpnext.png"
+	"_toc": [
+		"docs.user.intro.open_source",
+		"docs.user.intro.try",
+		"docs.dev.install",
+		"docs.user.help"
+	]
 }
 ---
 ## What is an ERP and why should I care?
 
-Small business are not so different from large ones. They contain most of the complexities of a large business but with many more constraints. Small businesses have to communicate with customers, do accounts, pay taxes, do payroll, manage timelines, deliver quality, answer questions and keep everyone happy just like large businesses.
+(If you are already convinced you need an all-in-one system for your organization, you can skip this.)
 
-And to it *efficiently*.
+If you are running a small business that has some employees, you understand its hard to manage the dynamic nature of doing businesses. You are already using software like Accounting, and may be some other one to manage your inventory and sales (or CRM). An ERP brings all of that together in one place.
+
+Small business are not so different from large ones. They contain most of the complexities of a large business but with many more constraints. Small businesses have to communicate with customers, do accounts, pay taxes, do payroll, manage timelines, deliver quality, answer questions and keep everyone happy just like large businesses.
 
 Large businesses have the advantage of using advanced data systems to manage their process efficiently. Small businesses typically struggle to keep things organized. They are often using a mix of apps like spreadsheets, accounting software, web CRM etc to manage but not everyone is on the same page. An ERP changes that.
 
diff --git a/docs/docs.user.intro.open_source.md b/docs/docs.user.intro.open_source.md
index 0979e38..ed1556e 100644
--- a/docs/docs.user.intro.open_source.md
+++ b/docs/docs.user.intro.open_source.md
@@ -3,9 +3,9 @@
 	"_label": "Open Source"
 }
 ---
-What Open Source means is that there is no license on the software. The source code is open for anyone to understand, extend or improve and it is free!
+The source code in an Open Source software is open for anyone to understand, extend or improve. And it is free!
 
-A non-software business might think why does Open Source matter, because they will pay some service provider to help them manage their ERP. The way it matters is that:
+Advantages of an Open Source software are:
 
 1. You can choose to change your service provider anytime.
 1. You can host the application anywhere, including your own server so you have complete ownership and privacy of the data.
diff --git a/docs/docs.user.intro.try.md b/docs/docs.user.intro.try.md
index 64d6895..33cab69 100644
--- a/docs/docs.user.intro.try.md
+++ b/docs/docs.user.intro.try.md
@@ -13,7 +13,7 @@
 
 ### 2. Get a Free 30 day Trial at ERPNext.com
 
-If you like the feel and want to setup your own company, you can try a 30 day free trial (on credit card details required) at ERPNext.com
+If you like the feel and want to setup your own company, you can try a 30 day free trial (no credit card details required) at ERPNext.com
 
 ERPNext.com is managed by the organization (Web Notes) that publishes ERPNext and you can do a trial run with your own account by [signing up on the website](https://erpnext.com/pricing-and-signup).
 
diff --git a/docs/docs.user.md b/docs/docs.user.md
index 4dc9145..2294d31 100644
--- a/docs/docs.user.md
+++ b/docs/docs.user.md
@@ -1,6 +1,23 @@
 ---
 {
-	"_label": "User Guide"
+	"_label": "User Guide",
+	"_toc": [
+		"docs.user.intro",
+		"docs.user.implement",
+		"docs.user.setup",
+		"docs.user.selling",
+		"docs.user.buying",
+		"docs.user.stock",
+		"docs.user.accounting",
+		"docs.user.hr",
+		"docs.user.mfg",
+		"docs.user.support",
+		"docs.user.projects",
+		"docs.user.website",
+		"docs.user.tools",
+		"docs.user.customize"
+	],
+	"_no_toc": 1
 }
 ---
 This manual covers all the major processes in setting up and using ERPNext. The manual is written in a way that the user can manage a self-implementation of the ERP. We recommend that the manual be read first before starting implementation.
@@ -10,13 +27,10 @@
 1. [Introduction](docs.user.intro.html)
 	1. [Open Source](docs.user.intro.open_source.html)
 	1. [Ways to get started](docs.user.intro.try.html)
-	1. [Installation](docs.dev.install.html)
-		1. [Pre-requisites for Red Hat Systems](docs.dev.install.red_hat.html)
-		1. [Pre-requisites for Debain Systems](docs.dev.install.debian.html)
 	1. [Getting Help](docs.user.help.html)
-1. Implementation
-	1. [Before you Start](docs.user.setup.before.html)
-	1. [Implementation Strategy](docs.user.setup.strategy.html)
+1. [Implementation](docs.user.implement.html)
+	1. [Implementation Strategy](docs.user.implement.strategy.html)
+	1. [Concepts](docs.user.implement.concepts.html)
 1. [Setup](docs.user.setup.html)
 	1. [First Login](docs.user.setup.first.html)
 	1. [Chart of Accounts](docs.user.setup.accounting.html)
@@ -70,7 +84,7 @@
 	1. [Material Issue](docs.user.stock.material_issue.html)
 	1. [Sales Return](docs.user.stock.sales_return.html)
 	1. [Purchase Return](docs.user.stock.sales_return.html)
-1. [Accounting](docs,user.accounting.html)
+1. [Accounting](docs.user.accounting.html)
 	1. [Chart of Accounts](docs.user.setup.accounting.html)
 	1. [Chart of Cost Centers](docs.user.setup.cost_centers.html)
 	1. [Sales Invoice](docs.user.accounts.sales_invoice.html)
@@ -93,7 +107,7 @@
 	1. [Bill of Materials](docs.user.mfg.bom.html)
 	1. [Production Planning](docs.user.mfg.planning.html)
 	1. [Production Order](docs.user.mfg.production_order.html)
-1. [Customer Support and Maintenance](docs.user.mfg.html)
+1. [Customer Support and Maintenance](docs.user.support.html)
 	1. [Support Ticket](docs.user.support.support_ticket.html)
 	1. [Customer Issue](docs.user.support.customer_issue.html)
 	1. [Maintenance Schedule](docs.user.support.maintenance_schedule.html)
diff --git a/docs/docs.user.setup.accounting.md b/docs/docs.user.setup.accounting.md
index b40b221..819befc 100644
--- a/docs/docs.user.setup.accounting.md
+++ b/docs/docs.user.setup.accounting.md
@@ -1,13 +1,11 @@
 ---
 {
-	"_label": "Accounting Setup",
+	"_label": "Chart of Accounts",
 	"_links": [
 		"docs.user.accounts"
 	]
 }
 ---
-## Chart of Accounts
-
 The Chart of Accounts forms the blueprint of your organization. The overall structure of your Chart of Accounts is based on a system of double entry accounting that has become a standard all over the world to quantify how a company is doing financially. 
 
 The Chart of Accounts helps you answer:
diff --git a/docs/docs.user.setup.before.md b/docs/docs.user.setup.before.md
deleted file mode 100644
index d16ba0d..0000000
--- a/docs/docs.user.setup.before.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-{
-	"_label": "Before We Start",
-	"_title_image": "img/before-we-start.png"
-}
----
-We have seem dozens of ERP implementations over the past few years and we realize that successful implementations are a lot about intangibles and attitude. 
-
-> The Benefits come Later
-
-ERPs are not required.
-
-Like exercise. 
-
-Human body does not require to be exercised today or maybe tomorrow, but in the long run, if you wish to maintain your body and its health, you should get on the treadmill.
-
-In the same way, ERPs improve the health of your organization over a long run by keep it fit and efficient. The more you delay putting things in order, the more time you lose and the closer you get to a major disaster.
-
-So when you start implementing an ERP, keep your sight on the long term benefits. Like exercise, its painful in the short run, but will do wonders if you stay on course.
-
----
-
-## The Champion
-
-ERP means organization wide change and it does not happen without effort. Every change requires a champion and its the duty of the champion to organize and energize the entire team towards implementation. The champion is all the fall guy (or fall gal) incase something goes wrong and hence needs to be resilient. Who becomes a champion without putting effort anyways?
-
-In many organizations we have seen, the champion is most often the owner or a senior manager. Occasionally, the champion is an outsider who is hired for the purpose.
-
-In either case, you must identify your champion first.
-
-Most likely its **you!** 
-
-Lets Begin!
diff --git a/docs/docs.user.setup.cost_centers.md b/docs/docs.user.setup.cost_centers.md
index 14498ed..c3d603d 100644
--- a/docs/docs.user.setup.cost_centers.md
+++ b/docs/docs.user.setup.cost_centers.md
@@ -6,7 +6,6 @@
 	]
 }
 ---
-## Chart of Cost Centers
 
 Your Chart of Accounts is mainly for reporting your information for governmental purposes and less for how you business actually performs. Though you can tweak it a bit to resemble your business.
 ￼
@@ -23,6 +22,8 @@
 
 So when you do your analysis you can get a better idea which side of your business is doing better.  Since ERPNext has option to add multiple Companies, you can create Cost Centers for each Company and manage it separately.
 
+### Chart of Cost Centers
+
 To setup your Chart of Cost Centers go to:
 
 > Accounts > Chart of Cost Centers
diff --git a/docs/docs.user.setup.md b/docs/docs.user.setup.md
index eda32c2..831afb7 100644
--- a/docs/docs.user.setup.md
+++ b/docs/docs.user.setup.md
@@ -1,10 +1,30 @@
 ---
 {
-	"_label": "Setting Up"
+	"_label": "Setting Up",
+	"_toc": [
+		"docs.user.setup.first",
+		"docs.user.setup.accounting",
+		"docs.user.setup.cost_centers",
+		"docs.user.setup.company",
+		"docs.user.setup.users",
+		"docs.user.setup.permissions",
+		"docs.user.setup.workflows",
+		"docs.user.setup.letter_head",
+		"docs.user.setup.print_headings",
+		"docs.user.setup.series",
+		"docs.user.setup.global_defaults",
+		"docs.user.setup.data_import",
+		"docs.user.setup.email",
+		"docs.user.setup.sms",
+		"docs.user.setup.taxes",
+		"docs.user.setup.price_lists",
+		"docs.user.setup.opening"
+	]
 }
 ---
 Setting up an ERP system is like starting your business all over again, but in the virtual
 world. Thankfully its not as hard as the real thing and you get to do a trial too.
 
-The important thing to note is that if you really want to take benefit out of this project, then you must take a step back and make sometime to do this right. This is usually not couple-of-hours after work kind of a project.
+Implementation requires the implementer to a step back and set aside some time to do this right. This is usually not couple-of-hours after work kind of a project.
 
+Let us start with the screen you see the first time you login.
diff --git a/docs/docs.user.setup.strategy.md b/docs/docs.user.setup.strategy.md
deleted file mode 100644
index 6675536..0000000
--- a/docs/docs.user.setup.strategy.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-{
-	"_label": "Implementation Strategy"
-}
----
-Before you start managing your Operations in EPRNext, you must first become familiar with the system and the terms used. For this we recommend implementation should happen in two phases.
-
-- A Test Phase, where you enter dummy records representing your day to day transactions and a - Live Phase, where we start entering live data.
-
-### Test Phase
-
-- Read the Manual
-- Create your first Customer, Supplier and Item. Add a few more so you get familiar.
-- Create Customer Groups, Item Groups, Warehouses, Supplier Groups so that you can classify your Items.
-- Complete a standard sales cycle - Lead > Opportunity > Quotation > Sales Order > Delivery Note > Sales Invoice > Payment (Journal Voucher)
-- Complete a standard purchase cycle - Purchase Request > Purchase Order > Purchase Receipt > Payment (Journal Voucher).
-- Complete a manufacturing cycle (if applicable) - BOM > Production Planning Tool > Production Order > Stock Entry (issue) > Stock Entry (back-flush)
-
-> Tip: Use the 30-day free trial at [erpnext.com](https://erpnext.com) to do your test drive.
-
-### Live Phase
-
-Once you have made yourself familiar with ERPNext, start entering your live data!
-
-- Clean up the account of test data or better, start a fresh install.
-- Setup all the modules with Customer Groups, Item Groups, Warehouses, BOMs etc.
-- Import Customers, Suppliers, Items, Contacts and Addresses using Data Import Tool.
-- Import opening stock using Stock Reconciliation Tool.
-- Create opening accounting entries via Journal Voucher and create outstanding Sales Invoices and Purchase Invoices.
-