diff --git a/www/api/index.html b/www/api/index.html
index 4a67e08a4..be6656b3d 100644
--- a/www/api/index.html
+++ b/www/api/index.html
@@ -6,7 +6,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="google-site-verification" content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-    <title>OpenStack Documentation - API</title>
+    <title>OpenStack Docs: APIs</title>
 
     <!-- Google Fonts -->
 	<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
@@ -19,7 +19,7 @@
     <!-- OpenStack Specific CSS -->
     <link rel="stylesheet" href="http://openstack.org/themes/openstack/css/main.css" type="text/css" media="screen, projection, print">
     
-    <link rel="stylesheet" type="text/css" href="http://docs.openstack.org/common/css/docblitz.css">
+    <link rel="stylesheet" type="text/css" href="/common/css/docblitz.css">
        
     <script type="text/javascript">
     
@@ -109,30 +109,38 @@
       					  }, true);
       					</script>
       	      </div> -->
-	<div id="manuals" class="span-16">
+	<div id="manuals" class="span-24 last">
 	    	<h3 class="subhead">OpenStack Manuals</h3>
 	    	<div class="span-8">
-	    		<div id="SoftwareManuals"  >
-		    		<h2><a href="/diablo/">Software Manuals</a></h2>
-		    		<p>A great starting point for users and admins</p>
+	    		<div id="SoftwareManuals">
+		    		<h2><a href="/">Administration Guides</a></h2>
+		    		<p>A great starting point for deployers and cloud administrators.</p>
 	    		</div>    			    		
 	    	</div>
-	    	<div class="span-8 last">
-				<div id="ApiManuals" class="Selected" >
-					<h2><a href="/api/">API Developer Manuals</a></h2>
-					<p>A great starting point for developers and integrators.</p>
+	    	<div class="span-8">
+				<div id="ApiManuals" class="Selected">
+					<h2><a href="/api/">API Documentation</a></h2>
+					<p>Information about Openstack APIs for application developers and integrators.</p>
 				</div>    			    		
 	    	</div>
-	    	
+			<div class="span-8 last">
+				<div id="DeveloperDocs">
+					<h2><a href="/developer/">Developer Documentation</a></h2>
+					<p>Details about OpenStack internals for python developers and advanced users.</p>
+				</div>                  
+			</div>
+
 	    	<hr />
 	    	
-	    	<div class="span-16 last">
+	    	<div class="span-24 last">
 	    	
 	    		<table class="manualTable">
 	    			
 		    		<th colspan="2"><strong>API Documentation</strong></th>
 		    		
-		    		
+            <tr>
+              <td><a href="http://api.openstack.org/">API Developer Reference</a><p>Online reference for the OpenStack APIs</p></td>
+            </tr>
 		    		
 		    		<tr>
 		    			<td><a href="/api/openstack-compute/2/content/">OpenStack Compute Developer Guide API 2</a></td>
@@ -157,20 +165,6 @@
 	    		</table>
 	    	</div>
 	 </div>
-    <div id="latest" class="span-8 last">
-	    <h3 class="subhead">Related Resources</h3>
-	    <ul>
-			<li><h4><a href="http://api.openstack.org/">API Developer Reference</a></h4><p>Online reference for the OpenStack APIs</p></li>
-	    <li><h4><a href="http://ci.openstack.org/">Continuous Integration (<span class="tag">CI</span>) Developer Documentation</a></h4><p>Online developer documentation for the Continuous Integration systems used by OpenStack projects</p></li>
-			<li><h4><a href="http://nova.openstack.org/">Compute Developer Documentation <span class="tag">Nova</span></a></h4><p>Online developer documentation for OpenStack Compute (Nova)</p></li>
-			<li><h4><a href="http://swift.openstack.org/">Object Storage Developer Documentation <span class="tag">Swift</span></a></h4><p>Online developer documentation for OpenStack Object Storage (Swift)</p></li>
-			<li><h4><a href="http://glance.openstack.org/">Image Service Developer Documentation <span class="tag">Glance</span></a></h4><p>Online developer documentation for OpenStack Image Service (Glance)</p></li>
-			<li><h4><a href="http://keystone.openstack.org/">Identity Service Developer Documentation <span class="tag">Keystone</span></a></h4><p>Online developer documentation for OpenStack Identity Service (Keystone)</p></li>
-			<li><h4><a href="http://horizon.openstack.org/">Dashboard Contributor Documentation <span class="tag">Horizon</span></a></h4><p>Online contributor documentation for OpenStack Dashboard (Horizon)</p></li>
-			<li><h4><a href="http://wiki.openstack.org/">Project Documentation, Specifications, Draft Docs</a></h4><p>The OpenStack developer wiki</p></li>
-		</ul>
-	    
-    </div>
     	
 </div>
 
@@ -183,7 +177,7 @@
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
 
-<script src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
+<script src="/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
 </script>
 
 
@@ -219,4 +213,4 @@
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>

API Documentation
API Developer Reference Online reference for the OpenStack APIs
OpenStack Compute Developer Guide API 2