diff --git a/_projectCommon.php b/_projectCommon.php
index 4eb1337..c24a857 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -12,9 +12,9 @@
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
 	# these are optional
 	# Adding Portal-based "About" information, to be "Standard left menu"-compliant (see http://www.eclipse.org/projects/dev_process/project-status-infrastructure/left-menu.php) :
-	$Nav->addCustomNav( "Project Information", "/projects/project_summary.php?projectid=technology.jwt", "", 1  );
+	$Nav->addCustomNav( "About This Project", "/projects/project_summary.php?projectid=technology.jwt", "", 1  );
 	# Adding JWT specific menus :
-	$Nav->addNavSeparator("		Getting started", 	"/jwt/index.php");
+	$Nav->addNavSeparator("		JWT Home", 	"/jwt/index.php");
 	$Nav->addCustomNav("		About JWT", 		"/jwt/pages/about.php", "_self", 2);
 	$Nav->addCustomNav("		FAQ", 				"http://wiki.eclipse.org/JWT_FAQ", "_self", 2);
 	$Nav->addCustomNav("		Wiki", 				"http://wiki.eclipse.org/index.php/Java_Workflow_Tooling_Project", "_self", 2);
@@ -27,7 +27,7 @@
 	$Nav->addNavSeparator("		Downloads",			"/jwt/download.php");
 	$Nav->addCustomNav("		All Downloads", 	"http://wiki.eclipse.org/JWT_Downloads", "_self", 2);
 	$Nav->addCustomNav("		Source Code", 		"http://wiki.eclipse.org/JWT_CVS", "_self", 2);
-	$Nav->addNavSeparator("		Development", 		"/jwt/index.php");
+	$Nav->addNavSeparator("		Development", 		"http://wiki.eclipse.org/index.php/JWT_DeveloperFAQ");
 	$Nav->addCustomNav("		Team", 	"/jwt/pages/team.php", "_self", 2);
 	$Nav->addCustomNav("		Newsgroup", 		"http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.jwt", "_self", 2);
 	$Nav->addCustomNav("		Mailing list", 		"https://dev.eclipse.org/mailman/listinfo/jwt-dev", "_self", 2);
diff --git a/download.php b/download.php
index d2e287f..4335b07 100755
--- a/download.php
+++ b/download.php
@@ -77,7 +77,7 @@
 			<ul>
 				<li><a href="http://wiki.eclipse.org/JWT_Downloads#Other_products_based_on_JWT">All Integrators</a></li> 
 				<li><a href="http://wiki.eclipse.org/JWT_Downloads#All_Update_Sites">All Update Sites</a></li> 
-				<li><a href="http://wiki.eclipse.org/JWT_Downloads#Overview">All Releases</a></li> 
+				<li><a href="http://wiki.eclipse.org/JWT_Downloads#Releases">All Releases</a></li> 
 				<li><a href="http://wiki.eclipse.org/JWT_Downloads">All Downloads</a></li> 
 			</ul>
 		</div -->
@@ -149,7 +149,7 @@
 			<ul>
 				<li><a href="http://wiki.eclipse.org/JWT_Downloads#Other_products_based_on_JWT">All Integrators</a></li> 
 				<li><a href="http://wiki.eclipse.org/JWT_Downloads#All_Update_Sites">All Update sites</a></li> 
-				<li><a href="http://wiki.eclipse.org/JWT_Downloads#Overview">All Releases</a></li> 
+				<li><a href="http://wiki.eclipse.org/JWT_Downloads#Releases">All Releases</a></li> 
 				<li><a href="http://wiki.eclipse.org/JWT_Downloads">All Downloads</a></li> 
 			</ul>
  		</div>
diff --git a/index.php b/index.php
index 1596bfa..301aa27 100644
--- a/index.php
+++ b/index.php
@@ -119,7 +119,7 @@
 			<ul>
 				<li><a href="https://dev.eclipse.org/mailman/listinfo/jwt-dev">Mailing List</a> (<a href="http://dev.eclipse.org/mhonarc/lists/jwt-dev/maillist.html">Archive</a>) and <a href="news://news.eclipse.org/eclipse.technology.jwt">Newsgroup</a> ( <a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.jwt">browse</a> )</li>
 				<li><a href="http://wiki.eclipse.org/JWT_CVS">Get the Source Code</a> ( <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jwt/?root=Technology_Project">browse</a> )</li> 
-				<li><a href="http://wiki.eclipse.org/JWT_Upcoming_Release">Upcoming Release Information</a></li> 
+				<li><a href="http://wiki.eclipse.org/JWT_Downloads#Overview">Roadmap</a></li> 
 				<li><a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=JWT&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Reuse+same+sort+as+last+time">Open Bugs and Requests</a> (<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JWT">Ask for a Feature or Report Bug</a>)</li> 
 				<li><a href="http://wiki.eclipse.org/index.php/JWT_DeveloperFAQ">Developer FAQ</a></li>
 			</ul>