diff --git a/_projectCommon.php b/_projectCommon.php
index ec015ed..c86a7a2 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -10,23 +10,6 @@
 	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
 	# these are optional
 
-	$Nav->setLinkList(array());
-	$Nav->addNavSeparator("About this project", "https://projects.eclipse.org/projects/modeling.acceleo", "", 1  );
-	$Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/Acceleo", 	"_self", 2);
-	$Nav->addCustomNav("Newsgroup", "http://www.eclipse.org/forums/index.php?t=thread&frm_id=24&", "_self", 2);
-	$Nav->addCustomNav("Project Plan", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/documentation", "_self", 2);
-	$Nav->addCustomNav("Bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=VERIFIED&list_id=9161179&product=Acceleo&query_format=advanced", 	"_self", 2);
-	$Nav->addCustomNav("File a Bug", "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Acceleo", 	"_self", 2);
-
-	$Nav->addNavSeparator("Developers", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/developer", "", 1  );
-	$Nav->addCustomNav("Git", "http://git.eclipse.org/c/acceleo/org.eclipse.acceleo.git/", "_self", 2);
-	$Nav->addCustomNav("Gerrit", "https://git.eclipse.org/r/#/admin/projects/acceleo/org.eclipse.acceleo", "_self", 2);
-	$Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/m2t-dev", "_self", 2);
-
-	$Nav->addNavSeparator("Related Projects", "https://www.eclipse.org/modeling", "", 1  );
-	$Nav->addCustomNav("EMF", "https://www.eclipse.org/modeling/emf", "_self", 2);
-	$Nav->addCustomNav("Sirius", "https://www.eclipse.org/sirius", "_self", 2);
-
 	$Menu->setMenuItemList(array());
 	$Menu->addMenuItem("Home", "/acceleo", "_self");
 	$Menu->addMenuItem("Download", "/acceleo/downloads", "_self");
diff --git a/index.php b/index.php
index 74df610..b7d8255 100644
--- a/index.php
+++ b/index.php
@@ -13,6 +13,23 @@
 	$pageAuthor		= "Obeo";
 	$pageTitle 		= "Acceleo";
 
+	$Nav->setLinkList(array());
+	$Nav->addNavSeparator("About this project", "https://projects.eclipse.org/projects/modeling.acceleo", "", 1  );
+	$Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/Acceleo", 	"_self", 2);
+	$Nav->addCustomNav("Newsgroup", "http://www.eclipse.org/forums/index.php?t=thread&frm_id=24&", "_self", 2);
+	$Nav->addCustomNav("Project Plan", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/documentation", "_self", 2);
+	$Nav->addCustomNav("Bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=VERIFIED&list_id=9161179&product=Acceleo&query_format=advanced", 	"_self", 2);
+	$Nav->addCustomNav("File a Bug", "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Acceleo", 	"_self", 2);
+
+	$Nav->addNavSeparator("Developers", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/developer", "", 1  );
+	$Nav->addCustomNav("Git", "http://git.eclipse.org/c/acceleo/org.eclipse.acceleo.git/", "_self", 2);
+	$Nav->addCustomNav("Gerrit", "https://git.eclipse.org/r/#/admin/projects/acceleo/org.eclipse.acceleo", "_self", 2);
+	$Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/m2t-dev", "_self", 2);
+
+	$Nav->addNavSeparator("Related Projects", "https://www.eclipse.org/modeling", "", 1  );
+	$Nav->addCustomNav("EMF", "https://www.eclipse.org/modeling/emf", "_self", 2);
+	$Nav->addCustomNav("Sirius", "https://www.eclipse.org/sirius", "_self", 2);	
+
 	$html = file_get_contents('_index.html');
 	
 	# Generate the web page