[docs]
diff --git a/docs/docs.user.md b/docs/docs.user.md
index 2294d31..00128f0 100644
--- a/docs/docs.user.md
+++ b/docs/docs.user.md
@@ -33,6 +33,7 @@
 	1. [Concepts](docs.user.implement.concepts.html)
 1. [Setup](docs.user.setup.html)
 	1. [First Login](docs.user.setup.first.html)
+	1. [Setting Up Masters (Item, Customer, Supplier)](docs.user.setup.masters.html)
 	1. [Chart of Accounts](docs.user.setup.accounting.html)
 	1. [Chart of Cost Centers](docs.user.setup.cost_centers.html)
 	1. [Company Setup](docs.user.setup.company.html)
diff --git a/docs/docs.user.setup.codification.md b/docs/docs.user.setup.codification.md
index 650e173..513f7a9 100644
--- a/docs/docs.user.setup.codification.md
+++ b/docs/docs.user.setup.codification.md
@@ -3,9 +3,6 @@
 	"_label": "Item Codification"
 }
 ---
-
-> To Codify or Not To Codify, is the question.
-
 If you already have a running business with a number of physical items, you would have probably coded your items. If you have not, you have a choice. We recommend you should codify, but its your call.
 
 Item codification is always a sensitive topic and wars have been fought on this (not joking). In our experience, when you have items that cross a certain size, life without codification is a nightmare. 
diff --git a/docs/docs.user.setup.md b/docs/docs.user.setup.md
index afdd1d3..847a215 100644
--- a/docs/docs.user.setup.md
+++ b/docs/docs.user.setup.md
@@ -3,6 +3,7 @@
 	"_label": "Setting Up",
 	"_toc": [
 		"docs.user.setup.first",
+		"docs.user.setup.masters",
 		"docs.user.setup.accounting",
 		"docs.user.setup.cost_centers",
 		"docs.user.setup.company",
diff --git a/docs/docs.user.stock.item.md b/docs/docs.user.stock.item.md
index 0f4b106..958c454 100644
--- a/docs/docs.user.stock.item.md
+++ b/docs/docs.user.stock.item.md
@@ -1,21 +1,14 @@
 ---
 {
 	"_label": "Item Master",
-	"_title_image": "img/items.png"
+	"_toc": [
+		"docs.user.stock.valuation",
+		"docs.user.setup.codification"
+	]
 }
 ---
-Items, Customers and Suppliers form the foundation of any ERP system.
-
-It is very likely that you will have your masters ready in another system or a spread sheet  saved somewhere else. You may just need to import them. Before importing, it might be a good idea to understand how ERPNext manages these records.
-
----
-
-## Items
-
 An Item is simply a product or service which you sell or buy from your Customers or Suppliers. ERPNext is optimized for itemized management of your sales and purchase. However, you can skip creating Items. If you are in services, you can create an Item for each services that your offer.
 
-> Items are mandatory if you want to track inventory.
-
 There are two main categories of Items in ERPNext
 
 - Stock Items
@@ -24,10 +17,6 @@
 As you may have guessed, inventory balances are tracked for stock items and not for
 non-stock items. Non-stock items could be services or consumables that are not tracked.
 
-### Naming Items
-
-This is a complex topic [coming up next]. In ERPNext you can use item codes or names. If you do not want to codify, you can keep the item name and item code as the same.
-
 ### Item Groups
 
 ERPNext allows you to classify items into groups. This will help you in getting reports about various classes of items and also help in cataloging your items for the website.
@@ -60,31 +49,6 @@

 Why would you want Price Lists? You have different prices for different zones (based on the shipping costs), for different currencies, regions etc.
 
-### Item Valuation
-
-How are Items Valued?
-
-One of the major features of any inventory system is that you can find out the value of any item based on its historic or average price. You can also find the value of all your items for your balance sheet. Why is valuation important?
-
-- The buying price fluctuates.
-- The value changes because of some process (value add).
-- The value changes because of decay, loss etc.
-
-You may encounter these terms, so lets clarify:
-
-- Rate: Rate at which the transaction takes place.
-- Valuation Rate: Rate at which the items value is set for your valuation.
-
-There are two major ways in which ERPNext values your items.
-
-- **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first that you bought first. For example, if you buy an Item at price X and then after a few days at price Y. Thus when you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
-
-
-
-- **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
-
-> New Value X2 = (X * Y + X1 * Y1) / (Y + Y1)
-
 #### Negative Stock
 
 FIFO is the more accurate system of the two but has a disadvantage. You cannot have negative stock in FIFO. This means that you cannot make forward transactions that would make your stock negative. Why is this? Because sequences are so important to FIFO, you cannot track the value of the stock if it does not exist!