diff --git a/README.md b/README.md
index f2b628e..ac03c50 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & Javascript.
 
-- [User Guide](https://erpnext.com/user-guide)
+- [User Guide](https://manual.erpnext.com)
 - [Getting Help](http://erpnext.org/getting-help.html)
 - [Discussion Forum](https://discuss.frappe.io/)
 
diff --git a/erpnext/patches/v5_0/update_projects.py b/erpnext/patches/v5_0/update_projects.py
index 29300e5..f49bc66 100644
--- a/erpnext/patches/v5_0/update_projects.py
+++ b/erpnext/patches/v5_0/update_projects.py
@@ -5,7 +5,8 @@
 	frappe.reload_doctype("Project")
 
 	for m in frappe.get_all("Project Milestone", "*"):
-		if m.milestone and m.milestone_date:
+		if (m.milestone and m.milestone_date
+			and frappe.db.exists("Project", m.parent)):
 			frappe.get_doc({
 				"doctype": "Task",
 				"subject": m.milestone,
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index b76cfae..19f68b5 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -9,7 +9,7 @@
 
 	$('.navbar-home').html('ERPNext');
 
-	$('[data-link="docs"]').attr("href", "https://erpnext.com/user-guide")
+	$('[data-link="docs"]').attr("href", "https://manual.erpnext.com")
 });
 
 // doctypes created via tree
diff --git a/erpnext/templates/includes/product_in_grid.html b/erpnext/templates/includes/product_in_grid.html
index 2a35fb8..854f77f 100644
--- a/erpnext/templates/includes/product_in_grid.html
+++ b/erpnext/templates/includes/product_in_grid.html
@@ -3,6 +3,6 @@
 <a class="product-link" href="{{ route or page_name }}">
 	<div class="col-sm-2 col-xs-4 product-image-wrapper">
 		{{ product_image_square(website_image) }}
-		<div class="text-ellipsis small product-text">{{ item_name }}</div>
+		<div class="text-ellipsis inline-block small product-text">{{ item_name }}</div>
 	</div>
 </a>