diff --git a/_projectCommon.php b/_projectCommon.php
index 2767e28..5d4adca 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -18,6 +18,12 @@
 	$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);
+	$Nav->addNavSeparator(" 	Components",		"/jwt/components/index.php");
+	$Nav->addCustomNav("		Workflow Editor",	"/jwt/components/we/index.php");
+	$Nav->addCustomNav("		Desktop Tools",		"/jwt/components/desktop/index.php");
+	$Nav->addCustomNav("		Transformations",	"/jwt/components/transformations/index.php");
+	$Nav->addCustomNav("		WAM",				"/jwt/components/wam/index.php");
+	$Nav->addCustomNav("		Runtime",			"/jwt/components/runtime/index.php");
 	$Nav->addNavSeparator("		Downloads",			"/jwt/index.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);
diff --git a/components/index.php b/components/index.php
new file mode 100644
index 0000000..e95cce6
--- /dev/null
+++ b/components/index.php
@@ -0,0 +1,76 @@
+<?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'
+
+	#*****************************************************************************
+	#
+	# /components/index.php of Java Workflow Tooling (JWT)
+	#
+	# Author: 		Florian Lautenbacher
+	# created:		2007-10-12
+	#
+	# Description: The Component overview page of the Java Workflow Tooling project
+	#
+	#
+	#****************************************************************************
+	
+	#
+	# Begin: page-specific settings.  Change these. 
+	$pageTitle 		= "Eclipse Java Workflow Tooling (JWT)";
+	$pageKeywords	= "JWT , Java Workflow Tooling Project, Workflow Editor, Workflow Administration and Monitoring, Eclipse";
+	$pageAuthor		= "Florian Lautenbacher";
+	
+	# Add page-specific Nav bars here
+	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
+
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+
+<div id="midcolumn">
+		<h1>Java Workflow Tooling (JWT)</h1>
+		
+		<div class="homeitem3col">
+			<h3>Components</h3>
+				<ul>
+					<li>
+						<a href="/jwt/components/we/index.php">Workflow Editor</a>:
+ 						The Workflow Editor (WE) is a visual tool for creating, managing and 
+						reviewing process definitions 
+					</li>
+					<li>
+						<a href="/jwt/components/desktop/index.php">Desktop Tools</a>:
+						The Desktop Tools enable the simulation of processes without the need of a process engine
+					</li>
+					<li>
+						<a href="/jwt/components/transformations/index.php">Transformations</a>:
+						Building on a transformation base plugin it is possible to transform the JWT-model into <a href="http://www.eclipse.org/stp/bpmn/">BPMN</a> 
+						and to generate <a href="http://www.wfmc.org/standards/xpdl.htm">XPDL</a>-code. We are also working on other transformations, such as from 
+						<a href="http://www.eclipse.org/stp/bpmn/">BPMN</a> to JWT, from JWT to 
+						<a href="http://www.eclipse.org/stp/im/index.php">STP-IM</a>, etc.
+					</li>
+					<li>
+						<a href="/jwt/components/wam/index.php">Workflow Administration and Monitoring</a>:
+						WAM is used for deploying and testing workflows in a workflow engine i.e. handle an engine's 
+						process definition repository by loading / unloading / updating / instantiating / monitoring process definitions and
+						performing mappings among participant definitions and real users and among application definitions and tool agents
+					</li>
+				</ul>
+		</div>
+
+
+	<div id="rightcolumn">
+    	 <div class="sideitem">
+   			<h6>Incubation</h6>
+   			<div align="center"><a href="/projects/what-is-incubation.php"><img 
+        			align="center" src="/images/egg-incubation.png" 
+        			border="0" alt="Incubation" /></a></div>
+ 		</div>       		
+	</div>
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 5530e40..bc1a59f 100644
--- a/index.php
+++ b/index.php
@@ -31,75 +31,28 @@
 	$html = <<<EOHTML
 
 	<div id="midcolumn">
-		<h1>Eclipse Java Workflow Tooling (JWT) Project</h1>
+		<h1>Java Workflow Tooling (JWT)</h1>
 		
-		<table border="0">
-			<td valign="top" >
-				<div align="justify">
-					<p>
-						The <em>Java Workflow Tooling project (JWT)</em> aims to build design time, development 
-						time and runtime workflow tools in order to provide a complete, flexible, 
-						interoperable Business Process Management platform.
-					</p>
-					<p>
-						This is achieved through an extensible architecture allowing to support many 
-						different BP representations, format languages and execution engines. The set 
-						of JWT tools is meant to allow for "Distribution"-like releases with specific 
-						extensions targeting specific platforms or problems, e.g. JWT for SOA. The 
-						mission and philosophy of JWT makes it natural complement to other Eclipse 
-						projects, such as the friend SOA Tools Platform Project.
-					</p>
-				</div>
-			</td>
-			<td width="10"/>
-			<td width="310">
-				<a href="/jwt/images/jwtwe_process.gif" target="_blank"><img src="/jwt/images/index.gif"/></a>
-			</td>
-		</table>
+		<p>
+		The <em>Java Workflow Tooling project (JWT)</em> aims to build design time, development 
+		time and runtime workflow tools in order to provide a complete, flexible, 
+		interoperable Business Process Management platform.
+		</p>
 		
-		<div class="homeitem3col">
-			<h3>Components</h3>
-				<ul>
-					<li>
-						<a href="/jwt/components/we/index.php">Workflow Editor</a>:
- 						The Workflow Editor (WE) is a visual tool for creating, managing and 
-						reviewing process definitions 
-					</li>
-					<li>
-						<a href="/jwt/components/desktop/index.php">Desktop Tools</a>:
-						The Desktop Tools enable the simulation of processes without the need of a process engine
-					</li>
-					<li>
-						<a href="/jwt/components/transformations/index.php">Transformations</a>:
-						Building on a transformation base plugin it is possible to transform the JWT-model into <a href="http://www.eclipse.org/stp/bpmn/">BPMN</a> 
-						and to generate <a href="http://www.wfmc.org/standards/xpdl.htm">XPDL</a>-code. We are also working on other transformations, such as from 
-						<a href="http://www.eclipse.org/stp/bpmn/">BPMN</a> to JWT, from JWT to 
-						<a href="http://www.eclipse.org/stp/im/index.php">STP-IM</a>, etc.
-					</li>
-					<li>
-						<a href="/jwt/components/wam/index.php">Workflow Administration and Monitoring</a>:
-						WAM is used for deploying and testing workflows in a workflow engine i.e. handle an engine's 
-						process definition repository by loading / unloading / updating / instantiating / monitoring process definitions and
-						performing mappings among participant definitions and real users and among application definitions and tool agents
-					</li>
-				</ul>
-		</div>
-		
+		<p>
+		This is achieved through an extensible architecture allowing to support many 
+		different BP representations, format languages and execution engines. The set 
+		of JWT tools is meant to allow for "Distribution"-like releases with specific 
+		extensions targeting specific platforms or problems, e.g. JWT for SOA. The 
+		mission and philosophy of JWT makes it natural complement to other Eclipse 
+		projects, such as the friend <a href="http://www.eclipse.org/stp/">SOA Tools Platform Project</a>.
+		</p>
+
+		<a href="/jwt/images/jwtwe_process.gif" target="_blank"><img src="/jwt/images/index.gif"/></a>
+	
 		<hr class="clearer" />
 		
 		<div class="homeitem">
-			<h3>Project Resources</h3>
-			<img align="right" src="/jwt/images/item_download.gif" alt="download" />
-			<ul>
-				<li><a href="http://wiki.eclipse.org/JWT_Downloads">All Downloads</a></li> 
-				<li><a href="http://www.eclipse.org/downloads/download.php?file=/technology/jwt/org.eclipse.jwt.we_0.5.0.jar">Download the Workflow Editor (0.5.0)</a></li> 
-				<li><a href="http://wiki.eclipse.org/JWT_CVS">Get the Source Code from CVS</a></li> 
-				<li><a href="http://wiki.eclipse.org/JWT_Upcoming_Release">Upcoming Release Information</a></li> 
-				<li><a href="http://download.eclipse.org/technology/jwt/update-site/">Eclipse Update Site for JWT</a></li> 
-			</ul>
-		</div>
-		
-		<div class="homeitem">
 			<h3>Documentation</h3>
 			<img align="right" src="/jwt/images/item_documentation.gif" alt="documentation" />
 			<ul>
@@ -127,19 +80,17 @@
 		</div>
 		
 		<div class="homeitem">
-			<h3>What's new</h3>
+			<h3>Project Resources</h3>
+			<img align="right" src="/jwt/images/item_download.gif" alt="download" />
 			<ul>
-				<li><strong>January, 22nd 2009:</strong> JWT will be presented at <a href="http://www.eclipsecon.org/2009/sessions?id=292">EclipseCon</a> as well as at <a href="http://it-republik.de/konferenzen/efe/sessions/?tid=1077">Eclipse Forum Europe</a>.
-				</li>
-				<li><strong>January, 21st 2009:</strong> JWT will be part of the upcoming Eclipse release Galileo. <a href="http://wiki.eclipse.org/Galileo">Learn more</a> about Galileo. 
-				</li>
-				<li><strong>November, 27th 2008:</strong> JWT welcomes it's new mentor John Graham. John agreed to assist us in the Eclipse process, automating building tasks, etc. 
-				</li>
-			    <li><a href="/jwt/newsarchive.php">News archive</a>
-			    </li>
+				<li><a href="http://wiki.eclipse.org/JWT_Downloads">All Downloads</a></li> 
+				<li><a href="http://www.eclipse.org/downloads/download.php?file=/technology/jwt/org.eclipse.jwt.we_0.5.0.jar">Download the Workflow Editor (0.5.0)</a></li> 
+				<li><a href="http://wiki.eclipse.org/JWT_CVS">Get the Source Code from CVS</a></li> 
+				<li><a href="http://wiki.eclipse.org/JWT_Upcoming_Release">Upcoming Release Information</a></li> 
+				<li><a href="http://download.eclipse.org/technology/jwt/update-site/">Eclipse Update Site for JWT</a></li> 
 			</ul>
 		</div>
-
+				
 		<hr class="clearer">
 			
 	</div>
@@ -170,6 +121,19 @@
  			</ul>
  		</div>
  		
+ 		<div class="sideitem">
+			<h3>What's new</h3>
+			<ul>
+				<li><strong>January, 22nd 2009:</strong> JWT will be presented at <a href="http://www.eclipsecon.org/2009/sessions?id=292">EclipseCon</a> as well as at <a href="http://it-republik.de/konferenzen/efe/sessions/?tid=1077">Eclipse Forum Europe</a>.
+				</li>
+				<li><strong>January, 21st 2009:</strong> JWT will be part of the upcoming Eclipse release Galileo. <a href="http://wiki.eclipse.org/Galileo">Learn more</a> about Galileo. 
+				</li>
+				<li><strong>November, 27th 2008:</strong> JWT welcomes it's new mentor John Graham. John agreed to assist us in the Eclipse process, automating building tasks, etc. 
+				</li>
+			    <li><a href="/jwt/newsarchive.php">News archive</a>
+			    </li>
+			</ul>
+		</div>
  		 		
 	</div>