diff --git a/_projectCommon.php b/_projectCommon.php
index 480fccb..bdeb28a 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -33,7 +33,6 @@
 	// and now I add them explicitly, bug good Denis did not provide a way to Link object to the Nav
 	// so I cannot reuse his LinkList objects even if i want to :(
 	$Nav->addCustomNav("Download", "#download", "", 1);
-	$Nav->addCustomNav("Docs", "#docs", "", 1);
 	$Nav->addCustomNav("Extensions", "#extensions", "_self", 1);
 	$Nav->addCustomNav("Contributing", "#contributing", "", 1);
 	
@@ -42,11 +41,16 @@
 	$Nav->addNavSeparator("Project", 	""); 
 	$Nav->addCustomNav("News & Noteworthy", "https://wiki.eclipse.org/PDT/NewIn53", "_self", 2);
 	$Nav->addCustomNav("Project Details", "https://projects.eclipse.org/projects/tools.pdt/", "_self", 2);
+	$Nav->addCustomNav("Manual", "https://help.eclipse.org/topic/org.eclipse.php.help/html/table_of_contents.html", "_self", 2);
+	$Nav->addCustomNav("Wiki", "https://wiki.eclipse.org/PDT", "_self", 2);
 	$Nav->addCustomNav("PDT Forum", "https://www.eclipse.org/forums/index.php/f/85/", "_self", 2);
-	$Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/PDT", "_self", 2);
-	$Nav->addCustomNav("Github", "http://github.com/eclipse/pdt", "_self", 2);
+	
+	
 	$Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/pdt-dev", "_self", 2);
-	$Nav->addCustomNav("Open Bugs", "$bugurl/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=PDT&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=" . $collist, "_self", 2);
-	$Nav->addCustomNav("Submit A Bug", "$bugurl/bugs/enter_bug.cgi?product=" . $projectName, "_self", 2);
+	$Nav->addCustomNav("Open Bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=PDT&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=" . $collist, "_self", 2);
+	$Nav->addCustomNav("Submit A Bug", "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=PDT", "_self", 2);
+	
+	$Nav->addCustomNav("Marketplace", "https://marketplace.eclipse.org/content/php-development-tools", "_self", 2);
+	$Nav->addCustomNav("Github", "https://github.com/eclipse/pdt", "_self", 2);
 
 ?>
\ No newline at end of file
diff --git a/index-old.php b/index-old.php
index b45e5b8..73c958a 100644
--- a/index-old.php
+++ b/index-old.php
@@ -17,16 +17,6 @@
 
 	# End: page-specific settings
 	#
-	
-	# Enable polls on this page: Polls are good for 3 months!
-	# $App->usePolls();
-	# $Poll = new Poll(2, "Which view is the most ?");
-	# $Poll->addOption(1, "PHP Explorer (workspace view)");
-	# $Poll->addOption(2, "Outline");
-	# $Poll->addOption(3, "Project Explorer (current project view)");
-	# $Poll->addOption(4, "Functions view");
-	# $Poll->noGraph();  # uncomment to disable bar graph
-	# $pollHTML = $Poll->getHTML();
 		
 	# Paste your HTML content here!
 	ob_start();
@@ -104,7 +94,7 @@
 		<h3>Eclipse Package for PHP Developers</h3>
 
 		<p>The essential starting point for PHP developers, including a PHP language support, a Git client, XML Editor and Mylyn, Terminal.<br /></p>
-		<p>Click on the buttons below to start downloading package for specific OS. You have to install Java in your system.</p>
+		<p>Click on the links below to start downloading package for specific OS. You have to install Java in your system.</p>
 
 		<div class="large-4 columns">
 			<h3>OS X</h3>
@@ -127,6 +117,23 @@
 			</ul>
 		</div>
 
+		<h3>Update existing Eclipse</h3>
+		<p>
+			In Eclipse, click <i>Help -> Install New Software</i> and work with <a href="#compositeLatest" class="red">*</a>: <a href="http://download.eclipse.org/tools/pdt/updates/5.3">http://download.eclipse.org/tools/pdt/updates/5.3</a>
+		</p>
+		<div>
+			<a href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=1944539" class="drag" title="Drag to your running Eclipse workspace to install PHP Development Tools">	
+				<img src="img/install.png" class="img-responsive center-block" alt="Drag to your running Eclipse workspace to install PHP Development Tools" />
+			</a>
+		</div> 
+		<div>
+			<img src="img/update_dialog.png" class="img-responsive" alt="Eclipse Install&amp;Update Dialog" width="843" height="743">
+		</div>
+		<p>If you're looking for developer builds, try out <a href="#compositeLatestNightly" class="red">**</a>: <a href="http://download.eclipse.org/tools/pdt/updates/6.0">http://download.eclipse.org/tools/pdt/updates/6.0</a> </p>
+		<p>All downloads are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/epl/notice.html">Eclipse.org Software User Agreement</a> unless otherwise specified.</p>
+		<p><span class="red">&nbsp;*</span> - Latest stable: <a id="compositeLatest" href="http://download.eclipse.org/tools/pdt/updates/latest/">http://download.eclipse.org/tools/pdt/updates/latest/</a><br />
+		<span class="red">**</span> - Latest nightly: <a id="compositeLatestNightly" href="http://download.eclipse.org/tools/pdt/updates/latest-nightly/">http://download.eclipse.org/tools/pdt/updates/latest-nightly/</a></p>
+
 		<h3>Download PDT ZIP package</h3>
 		<p>This packages contain PDT p2 repository, which can be used to install PDT in Eclipse without access to Eclipse.org</p>
 		<ul>
@@ -140,27 +147,6 @@
 			<li><a href="https://www.eclipse.org/downloads/download.php?file=/tools/pdt/downloads/pdt-Update-4.0.0.201606081033.zip" rel="nofollow">PDT Update 4.0.0 (2016-06-22)</a></li>
 		</ul>
 
-		<h3>Update existing Eclipse</h3>
-		<p>
-			In Eclipse, click <i>Help -> Install New Software</i> and work with <a href="#compositeLatest" class="red">*</a>: <a href="http://download.eclipse.org/tools/pdt/updates/5.3">http://download.eclipse.org/tools/pdt/updates/5.3</a>
-		</p>
-		<div class="pagination-centered">
-			<a href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=1944539" class="drag" title="Drag to your running Eclipse workspace to install PHP Development Tools"><img src="img/install.png" alt="Drag to your running Eclipse workspace to install PHP Development Tools" /></a> <img src="img/update_dialog.png" alt="Eclipse Install&amp;Update Dialog" width="843" height="743">
-		</div>
-		<p>If you're looking for developer builds, try out <a href="#compositeLatestNightly" class="red">**</a>: <a href="http://download.eclipse.org/tools/pdt/updates/6.0">http://download.eclipse.org/tools/pdt/updates/6.0</a> </p>
-		<p>All downloads are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/epl/notice.html">Eclipse.org Software User Agreement</a> unless otherwise specified.</p>
-		<p><span class="red">&nbsp;*</span> - Latest stable: <a id="compositeLatest" href="http://download.eclipse.org/tools/pdt/updates/latest/">http://download.eclipse.org/tools/pdt/updates/latest/</a><br />
-		<span class="red">**</span> - Latest nightly: <a id="compositeLatestNightly" href="http://download.eclipse.org/tools/pdt/updates/latest-nightly/">http://download.eclipse.org/tools/pdt/updates/latest-nightly/</a></p>
-
-		<h2 id="docs">Docs</h2>
-		<ul>
-			<li><a href="http://help.eclipse.org/neon/topic/org.eclipse.php.help/html/table_of_contents.html" itemprop="relatedLink">PDT User Manual</a>. All PDT features at a glance.</li>
-			<li><a href="http://wiki.eclipse.org/index.php/PDT">PDT Wiki</a>. Find more information and discussions in the PDT Wiki page</li>
-			<li><a href="https://www.genuitec.com/debugging-php-with-eclipse-pdt/">Debugging PHP with Eclipse PDT: A WordPress Example</a>. Created by Octavio Gonzalez</li>
-			<li><a href="documents/XDebugGuideForPDT2.0.pdf">PDT 2.0 XDebug Guide</a>. XDebug guide for configuration and usage of XDebug under PDT 2.0. Created by Dave Kelsey [Old]</li>
-			<li><a href="/pdt/articles/debugger/os-php-eclipse-pdt-debug-pdf.pdf">Debugging PHP using Eclipse and PDT</a> [Old]</li>
-		</ul>
-
 		<h2 id="extensions">Extensions</h2>
 		<p>The experience of developing PHP application with PDT can be extended with a large variety of plugins created by the Eclipse ecosystem. Below are open source projects and commercial products that are built on top of PDT or are integrated with PDT.</p>
 		<table>