more cleanup
diff --git a/developers.php b/developers.php
index 4c218ba..6e55b67 100644
--- a/developers.php
+++ b/developers.php
@@ -20,13 +20,8 @@
 	
 	# 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)
-	$Nav->addNavSeparator("Developer Links", 	"");
-	$Nav->addCustomNav("CVS Repository", "http://dev.eclipse.org/viewcvs/indextech.cgi/org.eclipse.bpel", "_self", 3);
-	$Nav->addCustomNav("Mailing List", "http://dev.eclipse.org/mailman/listinfo/bpel-dev", "_blank", 3);
-	$Nav->addCustomNav("Enhancements", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&product=BPEL&long_desc_type=allwordssubstr&bug_file_loc_type=allwordssubstr&status_whiteboard_type=allwordssubstr&keywords_type=allwords&bug_status=NEW&bug_status=ASSIGNED&bug_severity=enhancement&bugidtype=include&chfieldto=Now&cmdtype=doit&order=Bug+Number&field0-0-0=noop&type0-0-0=noop&value0-0-0=", "_blank", 3);
-	$Nav->addCustomNav("Open bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=BPEL", "_blank", 3);
-	$Nav->addCustomNav("Closed bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=BPEL&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=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&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=", "_blank", 3);
-	
+	include("developers/developer_links.php");
+		
 	# End: page-specific settings
 	#
 		
@@ -104,12 +99,6 @@
          		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
        		</div>
      	</div>
-		<div class="sideitem">
-			<h6>links</h6>
-			<ul>
-				<li><a href="http://download.eclipse.org/technology/bpel/update-site/" target="download">BPEL Editor Update Site</a></li>
-			</ul>
-		</div>
      </div>
 </div>
 
diff --git a/developers/calls.php b/developers/calls.php
index 8f9658f..c39f98b 100644
--- a/developers/calls.php
+++ b/developers/calls.php
@@ -13,15 +13,25 @@
 	
 	# 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)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
+	include("developer_links.php");
+	
+	ob_start();
 ?>
 
-<div id="rightcolumn">
-   <?php include("../items/links.html"); ?>
-</div>
-
+	<div id="rightcolumn">
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
+     </div>
+     
 <div id="maincontent">
 		
 
diff --git a/developers/developer_links.php b/developers/developer_links.php
new file mode 100644
index 0000000..e8a3a7e
--- /dev/null
+++ b/developers/developer_links.php
@@ -0,0 +1,9 @@
+<?php
+ 	$Nav->addNavSeparator("Developer Links", 	"");
+	$Nav->addCustomNav("CVS Repository", "http://dev.eclipse.org/viewcvs/indextech.cgi/org.eclipse.bpel", "_self", 3);
+	$Nav->addCustomNav("Mailing List", "http://dev.eclipse.org/mailman/listinfo/bpel-dev", "_blank", 3);
+	$Nav->addCustomNav("Enhancements", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;product=BPEL&amp;long_desc_type=allwordssubstr&amp;bug_file_loc_type=allwordssubstr&amp;status_whiteboard_type=allwordssubstr&amp;keywords_type=allwords&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_severity=enhancement&amp;bugidtype=include&amp;chfieldto=Now&amp;cmdtype=doit&amp;order=Bug+Number&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=", "_blank", 3);
+	$Nav->addCustomNav("Open bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=specific&amp;order=relevance+desc&amp;bug_status=__open__&amp;product=BPEL", "_blank", 3);
+	$Nav->addCustomNav("Closed bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=BPEL&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=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&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=", "_blank", 3);
+	$Nav->addCustomNav("Update Site", "http://download.eclipse.org/technology/bpel/update-site/", "_blank", 3);
+?>
\ No newline at end of file
diff --git a/developers/extension_points.php b/developers/extension_points.php
index bead91b..ed29299 100644
--- a/developers/extension_points.php
+++ b/developers/extension_points.php
@@ -1,6 +1,18 @@
-<?php
-    require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
-       	
+<?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'
+
+	#*****************************************************************************
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
+	#****************************************************************************
+	
+	#
 	# Begin: page-specific settings.  Change these. 
 	$pageTitle 		= "BPEL Extension Points";
 	$pageKeywords	= "BPEL,Extension Points";
@@ -8,14 +20,41 @@
 	
 	# 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)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 2);	
-?>
+	include("developer_links.php");
+		
+	# End: page-specific settings
+	#
+    $extension_points_html=get_include_contents("extension_points.html");
+    
+	
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+	
+	<div id="rightcolumn">
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
+     </div>
+	
 <div id="maincontent">
-   <div id="midcolumn">	
-     <?php include("extension_points.html"); ?>
-   </div>
+   	<div id="midcolumn">	
+     $extension_points_html
+   	</div>
 </div>
 
-<?php bpel_generate_page() ?>
+
+
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/developers/milestone_plan.php b/developers/milestone_plan.php
index 64e8ac7..6b6b4aa 100644
--- a/developers/milestone_plan.php
+++ b/developers/milestone_plan.php
@@ -1,11 +1,18 @@
-<?php
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?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'
+
 	#*****************************************************************************
-	# milestone_plan.php
-	# Author: 		BPEL Team
-	# Description: Milestones.
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
+	#
 	# Begin: page-specific settings.  Change these. 
 	$pageTitle 		= "BPEL Project Milestone Plan";
 	$pageKeywords	= "BPEL, process, designer, milestone";
@@ -13,20 +20,31 @@
 	
 	# 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)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-?>
-
-<div id="rightcolumn">
-   <?php include("../items/links.html"); ?>
-</div>
-
-<div id="maincontent">
+	include("developer_links.php");
 		
-
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
+	
+	<div id="rightcolumn">
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
+     </div>
+	
+<div id="maincontent">
 	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
 		
 		<div class="right">
             Last modified: <span class="date">August 14<sup>th</sup>, 2007
@@ -707,4 +725,9 @@
 </div>
 
 
-<?php bpel_generate_page() ?>
+EOHTML;
+
+
+	# Generate the web page
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/developers/model.php b/developers/model.php
index 7dbd673..e34fd5b 100644
--- a/developers/model.php
+++ b/developers/model.php
@@ -1,5 +1,18 @@
 <?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'

-	ob_start();

+

+	#*****************************************************************************

+	#

+	# template.php

+	#

+	# Author: 		Denis Roy

+	# Date:			2005-06-16

+	#

+	# Description: Type your page comments here - these are not sent to the browser

+	#

+	#

+	#****************************************************************************

+	

+	#

 	# Begin: page-specific settings.  Change these. 

 	$pageTitle 		= "BPEL Model";

 	$pageKeywords	= "BPEL, model";

@@ -7,14 +20,31 @@
 	

 	# 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)

-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");

-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);

-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);

-?>

-

+	include("developer_links.php");

+		

+	# End: page-specific settings

+	#

+		

+	# Paste your HTML content between the EOHTML markers!	

+	$html = <<<EOHTML

+	

+	<div id="rightcolumn">

+    	<div class="sideitem">

+       		<h6>Incubation</h6><p>

+       		<div align="center">

+        		<a href="/projects/what-is-incubation.php">

+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>

+       		</div>

+       		<div align="center">  

+         		This project is in the 

+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>

+       		</div>

+     	</div>

+     </div>

+	

 <div id="maincontent">

 	<div id="midcolumn">

-		<h1><?=$pageTitle?></h1>

+		<h1>$pageTitle</h1>

 

 Last modified on December 7, 2005

 

@@ -110,7 +140,7 @@
 Extenders of the BPEL model should register a <i>BPELExtensionSerializer</i> 

 and <i>BPELExtensionDeserializer</i> for each of their <i>ExtensibilityElements</i>.

 The <i>BPELExtensionRegistry</i> holds onto these registrations, and they may

-be made during the execution of your EMF Package’s init() method. 

+be made during the execution of your EMF Package�s init() method. 

 If the reader or writer encounters an <i>ExtensibilityElement</i> for which

 a serializer or deserializer is not found in the registry, the default

 implementations <i>BPELUnknownExtensionSerializer</i> and 

@@ -196,7 +226,7 @@
 BPEL file, when the reader encounters a variable reference (in a Receive,

 for example), it should create a <i>VariableProxy</i> to put in the Receive. 

 This proxy would be resolved to the appropriate Variable when 

-<i>getVariable()</i> is called. However, it doesn’t work like that today. 

+<i>getVariable()</i> is called. However, it doesn�t work like that today. 

 Instead, <i>Process.getPostLoadRunnables()</i> provides access to a list of 

 runnables which are executed after the first reading pass. 

 Today, classes such as <i>VariableProxy</i> are only used when the post-load 

@@ -241,7 +271,7 @@
 they are well-formed XML and have a process at the document root. This 

 is necessary because, from an editing point of view, it is clearly 

 unreasonable to force the user to specify all mandatory attributes 

-and elements before saving for the first time – it is an iterative 

+and elements before saving for the first time � it is an iterative 

 process. The model must then save and load this incomplete file, even 

 though it may not pass syntactic validation.

 </p>

@@ -282,17 +312,12 @@
 </p>

 

 	</div>

-	<div id="rightcolumn">

-		<div class="sideitem">

-			<h6>Links</h6>

-			<ul>

-			</ul>

-		</div>

-	</div>

 		

 </div>

 

-<?php

+EOHTML;

+

+

 	# Generate the web page

-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, ob_get_clean());

-?>
\ No newline at end of file
+	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);

+?>

diff --git a/developers/validator/index.php b/developers/validator/index.php
index 5d98897..fd34fdc 100644
--- a/developers/validator/index.php
+++ b/developers/validator/index.php
@@ -19,12 +19,8 @@
 	$pageAuthor		= "BPEL Team";
 	
 	# 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)
-	# $Nav->addNavSeparator("Interesting Links", 	"");
-	# $Nav->addCustomNav("Scientific Workflows using BPEL", "http://sse.cs.ucl.ac.uk/index.php?id=omii-bpel", "_blank", 1);
-	# $Nav->addCustomNav("WS-BPEL 2.0", "http://docs.oasis-open.org/wsbpel/2.0/wsbpel-v2.0.html", "_blank", 1);
-	# $Nav->addCustomNav("OASIS TC", "http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbpel", "_blank", 1);
-	
+	include("../developer_links.php");
+		
 	# End: page-specific settings
 	#
 	$Runner_java_html=get_include_contents('Runner.java.html');
@@ -34,6 +30,22 @@
 	
 	# Paste your HTML content between the EOHTML markers!	
 	$html = <<<EOHTML
+	
+	
+	<div id="rightcolumn">
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
+     </div>
+	
 <div id="maincontent">
 		
 	<div id="midcolumn">
diff --git a/developers/www.php b/developers/www.php
index 6e67ef0..83c5214 100644
--- a/developers/www.php
+++ b/developers/www.php
@@ -1,11 +1,18 @@
-<?php
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/bpel/_boot.php");
+<?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'
+
 	#*****************************************************************************
-	# milestone_plan.php
-	# Author: 		BPEL Team
-	# Description: Editing How To.
+	#
+	# template.php
+	#
+	# Author: 		Denis Roy
+	# Date:			2005-06-16
+	#
+	# Description: Type your page comments here - these are not sent to the browser
+	#
+	#
 	#****************************************************************************
 	
+	#
 	# Begin: page-specific settings.  Change these. 
 	$pageTitle 		= "Adding content to www.eclipse.org/bpel/";
 	$pageKeywords	= "BPEL, www content, howto";
@@ -13,20 +20,33 @@
 	
 	# 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)
-	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
+	include("developer_links.php");
+		
+	# End: page-specific settings
+	#
+		
+	# Paste your HTML content between the EOHTML markers!	
+	$html = <<<EOHTML
 
-?>
-
-<div id="rightcolumn">
-   <?php include("../items/links.html"); ?>
-</div>
-
+	
+	<div id="rightcolumn">
+    	<div class="sideitem">
+       		<h6>Incubation</h6><p>
+       		<div align="center">
+        		<a href="/projects/what-is-incubation.php">
+           		<img align="center" src="/images/egg-incubation.png" border="0"/></a>
+       		</div>
+       		<div align="center">  
+         		This project is in the 
+         		<a href="/projects/dev_process/validation-phase.php">Incubation Phase</a>
+       		</div>
+     	</div>
+     </div>
+	
 <div id="maincontent">
 		
 	<div id="midcolumn">
-		<h1><?=$pageTitle?></h1>
+		<h1>$pageTitle</h1>
 		<p>
 		<div class="right">
             Last modified on:<span class="date"> April 29th<sup>th</sup>, 2007</span>
@@ -78,16 +98,16 @@
  This concludes the eclipse end setup. Now onto running the <b>www.eclipse.org/bpel/</b> 
  locally on your workstation.
  
- <h2>Install XMAPP</h2>
+ <h2>Install XAMPP</h2>
  
- Install the XMAPP stack on your workstation (MySQL + Apache + PHP and Perl).
+ Install the XAMPP stack on your workstation (MySQL + Apache + PHP and Perl).
  You download it from 
  <a class="www" href="http://www.apachefriends.org/en/xampp.html" target="_download">http://www.apachefriends.org/en/xampp.html</a>.
  <p>
  Installation ought to self explantory if you can came this far.
  <p>
  If you do not want to do this, then you are on your own. I used my own installation of Apache 
- and re-used the XMAPP instllation of the rest. 
+ and re-used the XAMPP instllation of the rest. 
  
  <h2>Modify Apache Configuration</h2>
  
@@ -108,7 +128,7 @@
       </pre>
       
   <li> Edit your apache configuration to include the <b>local.eclipse.org</b>
-  virtual host. Here is snippet from my configuration
+  virtual host. This should be in the configuration file <tt>etc/extras/httpd-vhosts.conf</tt> in your XAMPP home directory.  
   
       <pre class="code">
 NameVirtualHost *:80
@@ -133,6 +153,11 @@
  You should be able to point to <b>http://local.eclipse.org/bpel/</b>
  and get the BPEL home page.
  <p>
- 
 
-<?php bpel_generate_page() ?>
+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 d526218..084b925 100644
--- a/index.php
+++ b/index.php
@@ -48,7 +48,7 @@
 						<p class="subline">Read papers, articles and presentations, browse the <a href="http://wiki.eclipse.org/BPEL">wiki pages</a>.</p>
 					</td>
 					<td rowspan=3 align=right>
-						<img height="200" src=images/conductor-4.jpg>
+						<img height="250" src=images/conductor-4.jpg>
 					</td>
 				</tr>
 				<tr>
@@ -73,7 +73,7 @@
 						<p class="subline">
 							Get in touch with the community: Join the <a href="https://dev.eclipse.org/mailman/listinfo/bpel-dev">mailing list</a>,
 							browse the <a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.technology.bpel-designer">newsgroup</a>,
-							check <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=BPEL">Bugzilla</a></p>
+							check <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=BPEL">Bugzilla</a>, contact the <a href="team.php">BPEL Team</a></p>
 					</td>
 				</tr>
 				<tr height=11>
diff --git a/team.php b/team.php
index 068e7ae..c85eda1 100644
--- a/team.php
+++ b/team.php
@@ -39,6 +39,7 @@
 
 		<div class="homeitem3col">
 			<h3>Leads</h3>
+			
 			<table cellpadding="4px" width="500">
 				<tr>
 					<td>
@@ -130,7 +131,7 @@
 		</div>
 
 		<div class="homeitem3col">
-			<h3>Former Team Members &amp; Committers</h3>
+			<h3>Team Members &amp; Committers Emeriti</h3>
 			<table cellpadding="4px" width="500">
 				<tr>
 					<td>
diff --git a/users.php b/users.php
index 68d0956..761eab6 100644
--- a/users.php
+++ b/users.php
@@ -36,17 +36,7 @@
 	<div id="midcolumn">
 		<h1>$pageTitle</h1>
 		<h2>User Resources</h2>
-		Some useful information as to how to get started with the BPEL designer.
-		
-		<div class="homeitem3col">
-			<h3>What's new</h3>
-			<ul>
-                <li><a href="users/m4.php">M4 Information</a>  <span class="dates">09/01/2010</span></li>			
-				<li><a href="users/m3.php">M3 Information</a>  <span class="dates">06/29/2007</span></li>			
-				<li><a href="users/m2.php">M2 Information</a>  <span class="dates">11/28/2006</span></li>
-				<li><a href="users/m1.php">M1 Information</a>  <span class="dates">11/15/2006</span></li>
-			</ul>
-		</div>
+		Some useful information to help you get started with the BPEL designer.
 		<div class="homeitem3col">
 			<h3>Guides, HowTos</h3>
 			<ul>
@@ -60,6 +50,16 @@
 				<li><a href="users/howto/ode.php">Develop, deploy and run a Hello World Process with the BPEL Designer and Apache ODE</a> <span class="dates">10/22/2008</span></li>									
 			</ul>
 		</div>
+		
+		<div class="homeitem3col">
+			<h3>What's new</h3>
+			<ul>
+                <li><a href="users/m4.php">M4 Information</a>  <span class="dates">09/01/2010</span></li>			
+				<li><a href="users/m3.php">M3 Information</a>  <span class="dates">06/29/2007</span></li>			
+				<li><a href="users/m2.php">M2 Information</a>  <span class="dates">11/28/2006</span></li>
+				<li><a href="users/m1.php">M1 Information</a>  <span class="dates">11/15/2006</span></li>
+			</ul>
+		</div>
 		<hr class="clearer" />
 	</div>