diff --git a/modeling-wip/_index.html b/modeling-wip/_index.html
index 51d4216..0db8f53 100644
--- a/modeling-wip/_index.html
+++ b/modeling-wip/_index.html
@@ -1,16 +1,50 @@
 
-   <div class="container">
-    <div class="row">
-     <div class="span4">
-    <img  src="http://www.eclipse.org/modeling/images/modeling_pos_logo_fc_med.jpg"/>
-    </div>
-    <div class="span8">
-    <p >
-    The Eclipse Modeling Project focuses on the evolution and promotion of model-based development technologies within the Eclipse community by providing a unified set of modeling frameworks, tooling, and standards implementations.
-    </p>
-    </div>
-    </div>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    
+    <!-- IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    
+    <link href="assets/css/bootstrap.css" rel="stylesheet">
+    
+    <title>Eclipse Modeling</title>
+  </head>
+  <body>
+     <script src="assets/js/jquery.js"></script>
+     <script src="assets/js/bootstrap-collapse.js"></script>
+
     <div class="container row">
+    <div class="row">
+     <div class="span3">
+   		 <img  src="http://www.eclipse.org/modeling/images/modeling_pos_logo_fc_med.jpg"/>
+     </div>
+    <div class="span8">
+	 <H3>Modeling: Faster, Smarter, Better</H3>
+
+     <p>The bewildering complexity of modern software begs for a fresh
+     approach focusing on high-level design, delegating menial tasks to
+     tools and frameworks.From a concise description of your problem
+     domain, a complete solution can be inferred.</p>
+
+     <H3>What is Eclipse Modeling?</H3>
+
+     <p>Eclipse Modeling is an integrated assortment of extensible tools and
+     frameworks for solving everyday problems.</p>
+
+     <p>At its core lies the Eclipse Modeling Framework, a rich abstraction
+     for describing, composing, and manipulating structured information.
+     Around this core, onion-like technology layers provide powerful
+     facilities to address most everything you need.</p>
+	    
+    </div>
+    </div>
     <div class="span10">     
 	<section>
 	   <div class="page-header">
@@ -35,20 +69,48 @@
 	            </a>
 	         </li>
 	         <li class="span3">
-	            <h2>Standards</h2>
+	            <h2>Interop.</h2>
 	            <a data-toggle="collapse" data-target="#detail1-3" class="thumbnail">
 	               <img src="http://placehold.it/360x268" alt="" />
 	            </a>
 	         </li>
 	      </ul>
-	   </div>
+	   
 	   <div id="detail1-1" class="collapse out">
 	      <ul class="thumbnails">
 	         <li class="span3">
+	            <h3>Agent Modeling</h3>
+	            <p><img align="right" src="../downloads/discovery/juno/images/amp.png"/>
+	            provides extensible frameworks&#xA;and exemplary tools for representing, editing, generating, executing and&#xA;visualizing agent-based models (ABMs).  
+	            </p>
+	            <a href="http://www.eclipse.org/amp/"> more...</a>
+	         </li>
+	         <li class="span3">
 	            <h3>Core</h3>
 	            <p>A modeling framework for building tools and other applications based on a structured data model.</p>
+	            <a href="http://www.eclipse.org/modeling/emf/?project=emf"> more...</a>
 	         </li>
 	         <li class="span3">
+	           <h3>Compare</h3>
+	            <p>Comparison and merge facility and tools for any kind of EMF Model.</p>
+	            <a href="http://www.eclipse.org/emf/compare"> more...</a>
+	         </li>	           
+	         <li class="span3">
+	           <h3>Diff/Merge</h3>
+	            <p> a lightweight engine for comparing and merging models using IDs.</p>
+	            <a href="http://www.eclipse.org/projects/project.php?id=modeling.emf.diffmerge"> more...</a>
+	         </li>
+	          <li class="span3">
+	           <h3>EMF Facet</h3>
+	            <p>  provide non-intrusive mechanisms to add new features (types, attributes, operations and references) to a metamodel and to customize the existing features by adding extra properties (icons, labels, etc.)</p>
+	            <a href="http://www.eclipse.org/modeling/emft/facet/"> more...</a>
+	         </li>	         	  
+	         <li class="span3">
+	           <h3>eTrice</h3>
+	            <p> an implementation of the ROOM modeling language for event driven real-time software systems.</p>
+	            <a href="http://www.eclipse.org/etrice/"> more...</a>
+	         </li>	         
+	         <li class="span3">
 	            <h3>Transaction</h3>
 	            <p>provides a model management layer built on top of EMF for managing EMF resources.</p>
 	         </li>
@@ -60,98 +122,244 @@
 	            <h3>Query</h3>
 	            <p>Facilitates the process of search and retrieval of model elements of interest in a flexible yet controlled and structured manner.</p>
 	         </li>
+	         <li class="span3">
+	            <h3>Query 2</h3>
+	            <p>A layer on the Eclipse Modeling Framework (EMF) that facilitates the process of search and retrieval of emf model elements minimizing resource loading during execution</p>
+	         </li>
+	         
 	      </ul>
 	   </div>
 	   <div id="detail1-2" class="collapse out">
-	      <li class="span3">
+	      <ul class="thumbnails">
+	         <li class="span3">
 	            <h3>CDO</h3>
 	            <p>a technology for distributed shared EMF models and a fast server-based O/R mapping solution. With CDO you can easily enhance your existing models in such a way that saving a resource transparently commits the applied changes to a relational database.</p>
+	            <a href=""> more...</a>
 	         </li>
 	         <li class="span3">
-	            <h3>EMFStore</h3>
-	            <p>EMFStore is a model repository for EMF-based models/data. It allows storage, versioning, collaboration, offline work and interactive merging. All functions are available via API and via GUI included in the release.</p>
+	            <h3>  EMFStore</h3> 
+	            <p> <img align="right" src="../downloads/discovery/juno/images/emfstore.png"/> EMFStore is a model repository for EMF-based models/data. It allows storage, versioning, collaboration, offline work and interactive merging. All functions are available via API and via GUI included in the release.</p>
+	            <a href=""> more...</a>
 	         </li>	           
 	         <li class="span3">
 	            <h3>Teneo</h3>
 	            <p>A database persistency solution for EMF using Hibernate or EclipseLink. It supports automatic creation of EMF to Relational Mappings and the related database schemas.</p>
+	            <a href=""> more...</a>
 	         </li>
 	         <li class="span3">
 	           <h3>Texo</h3>
-	           <p></p>
+	           <p>Teneo is a Model-Relational mapping and runtime database persistence solution for the Eclipse Modeling Framework (EMF) using Hibernate and EclipseLink.</p>
+	           <a href=""> more...</a>
 	         </li>	    
+          </ul>
 	   </div>
 	   <div id="detail1-3" class="collapse out">
-	      <div>
-	         <h3>XML Schema Definition</h3>
-	         <p>A reference library that provides an API for use with any code that examines, creates or modifies W3C XML Schema.</p>
-	         <div>
-	            <h3>Unified Modeling Language 2.x</h3>
-	            <p>(UML2) : an EMF-based implementation of the UML 2.x metamodel for the Eclipse platform.</p>
-	         </div>
-	         <div>
-	            <h3>Object Constraint Language</h3>
+	      <ul class="thumbnails">
+	         <li class="span3">
+		      <h3>XSD</h3>
+		         <p>A reference library that provides an API for use with any code that examines, creates or modifies W3C XML Schema.</p>
+		         <a href=""> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>UML 2.x</h3>
+	            <p> an EMF-based implementation of the UML 2.x metamodel for the Eclipse platform.</p>
+	            <a href=""> more...</a>
+	         </li>
+	         <li class="span3">
+	           <h3>OCL</h3>
 	            <p>defines APIs for OCL expression syntax for implementing queries and constraints.</p>
-	         </div>
-	         <h3>Business Process Metamodel and Notation 2.x</h3>
+	            <a href=""> more...</a>
+	         </li>
+	         <li class="span3">
+	         <h3>BPMN 2</h3>
 	         <p>an EMF-based implementation of the BPMN 2.x metamodel for the Eclipse platform.</p>
-	      </div>
+	         <a href=""> more...</a>
+	         </li>
+	          <li class="span3">
+	         <h3>Modisco</h3>
+	         <p> <img align="right" src="../downloads/discovery/juno/images/modisco.png"/> an extensible framework to develop model-driven tools for software modernization projects.</p>
+	         <a href="http://www.eclipse.org/MoDisco/"> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>RMF</h3>
+	            <p>Requirements Modeling Framework : one clean-room implementation of the OMG ReqIF standard in form of an EMF model and some rudimentary tooling to edit these models. </p>
+	            <a href="http://www.eclipse.org/rmf/"> more...</a>
+	         </li>
+	      </ul>
+	   </div>
 	   </div>
 	</section>
    
       
       
+
       <section>
-        <div class="page-header">
-          <h1>Building your own Editors<small> domain specific langages and tooling</small></h1>
-        </div>        
-        <ul class="thumbnails">
-          <li class="span3">
-          <h2>Editors</h2>
-            <a href="#" class="thumbnail">
-              <img src="http://placehold.it/360x268" alt=""/>
-            </a>
-          </li>          
-          <li class="span3">
-          <h2>Text Generators</h2>
-            <a href="#" class="thumbnail">
-              <img src="http://placehold.it/360x268" alt=""/>
-            </a>
-          </li>
-          <li class="span3">
-          <h2>Transformations</h2>
-            <a href="#" class="thumbnail">
-              <img src="http://placehold.it/360x268" alt=""/>
-            </a>
-          </li>	        
-        </ul>        
-      </section>
+	   <div class="page-header">
+	       <h1>Building your own Tools<small> domain specific langages and tooling</small></h1>
+	   </div>
+	   <div>	      
+	      <ul class="thumbnails">
+	         <li class="span3">
+	            <h2>Editors</h2>
+	            <a data-toggle="collapse" data-target="#detail2-1" class="thumbnail">
+	               <img src="http://placehold.it/360x268" alt="" />
+	            </a>
+	         </li>
+	         <li class="span3">
+	            <h2>Generators</h2>
+	            <a data-toggle="collapse" data-target="#detail2-2" class="thumbnail">
+	               <img src="http://placehold.it/360x268" alt="" />
+	            </a>
+	         </li>
+	         <li class="span3">
+	            <h2>Transformations</h2>
+	            <a data-toggle="collapse" data-target="#detail2-3" class="thumbnail">
+	               <img src="http://placehold.it/360x268" alt="" />
+	            </a>
+	         </li>
+	      </ul>
+	   
+	   <div id="detail2-1" class="collapse out">
+	      <ul class="thumbnails">
+	         <li class="span3">
+	            <h3>EEF</h3>
+	            <p><img align="right" src="../downloads/discovery/juno/images/eef.png"/>It allows user to create rich user interfaces to edit EMF models. </p>
+	            <a href=""> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>EMF Client Platform</h3>
+	            <p>provides a standard solution including the most common features needed for EMF-based client applications.</p>
+	            <a href="http://www.eclipse.org/emfclient/"> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>GMF runtime</h3>
+	            <p>An industry proven application framework for creating graphical editors using EMF and GEF.</p>
+	            <a href="http://www.eclipse.org/modeling/gmp/?project=gmf-runtime#gmf-runtime"> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>GMF Tooling</h3>
+	            <p><img align="right" src="../downloads/discovery/juno/images/gmf.png"/> A model-driven approach to generating graphical editors in Eclipse.</p>
+	            <a href="http://www.eclipse.org/modeling/gmp/?project=gmf-tooling#gmf-tooling"> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>Graphiti</h3>
+	            <p><img align="right" src="../downloads/discovery/juno/images/graphiti.png"/> An Eclipse-based graphics framework to enable easy development of state-of-the-art diagram editors for domain models.</p>
+	            <a href="http://www.eclipse.org/modeling/gmp/?project=graphiti#graphiti"> more...</a>
+	         </li>	           
+	          <li class="span3">
+	            <h3>Sphinx</h3>
+	            <p> An extensible platform that eases the creation of integrated modeling tool environments.</p>
+	            <a href="http://www.eclipse.org/sphinx/"> more...</a>
+	         </li>	   
+	           <li class="span3">
+	            <h3>Wazaabi</h3>
+	            <p> a set of eclipse plugins allowing the use of EMF based models for building parts of an application GUI. </p>
+	            <a href="http://www.eclipse.org/wazaabi/"> more...</a>
+	         </li>        
+	         <li class="span3">
+	            <h3>XText</h3>
+	            <p><img align="right" src="../downloads/discovery/juno/images/xtext.png"/>  a framework for development of programming languages and domain specific languages.
+It covers all aspects of a complete language infrastructure to fully-blown top-notch Eclipse IDE integration. </p>
+				<a href="http://www.eclipse.org/xtext"> more...</a>
+	         </li>	        
+	      </ul>
+	   </div>
+	   <div id="detail2-2" class="collapse out">
+	      <ul class="thumbnails">
+	         <li class="span3">
+	            <h3>Acceleo</h3>
+	            <p><img align="right" src="../downloads/discovery/juno/images/acceleo.png"/> A complete and efficient tooling to build your own code generators.</p>
+	            <a href="http://www.eclipse.org/acceleo/"> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>EGF</h3> 
+	            <p> <img align="right" src="../downloads/discovery/juno/images/egf.png"/>  provides an extensible generation framework in order to support complex, large-scale and customizable generations.</p>
+	            <a href="http://www.eclipse.org/egf/"> more...</a>
+	         </li>
+	          <li class="span3">
+	            <h3>Jet</h3> 
+	            <p> <img align="right" src="../downloads/discovery/juno/images/jet.png"/> JET is an Eclipse-based code generator framework based on JSP. </p>
+	            <a href="http://www.eclipse.org/modeling/m2t/?project=jet#jet"> more...</a>
+	         </li>	 
+	         <li class="span3">
+	            <h3>Xpand</h3> 
+	            <p> <img align="right" src="../downloads/discovery/juno/images/xpand.png"/> A language specialized on code generation based on EMF models. </p>
+	            <a href="http://wiki.eclipse.org/Xpand"> more...</a>
+	         </li>	        
+	        </ul>
+	   </div>
+	   <div id="detail2-3" class="collapse out">
+	      <ul class="thumbnails">
+	         <li class="span3">
+		         <h3>ATL</h3>
+		         <p><img align="right" src="../downloads/discovery/juno/images/atl.png"/> a model transformation language and toolkit. ATL provides ways to produce a set of target models from a set of source models.</p>
+		         <a href="http://www.eclipse.org/atl/"> more...</a>
+	      	 </li>
+	      	 <li class="span3">
+	         <h3>QVT Declarative</h3>
+	          <p><img align="right" src="../downloads/discovery/juno/images/qvtd.png"/> a complete Eclipse based IDE for the Core (QVTc) and Relations (QVTr) Languages defined by the OMG QVT Relations (QVTR) language.</p>
+	          <a href="http://wiki.eclipse.org/MMT/QVT_Declarative_%28QVTd%29"> more...</a>
+	      	 </li>
+	         <li class="span3">
+	         <h3>QVT Operational</h3>
+	          <p><img align="right" src="../downloads/discovery/juno/images/qvto.png"/>  Implementation of the Operational part of the OMG QVT (Query/View/Transformation) open standard.</p>
+	          <a href="http://wiki.eclipse.org/M2M/Operational_QVT_Language_(QVTO)"> more...</a>
+	          </li>
+	      </ul>	      
+	   </div>
+	   </div>
+	</section>      
       
-     <section>
-        <div class="page-header">
-          <h1>Modeling Tools <small> ready to use</small></h1>
-        </div>
-        <ul class="thumbnails">
-          <li class="span3">
-          <h2>Ecore</h2>
-            <a href="#" class="thumbnail">
-              <img src="http://placehold.it/360x268" alt=""/>
-            </a>
-          </li>
-          <li class="span3">
-          <h2>UML</h2>
-            <a href="#" class="thumbnail">
-              <img src="http://placehold.it/360x268" alt=""/>
-            </a>
-          </li>
-          <li class="span3">
-          <h2>Text</h2>
-            <a href="#" class="thumbnail">
-              <img src="http://placehold.it/360x268" alt=""/>
-            </a>
-          </li>  		        
-        </ul>        
-      </section>               
+      
+       <section>
+	   <div class="page-header">
+	        <h1>Off the shelve Modeling Tools <small> ready to use</small></h1>
+	   </div>
+	   <div>	      
+	      <ul class="thumbnails">
+	         <li class="span3">
+	            <h2>Ecore</h2>
+	            <a data-toggle="collapse" data-target="#detail3-1" class="thumbnail">
+	               <img src="http://placehold.it/360x268" alt="" />
+	            </a>
+	         </li>
+	         <li class="span3">
+	            <h2>UML</h2>
+	            <a data-toggle="collapse" data-target="#detail3-2" class="thumbnail">
+	               <img src="http://placehold.it/360x268" alt="" />
+	            </a>
+	         </li>	       
+	      </ul>
+	   
+	   <div id="detail3-1" class="collapse out">
+	      <ul class="thumbnails">
+	         <li class="span3">
+	            <h3>EcoreTools</h3>
+	            <p> a complete environment to create, edit and maintain Ecore models. This component eases handling of Ecore models with a Graphical Ecore Editor and bridges to other existing Ecore tools (Validation, Search, Compare, Emfatic, generators...).</p>
+	            <a href="http://www.eclipse.org/modeling/emft/?project=ecoretools"> more...</a>
+	         </li>
+	         <li class="span3">
+	            <h3>XCore</h3>
+	            <p>an extended concrete syntax for Ecore that, in combination with Xbase, transforms it into a fully fledged programming language with high quality tools reminiscent of the Java Development Tools. </p>
+	            <a href="http://wiki.eclipse.org/Xcore"> more...</a>
+	         </li>
+	      </ul>
+	   </div>
+	   <div id="detail3-2" class="collapse out">
+	      <ul class="thumbnails">
+	         <li class="span3">
+	            <h3>Papyrus</h3>
+	            <p><img align="right" src="../downloads/discovery/juno/images/papyrus.png"/> an integrated and user-consumable environment for editing any kind of EMF model and particularly supporting UML and related modeling languages such as SysML and MARTE. </p>
+	            <a href="http://www.eclipse.org/papyrus/"> more...</a>
+	         </li>
+	        </ul>
+	   </div>
+	   </div>
+	</section>   
+                  
     </div>
+    
+    
     <div class="span1">
        <div class="page-header">
            <h1>Download<small></small></h1>
@@ -159,6 +367,7 @@
         <div class="span2">
             <p><a href="">Indigo</a> <span class="label label-success"> stable</span></p>
             <p> <a href="">Juno</a> <span class="label label-warning"> beta</span></p>          
+            <p> <a href="">Source code</a></p>
         </div>
         <div class="page-header">
           <h1>Help<small></small></h1>
@@ -179,3 +388,5 @@
     </div>
     </div>
     
+  </body>
+</html>
\ No newline at end of file