diff --git a/_index.html b/_index.html
index 9694b60..1dbd384 100644
--- a/_index.html
+++ b/_index.html
@@ -5,78 +5,71 @@
 		EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts, 
 		such as code or application, in order to automate software development.
 		<a title="Presentation of EGF" href="http://wiki.eclipse.org/images/6/66/EGF_Introduction.pdf">Introduction</a>
+		
+		<table align="center">
+			<tr>
+				<th><img src="resources/EGF_Overview.png" alt="EGF Overview" /></th>
+				<th>
+					<div class="featureDescription">
+					    <ul>
+				    	    <li>Software production with factory components</li>
+				        	<li>Reuse of off-the-shelf factory components</li>
+					        <li>Development by assembly</li>
+				    	    <li>Adaptation to a specific context</li>
+				    	</ul>
+					</div>
+				</th>
+			</tr>
+		</table>
+		
+		<div id="EGFConceptsText">
+		    <p>EGF is an engine based on four types of generation unit:
+		        <ul>
+		            <li><b>Task</b>: it enables to execute code written in a language (e.g., Java, Ant, JRuby) or tools (e.g., Acceleo, ATL, Jet)</li>
+		            <li><b>Factory component</b>: it declares generation parameters and orchestrates calls to tasks or other factory components</li>
+		            <li><b>Pattern</b>: it is a powerful formalism which enables to process resources (e.g., model, file), in a language (e.g., Java, Jet), with parameters (e.g., navigation strategy, post-processor, reporter)</li>
+		            <li><b>Generation Chain</b>: it is a domain-specific model which enables to abstract generations</li>
+		        </ul>
+			EGF is designed to be extensible and accept new types of generation unit.
+			 On the other hand, because a task is able to execute code and tools, EGF is not strictly limited to generation.  
+		    </p>
+		</div>
+		<table align="center">
+			<tr>
+				<th><a title="Activity Workflow With Java and Ruby" href="http://vimeo.com/15705526">
+					<img src="resources/EgfActivityWorkflowJavaRuby.png"/>
+					<div class="overlay"></div>
+					</a></th>
+				<th><p>Video: <strong>&nbsp;Activity Workflow combining Java and JRuby</strong></p>
+					<p>Example of dynamic execution</p>
+					</th>
+			</tr>
+		</table>
+		<div>
+			<h3>Software Factories Portfolios</h3>
+		    <p>A software factory portfolio provides an off-the-shelf generation solution. EGF is released with two portfolios: 
+		        <ul>
+		            <li><b>Enhanced EMF Generation</b>: 1) it enriches the EMF generation with new generation topics (e.g., html doc, ecoretools diagrams, Java doc), 2) it opens the EMF Generation customization with the EGF patterns</li>
+		            <li><b>Build chain editor and generator</b>: it provides 1) an editor to model a build chain for continuous integration, and 2) a generator with targets, by default, Hudson/jenkins and Buckminster</li>
+		        </ul>
+		    </p>
+		</div>
+		<table>
+			<tr>
+				<th><a title="Generation Chain" href="http://vimeo.com/29472598">
+					<img src="resources/EgfGenerationChain.png"/>
+					<div class="overlay"></div>
+					</a></th>
+				<th><p>Video: <strong>&nbsp;Generation Chain</strong></p>
+					<p>Generation chain and the EMF generation</p>
+					</th>
+			</tr>
+		</table>
 	</p>
   </div>
 </div>
-<table>
-	<tr>
-		<th><img src="resources/EGF_Overview.png" alt="EGF Overview" /></th>
-		<th>
-			<div class="featureDescription">
-			    <ul>
-		    	    <li>Software production with factory components</li>
-		        	<li>Reuse of off-the-shelf factory components</li>
-			        <li>Development by assembly</li>
-		    	    <li>Adaptation to a specific context</li>
-		    	</ul>
-			</div>
-		</th>
-	</tr>
-</table>
 
-<div id="EGFConceptsText">
-    <p>EGF is an engine based on four types of generation unit:
-        <ul>
-            <li><b>Task</b>: it enables to execute code written in a language (e.g., Java, Ant, JRuby) or tools (e.g., Acceleo, ATL, Jet)</li>
-            <li><b>Factory component</b>: it declares generation parameters and orchestrates calls to tasks or other factory components</li>
-            <li><b>Pattern</b>: it is a powerful formalism which enables to process resources (e.g., model, file), in a language (e.g., Java, Jet), with parameters (e.g., navigation strategy, post-processor, reporter)</li>
-            <li><b>Generation Chain</b>: it is a domain-specific model which enables to abstract generations</li>
-        </ul>
-	EGF is designed to be extensible and accept new types of generation unit.
-	 On the other hand, because a task is able to execute code and tools, EGF is not strictly limited to generation.  
-    </p>
-</div>
-
-<table>
-	<tr>
-		<th><a title="Activity Workflow With Java and Ruby" href="http://vimeo.com/15705526">
-			<img src="resources/EgfActivityWorkflowJavaRuby.png"/>
-			<div class="overlay"></div>
-			</a></th>
-		<th><p>Video: <strong>&nbsp;Activity Workflow combining Java and JRuby</strong></p>
-			<p>Example of dynamic execution</p>
-			</th>
-	</tr>
-</table>
-
-<div>
-	<h3>Software Factories Portfolios</h3>
-    <p>A software factory portfolio provides an off-the-shelf generation solution. EGF is released with two portfolios: 
-        <ul>
-            <li><b>Enhanced EMF Generation</b>: 1) it enriches the EMF generation with new generation topics (e.g., html doc, ecoretools diagrams, Java doc), 2) it opens the EMF Generation customization with the EGF patterns</li>
-            <li><b>Build chain editor and generator</b>: it provides 1) an editor to model a build chain for continuous integration, and 2) a generator with targets, by default, Hudson/jenkins and Buckminster</li>
-        </ul>
-    </p>
-</div>
-
-
-<table>
-	<tr>
-		<th><a title="Generation Chain" href="http://vimeo.com/29472598">
-			<img src="resources/EgfGenerationChain.png"/>
-			<div class="overlay"></div>
-			</a></th>
-		<th><p>Video: <strong>&nbsp;Generation Chain</strong></p>
-			<p>Generation chain and the EMF generation</p>
-			</th>
-	</tr>
-</table>
-
-</div>
-
-
-<div id="rightcolumn">
-
+<div class="news-list news-list-match-height">
 	<div>
 		<h3>
 			<a href="/projects/project_summary.php?projectid=modeling.emf.egf">About This Project</a>
@@ -85,19 +78,18 @@
 		<div id="stats">
 			<div id="newAndNoteworthy"><!-- <h3>New And Noteworthy</h3> -->
 				<a href="http://wiki.eclipse.org/EGF_New_And_Noteworthy">New and Noteworthy</a>
-			</div>
-			<div>
+		</div>
+		<div>
 				<h4>Commit stats</h4>
 				<a href="http://www.eclipse.org/projects/project_summary.php?projectid=modeling.emf.egf">
 				<img src="http://dash.eclipse.org/dash/commits/web-app/active-graph.cgi?project=modeling.emf.egf"/>
 				</a>
-			</div>
-	
-		</div>
-	
-		<div id="headlines">
-			<h3>News</h3>
-			%%HEADLINES%%
 		</div>
 	</div>
+	
+	<div id="headlines">
+			<h3>News</h3>
+			%%HEADLINES%%
+	</div>
 </div>
+