diff --git a/css/style.css b/css/style.css
index b540e98..e1ad90d 100644
--- a/css/style.css
+++ b/css/style.css
@@ -260,12 +260,12 @@
 }
 #clients .container {
 	padding-top: 30px;
-	padding-bottom: 80px;
+	padding-bottom: 10px;
     background: #fffff0;
 }
 
 #getting-started .container, #contributing .container {
-	padding-top: 80px;
+	padding-top: 10px;
 	padding-bottom: 80px;
     background: #fffff0;
 }
@@ -279,7 +279,7 @@
 #noteworthy .container{
 	margin-top: 30px;
     padding-top: 60px;
-    padding-bottom: 100px;
+    padding-bottom: 40px;
     background: #fffff0;
 }
 
diff --git a/index.php b/index.php
index 907b735..85e2af8 100644
--- a/index.php
+++ b/index.php
@@ -1 +1,90 @@
-<?php header('Location: http://www.eclipse.org/projects/project.php?id=technology.mosquitto'); ?>
\ No newline at end of file
+<?php include '_includes/bare_header.php' ?>
+    <!--  Intro  -->
+        <div id="intro">
+            <div class="container">
+                <div class="row">
+                    <!-- <div class="offset1 span10" style="position: relative"><img src="images/mosquitto_logo_400.png" /></div> -->
+                    <div class="offset1 span10" style="position: relative">
+					<!-- <img src="images/mosquitto_logo_400.png" /> -->
+                    <!-- <div class="span5"> -->
+					<!-- <div class="row"> -->
+                    <div class="offset1 span5">
+						<img src="/mosquitto/images/mosquitto-145x100.png" style="position: absolute; bottom: 0; left: 0;" />
+						<a
+						href="http://www.eclipse.org/projects/what-is-incubation.php"
+						target="_blank"><img class="hidden-phone pull-right"
+						src='/mosquitto/images/incubation.png' style="position:
+						absolute; bottom: 0; right: 0; height: 100px; opacity:
+						0.4;" alt="Eclipse Incubation egg"></a>
+                        <p class="lead">
+							The Mosquitto project provides an open-source
+							implementation of an MQTT broker.
+                        </p>
+                    </div>
+                    </div>
+                    <!-- </div> -->
+                </div>
+            </div>
+        </div>
+
+        <div id="noteworthy">
+            <div class="container">
+                <div class="row">
+                    <div class="offset1 span5 feature-box">
+                        <div><h2>Broker</h2></div>
+						<p>The Mosquitto broker is the focus of the project and
+						aims to be a lightweight and function MQTT broker that
+						can run on relatively constrained systems, but still be
+						powerful enough for a wide range of applications.</p>
+                    </div>
+                    <div class="span5 feature-box">
+                        <div><h2>Client utilities</h2></div>
+						<p>The mosquitto_pub and mosquitto_sub command line
+						utilities provide a straightforward and powerful way of
+						interacting with your broker. The client library that
+						the utilities use for their MQTT support can be used to
+						develop your own MQTT applications.</p>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="offset1 span10">
+                        <div><h3>News</h3></div>
+						<p>Please note the website is in transition. In 
+						addition to the information found here, please see <a 
+						href="http://mosquitto.org/">http://mosquitto.org/</a>.</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div id="contributing">
+            <div class="container">
+                <div class="row">
+                    <div class="offset1 span8">
+                        <h3>Contributing</h3>
+                        <h4>Raising bugs</h4>
+                        <p class="lead">
+                            The Mosquitto bug tracker is available <a href="https://bugs.eclipse.org/bugs/describecomponents.cgi?product=Mosquitto">here</a>.
+                            There is a general <a href="https://wiki.eclipse.org/Bug_Reporting_FAQ">FAQ</a> to help you get started with bugzilla.
+                        </p>
+                        <h4>Asking questions</h4>
+                        <p class="lead">
+                            You can ask questions on the <a href="https://dev.eclipse.org/mailman/listinfo/mosquitto-dev">mailing list</a>.
+                        </p>
+                        <h4>Contributing fixes</h4>
+                        <p class="lead">
+                            An overview of the contribution process is <a href="https://wiki.eclipse.org/Development_Resources/Contributing_via_Git">here</a>. The key points are:
+                            <ol class="lead">
+                                <li>Ensure you have signed the Eclipse Foundation Contributor License Agreement (CLA)</li>
+                                <li>Fork the git repository of the component you want to contribute to</li>
+                                <li>Fix the issue and add suitable tests</li>
+                                <li>Ensure your contribution is collapsed into a single commit</li>
+                                <li>Submit your contribution to the corresponding gerrit repository</li>
+                            </ol>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </div>
+<?php include '_includes/bare_footer.php' ?>