diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index 8e41377bb10..4925837c59d 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -73,7 +73,7 @@ div.web-footer {
 .navbar-inverse .nav > li > a:hover,
 .navbar-inverse .brand:focus,
 .navbar-inverse .nav > li > a:focus {
-  color: #{{ doc.top_bar_foreground or "fff"}};
+  color: #{{ doc.top_bar_background or "aaa"}};
 }
 
 .navbar-inverse .brand {
@@ -136,7 +136,7 @@ div.web-footer {
 	border-bottom-color: #{{ doc.top_bar_background or "000"}};
 }
 
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle {
   color: #{{ doc.top_bar_background or "000"}};
   background-color: #{{ doc.top_bar_foreground or "fff"}};
 }
@@ -147,9 +147,26 @@ div.web-footer {
     background-color: #{{ doc.top_bar_background or "000"}};
     color: #{{ doc.top_bar_foreground or "fff"}};
   }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:hover, 
   .navbar-inverse .nav-collapse .dropdown-menu a:hover {
     background-color: #{{ doc.top_bar_foreground or "fff"}};
     color: #{{ doc.top_bar_background or "000"}};
   }
+
+  .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+    border-top-color: #{{ doc.top_bar_foreground or "fff" }};
+    border-bottom-color: #{{ doc.top_bar_foreground or "fff" }};	
+  }
+
+  .navbar-inverse .nav li.dropdown > .dropdown-toggle:hover .caret {
+    border-top-color: #{{ doc.top_bar_background or "000" }};
+    border-bottom-color: #{{ doc.top_bar_background or "000" }};
+  }
+
+  .navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+  .navbar-inverse .nav li.dropdown.open > .dropdown-toggle:hover .caret {
+    border-top-color: #{{ doc.top_bar_background or "000" }};
+    border-bottom-color: #{{ doc.top_bar_background or "000" }};	
+  }
+
 }
diff --git a/website/page/website_home/website_home.js b/website/page/website_home/website_home.js
index 40e29e87a4b..4a7addd7730 100644
--- a/website/page/website_home/website_home.js
+++ b/website/page/website_home/website_home.js
@@ -62,6 +62,7 @@ wn.module_page["Website"] = [
 	{
 		title: wn._("Special Page Settings"),
 		icon: "icon-wrench",
+		right: true,
 		items: [
 			{
 				"route":"Form/Product Settings",