diff --git a/_projectCommon.php b/_projectCommon.php
index 20fbb7d..3801c3a 100755
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -26,7 +26,7 @@
 	
 	# Break the navigation into sections
 	$Nav->addNavSeparator("Libra", 	"/libra");
-	$Nav->addCustomNav("Download", "/libra/download.php", "_self", 3);
+	$Nav->addCustomNav("Download", "/libra/download", "_self", 3);
 	$Nav->addCustomNav("Documentation", "/libra/documentation", "_blank", 3);
 	$Nav->addCustomNav("Support", "/libra/support", "_blank", 3);
 	$Nav->addCustomNav("Getting Involved", "/libra/developers", "_blank", 3);
diff --git a/developers/index.php b/developers/index.php
index 84b1487..709d569 100644
--- a/developers/index.php
+++ b/developers/index.php
@@ -1,20 +1,10 @@
-<?php
-
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
-	
-	$App 	= new App();
-	$Nav	= new Nav();
-	$Menu 	= new Menu();
-	include($App->getProjectCommon());
-
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
 	$pageTitle 		= "Libra - Developers";
 
 	$html  = '<div id="midcolumn">';
 	$html .= file_get_contents('_index.html');
 	$html .= "</div>";
-
+	
 	# Generate the web page
-	$App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
\ No newline at end of file
diff --git a/documentation/_index.html b/documentation/_index.html
index 6d60432..ba5a458 100644
--- a/documentation/_index.html
+++ b/documentation/_index.html
@@ -1,3 +1,5 @@
+<h3>Documentation</h3>
+
 <ul>
 <li><b><a href="http://wiki.eclipse.org/Libra/FAQ#Installation_and_Use">Installation and Use</a></b></li>
 <li><b><a href="http://wiki.eclipse.org/Libra/Getting_Started#Obtaining_Sources">Obtaining Sources</a></b></li>
diff --git a/download.php b/download.php
index 7520c08..11e8962 100644
--- a/download.php
+++ b/download.php
@@ -1,33 +1,3 @@
 <?php
-/*******************************************************************************
- * Copyright (c) 2009 Eclipse Foundation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
-
- *******************************************************************************/
-
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
-	$App = new App();
-	$Nav = new Nav();
-	$Menu = new Menu();
-	include($App->getProjectCommon());
-	$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/style.css"/>');
-	
-	$localVersion = false;
-	
-	# Define these here, or in _projectCommon.php for site-wide values
-	$pageTitle = "Libra Download";
-	
-	// 	# Paste your HTML content between the EOHTML markers!
-	$html = file_get_contents('pages/download.html');
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
-
+	header('http://eclipse.org/libra/download');
 ?>
\ No newline at end of file
diff --git a/pages/download.html b/download/_index.html
similarity index 98%
rename from pages/download.html
rename to download/_index.html
index 771741d..e645c4f 100644
--- a/pages/download.html
+++ b/download/_index.html
@@ -1,5 +1,5 @@
 <div id="midcolumn">
-<h1>Downloads</h1>
+<h3>Downloads</h3>
 
 <p>All downloads are provided under the terms and conditions of the
 <a href="/legal/epl/notice.php">Eclipse Foundation Software User
diff --git a/download/index.php b/download/index.php
new file mode 100644
index 0000000..40a14fd
--- /dev/null
+++ b/download/index.php
@@ -0,0 +1,10 @@
+<?php  																														require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	$App 	= new App();	$Nav	= new Nav();	$Menu 	= new Menu();		include($App->getProjectCommon());    # All on the same line to unclutter the user's desktop'
+	$pageTitle 		= "Libra - Documentation";
+
+	$html  = '<div id="midcolumn">';
+	$html .= file_get_contents('_index.html');
+	$html .= "</div>";
+	
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
\ No newline at end of file
diff --git a/support/index.php b/support/index.php
index 0c3339a..7703848 100644
--- a/support/index.php
+++ b/support/index.php
@@ -6,5 +6,5 @@
 	$html .= "</div>";
 	
 	# Generate the web page
-	$App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
 ?>
\ No newline at end of file