diff --git a/_projectCommon.php b/_projectCommon.php
index 89509cec62796642d4046ee1d8674a0e687fe619..e9555836c3af69fd80d42edcd8b84763ce4385bb 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -19,10 +19,10 @@ $Nav->addCustomNav("Subprojects", "", "_self", 1);
 $Nav->addCustomNav("ATF", 	"/webtools/atf/main.php", 		"_self", 2);
 $Nav->addCustomNav("Common", 	"/webtools/common/", 		"_self", 2);
 $Nav->addCustomNav("Dali", 	"/webtools/dali/main.php", 		"_self", 2);
-$Nav->addCustomNav("EJB", 	"/webtools/ejb/", 		"_self", 2);
-$Nav->addCustomNav("Java EE", 	"/webtools/jee/", 		"_self", 2);
+$Nav->addCustomNav("EJB Tools", 	"/webtools/ejb/", 		"_self", 2);
+$Nav->addCustomNav("Java EE Tools", 	"/webtools/jee/", 		"_self", 2);
 $Nav->addCustomNav("JSF", 	"/webtools/jsf/main.php", 		"_self", 2);
-$Nav->addCustomNav("Server", 	"/webtools/server/", 		"_self", 2);
+$Nav->addCustomNav("Server Tools", 	"/webtools/server/", 		"_self", 2);
 $Nav->addCustomNav("Source Editing", 	"/webtools/sse/", 		"_self", 2);
 $Nav->addCustomNav("Web Services", 	"/webtools/ws/", 		"_self", 2);
 $Nav->addCustomNav("WTP Incubator", "/webtools/incubator/", 		"_self", 2);
diff --git a/community/_projectCommon.php b/community/_projectCommon.php
index 278380aeb3d8f497216361da9d366809fe53486d..a374bbcb1526048e183b2cc0244d461d7d01d61a 100644
--- a/community/_projectCommon.php
+++ b/community/_projectCommon.php
@@ -11,18 +11,7 @@
 	# Define your project-wide Nav bars here.
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
 	# these are optional
-	$Nav->addCustomNav("WTP Home", 	"/webtools/", "_self", 1);
-	$Nav->addCustomNav("Subprojects", "", "_self", 1);
-	$Nav->addCustomNav("ATF", 	"/webtools/atf/main.php", 		"_self", 2);
-	$Nav->addCustomNav("Common", 	"/webtools/common/", 		"_self", 2);
-	$Nav->addCustomNav("Dali", 	"/webtools/dali/main.php", 		"_self", 2);
-	$Nav->addCustomNav("EJB", 	"/webtools/ejb/", 		"_self", 2);
-	$Nav->addCustomNav("Java EE", 	"/webtools/jee/", 		"_self", 2);
-	$Nav->addCustomNav("JSF", 	"/webtools/jsf/main.php", 		"_self", 2);
-	$Nav->addCustomNav("Server", 	"/webtools/server/", 		"_self", 2);
-	$Nav->addCustomNav("Source Editors", 	"/webtools/sse/", 		"_self", 2);
-	$Nav->addCustomNav("Web Services", 	"/webtools/ws/", 		"_self", 2);
-	$Nav->addCustomNav("WTP Incubator", "/webtools/incubator/", 		"_self", 2);
+	$Nav->addCustomNav("WTP Home ...", 	"/webtools/", "_self", 1);
 	$Nav->addCustomNav("Documentation ...", 		"/webtools/documentation/", 	"_self", 1);
 	$Nav->addCustomNav("Downloads", 		"http://download.eclipse.org/webtools/downloads/", 	"_self", 1);
 	$Nav->addNavSeparator("Community", 	"/webtools/community/communityresources.php");
diff --git a/development/_projectCommon.php b/development/_projectCommon.php
index c736b4bb92fe7cd1d4c73df3294cc5ead140f416..a72dd65511f55dbdee94cbe01146f5cbde34c05a 100644
--- a/development/_projectCommon.php
+++ b/development/_projectCommon.php
@@ -11,18 +11,7 @@ $App->AddExtraHtmlHeader("<link rel=\"stylesheet\" type=\"text/css\" href=\"/web
 # Define your project-wide Nav bars here.
 # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
 # these are optional
-$Nav->addCustomNav("WTP Home", 	"/webtools/", "_self", 1);
-$Nav->addCustomNav("Subprojects", "", "_self", 1);
-$Nav->addCustomNav("ATF", 	"/webtools/atf/main.php", 		"_self", 2);
-$Nav->addCustomNav("Common", 	"/webtools/common/", 		"_self", 2);
-$Nav->addCustomNav("Dali", 	"/webtools/dali/main.php", 		"_self", 2);
-$Nav->addCustomNav("EJB", 	"/webtools/ejb/", 		"_self", 2);
-$Nav->addCustomNav("Java EE", 	"/webtools/jee/", 		"_self", 2);
-$Nav->addCustomNav("JSF", 	"/webtools/jsf/main.php", 		"_self", 2);
-$Nav->addCustomNav("Server", 	"/webtools/server/", 		"_self", 2);
-$Nav->addCustomNav("Source Editors", 	"/webtools/sse/", 		"_self", 2);
-$Nav->addCustomNav("Web Services", 	"/webtools/ws/", 		"_self", 2);
-$Nav->addCustomNav("WTP Incubator", "/webtools/incubator/", 		"_self", 2);
+$Nav->addCustomNav("WTP Home ...", 	"/webtools/", "_self", 1);
 $Nav->addCustomNav("Documentation ...", 		"/webtools/documentation/", 	"_self", 1);
 $Nav->addCustomNav("Downloads", 		"http://download.eclipse.org/webtools/downloads/", 	"_self", 1);
 $Nav->addCustomNav("Community ...", 	"/webtools/community/communityresources.php", 		"_self", 1);
diff --git a/documentation/_projectCommon.php b/documentation/_projectCommon.php
index 2691a589d1e50de136ff29650223532a05322eb8..fd6e6231121c8f0b0eb834236a415892770a5c48 100644
--- a/documentation/_projectCommon.php
+++ b/documentation/_projectCommon.php
@@ -11,18 +11,7 @@
 	# Define your project-wide Nav bars here.
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
 	# these are optional
-	$Nav->addCustomNav("WTP Home", 	"/webtools/", "_self", 1);
-	$Nav->addCustomNav("Subprojects", "", "_self", 1);
-	$Nav->addCustomNav("ATF", 	"/webtools/atf/main.php", 		"_self", 2);
-	$Nav->addCustomNav("Common", 	"/webtools/common/", 		"_self", 2);
-	$Nav->addCustomNav("Dali", 	"/webtools/dali/main.php", 		"_self", 2);
-	$Nav->addCustomNav("EJB", 	"/webtools/ejb/", 		"_self", 2);
-	$Nav->addCustomNav("Java EE", 	"/webtools/jee/", 		"_self", 2);
-	$Nav->addCustomNav("JSF", 	"/webtools/jsf/main.php", 		"_self", 2);
-	$Nav->addCustomNav("Server", 	"/webtools/server/", 		"_self", 2);
-	$Nav->addCustomNav("Source Editors", 	"/webtools/sse/", 		"_self", 2);
-	$Nav->addCustomNav("Web Services", 	"/webtools/ws/", 		"_self", 2);
-	$Nav->addCustomNav("WTP Incubator", "/webtools/incubator/", 		"_self", 2);
+	$Nav->addCustomNav("WTP Home ...", 	"/webtools/", "_self", 1);
 	$Nav->addNavSeparator("Documentation", 		"/webtools/documentation/");
 	$Nav->addCustomNav("User Documentation", 		"http://help.eclipse.org/help31/topic/org.eclipse.wst.doc.user/topics/overview.html", 	"_self", 2);
 	$Nav->addCustomNav("WST ISV Documentation", 		"http://help.eclipse.org/help31/topic/org.eclipse.wst.doc.isv/html/plugin_descriptions_WST/wst.html", 	"_self", 2);
diff --git a/people/_projectCommon.php b/people/_projectCommon.php
index c736b4bb92fe7cd1d4c73df3294cc5ead140f416..a72dd65511f55dbdee94cbe01146f5cbde34c05a 100644
--- a/people/_projectCommon.php
+++ b/people/_projectCommon.php
@@ -11,18 +11,7 @@ $App->AddExtraHtmlHeader("<link rel=\"stylesheet\" type=\"text/css\" href=\"/web
 # Define your project-wide Nav bars here.
 # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
 # these are optional
-$Nav->addCustomNav("WTP Home", 	"/webtools/", "_self", 1);
-$Nav->addCustomNav("Subprojects", "", "_self", 1);
-$Nav->addCustomNav("ATF", 	"/webtools/atf/main.php", 		"_self", 2);
-$Nav->addCustomNav("Common", 	"/webtools/common/", 		"_self", 2);
-$Nav->addCustomNav("Dali", 	"/webtools/dali/main.php", 		"_self", 2);
-$Nav->addCustomNav("EJB", 	"/webtools/ejb/", 		"_self", 2);
-$Nav->addCustomNav("Java EE", 	"/webtools/jee/", 		"_self", 2);
-$Nav->addCustomNav("JSF", 	"/webtools/jsf/main.php", 		"_self", 2);
-$Nav->addCustomNav("Server", 	"/webtools/server/", 		"_self", 2);
-$Nav->addCustomNav("Source Editors", 	"/webtools/sse/", 		"_self", 2);
-$Nav->addCustomNav("Web Services", 	"/webtools/ws/", 		"_self", 2);
-$Nav->addCustomNav("WTP Incubator", "/webtools/incubator/", 		"_self", 2);
+$Nav->addCustomNav("WTP Home ...", 	"/webtools/", "_self", 1);
 $Nav->addCustomNav("Documentation ...", 		"/webtools/documentation/", 	"_self", 1);
 $Nav->addCustomNav("Downloads", 		"http://download.eclipse.org/webtools/downloads/", 	"_self", 1);
 $Nav->addCustomNav("Community ...", 	"/webtools/community/communityresources.php", 		"_self", 1);