diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index 73099d1f37..58e9f974e6 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -15,7 +15,6 @@ $(document).bind('toolbar_setup', function() {
 	.addClass("navbar-icon-home")
 	.css({
 		"max-width": "200px",
-		"overflow": "hidden",
 		"text-overflow": "ellipsis",
 		"white-space": "nowrap"
 	});
diff --git a/erpnext/utilities/doctype/address/address.txt b/erpnext/utilities/doctype/address/address.txt
index 669da2b1c0..aa9230dcb6 100644
--- a/erpnext/utilities/doctype/address/address.txt
+++ b/erpnext/utilities/doctype/address/address.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:54", 
+  "modified": "2014-01-27 11:19:06", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -26,7 +26,9 @@
   "permlevel": 0
  }, 
  {
+  "cancel": 0, 
   "create": 1, 
+  "delete": 0, 
   "doctype": "DocPerm", 
   "email": 1, 
   "name": "__common__", 
@@ -56,6 +58,7 @@
   "doctype": "DocField", 
   "fieldname": "address_title", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Address Title", 
   "reqd": 0
  }, 
@@ -95,6 +98,7 @@
   "fieldname": "state", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "State", 
   "options": "Suggest", 
   "search_index": 0
@@ -104,6 +108,7 @@
   "fieldname": "pincode", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Pincode", 
   "search_index": 1
  }, 
@@ -170,7 +175,6 @@
   "options": "icon-pushpin"
  }, 
  {
-  "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
   "doctype": "DocField", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
@@ -178,17 +182,15 @@
   "options": "Customer"
  }, 
  {
-  "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
   "doctype": "DocField", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
-  "in_list_view": 1, 
+  "in_list_view": 0, 
   "label": "Customer Name", 
   "read_only": 1
  }, 
  {
-  "depends_on": "eval:!doc.customer && !doc.sales_partner && !doc.lead", 
   "doctype": "DocField", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
@@ -196,18 +198,16 @@
   "options": "Supplier"
  }, 
  {
-  "depends_on": "eval:!doc.customer && !doc.sales_partner && !doc.lead", 
   "doctype": "DocField", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
-  "in_list_view": 1, 
+  "in_list_view": 0, 
   "label": "Supplier Name", 
   "read_only": 1, 
   "search_index": 0
  }, 
  {
-  "depends_on": "eval:!doc.customer && !doc.supplier && !doc.lead", 
   "doctype": "DocField", 
   "fieldname": "sales_partner", 
   "fieldtype": "Link",