diff --git a/_data/docs.yml b/_data/docs.yml
index bb0b08f0ea..9e74b4adb2 100644
--- a/_data/docs.yml
+++ b/_data/docs.yml
@@ -34,9 +34,3 @@
   - octaveinterfacereference
   - regressiontestsystem
   - commandlineparameters
-
-- title: Other
-  docs:
-  - contact
-  - about
-
diff --git a/_data/project.yml b/_data/project.yml
new file mode 100644
index 0000000000..d4c7d13004
--- /dev/null
+++ b/_data/project.yml
@@ -0,0 +1,9 @@
+- title: Project
+  docs:
+  - testimonials
+  - roadmap
+  - contact
+  - about
+- title: Download
+  docs:
+  - download
diff --git a/_includes/footer.html b/_includes/footer.html
index 83145ef283..b44fbddb66 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,7 +2,7 @@
   <div class="grid">
     <div class="unit one-third center-on-mobiles">
         <p>
-	        <a href="{{ site.baseurl }}/docs/about">About</a><br>
+	        <a href="{{ site.baseurl }}/project/about">About</a><br>
         </p>
     </div>
      <div class="unit one-third align-center">
@@ -13,7 +13,7 @@
     </div>
     <div class="unit one-third align-right center-on-mobiles">
       <p>
-        <a href="{{ site.baseurl }}/docs/contact">Contact</a>
+        <a href="{{ site.baseurl }}/project/contact">Contact</a>
       </p>
     </div>
   </div>
diff --git a/_includes/news_contents.html b/_includes/news_contents.html
index 63c1af1cf8..ea4218fa0f 100644
--- a/_includes/news_contents.html
+++ b/_includes/news_contents.html
@@ -1,4 +1,4 @@
-<div class="unit one-fifth hide-on-mobiles">
+<div class="unit one-fifth hide-on-mobiles">
   <aside>
     <ul>
       <li class="{% if page.title == 'News' %}current{% endif %}">
@@ -10,11 +10,21 @@
     </ul>
     <h4>Recent Releases</h4>
     <ul>
-      {% for post in site.posts limit:5 %}
+      {% for post in site.categories.release limit:5 %}
       <li class="{% if page.title == post.title %}current{% endif %}">
         <a href="{{ site.baseurl }}{{ post.url }}">Version {{ post.version }}</a>
       </li>
       {% endfor %}
     </ul>
+    <h4>Other News</h4>
+    <ul>
+        {% for post in site.posts %}
+        {% unless post.categories contains 'release' %}
+        <li class="{% if page.title == post.title %}current{% endif %}">
+          <a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
+        </li>
+        {% endunless %}
+        {% endfor %}
+    </ul>
   </aside>
 </div>
diff --git a/_includes/primary-nav-items.html b/_includes/primary-nav-items.html
index 4dc35ce2bf..f70d16d541 100644
--- a/_includes/primary-nav-items.html
+++ b/_includes/primary-nav-items.html
@@ -1,14 +1,17 @@
-<ul>
+<ul style="line-height: 150%;" >
   <li class="{% if page.overview %}current{% endif %}">
     <a href="{{ site.baseurl }}/">Home</a>
   </li>
   <li class="{% if page.url contains '/docs/' %}current{% endif %}">
     <a href="{{ site.baseurl }}/docs/home/">Doc<span class="show-on-mobiles">s</span><span class="hide-on-mobiles">umentation</span></a>
   </li>
-  <li class="{% if page.author %}current{% endif %}">
-    <a href="{{ site.baseurl }}/news/">Download</a>
+  <li class="{%unless page.url contains '/download/' %}{% if page.url contains '/project/' %}current{% endif %}{% endunless %}">
+    <a href="{{ site.baseurl }}/project/about/">Project</a>
   </li>
-  <li>
-    <a href="{{ site.repository }}"><span class="hide-on-mobiles">View on </span>GitHub</a>
+  <li class="{% if page.author %}current{% endif %}">
+    <a href="{{ site.baseurl }}/news/">News</a>
+  </li>
+  <li class="{% if page.url contains '/download/' %}current{% endif %}">
+    <a href="{{ site.baseurl }}/project/download/">Download</a>
   </li>
 </ul>
diff --git a/_includes/project_contents.html b/_includes/project_contents.html
new file mode 100644
index 0000000000..961b75e4a7
--- /dev/null
+++ b/_includes/project_contents.html
@@ -0,0 +1,8 @@
+<div class="unit one-fifth hide-on-mobiles">
+  <aside>
+    {% for section in site.data.project %}
+    <h4>{{ section.title }}</h4>
+    {% include project_ul.html items=section.docs %}
+    {% endfor %}
+  </aside>
+</div>
diff --git a/_includes/project_contents_mobile.html b/_includes/project_contents_mobile.html
new file mode 100644
index 0000000000..aa75fc28e5
--- /dev/null
+++ b/_includes/project_contents_mobile.html
@@ -0,0 +1,10 @@
+<div class="docs-nav-mobile unit whole show-on-mobiles">
+  <select onchange="if (this.value) window.location.href=this.value">
+    <option value="">Navigate the project…</option>
+    {% for section in site.data.project %}
+    <optgroup label="{{ section.title }}">
+      {% include project_option.html items=section.docs %}
+    </optgroup>
+    {% endfor %}
+  </select>
+</div>
diff --git a/_includes/project_option.html b/_includes/project_option.html
new file mode 100644
index 0000000000..06c40602f4
--- /dev/null
+++ b/_includes/project_option.html
@@ -0,0 +1,11 @@
+{% assign items = include.items %}
+
+{% for item in items %}
+  {% assign item_url = item | prepend:"/project/" | append:"/" %}
+
+  {% for p in site.pages %}
+    {% if p.url == item_url %}
+      <option value="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</option>
+    {% endif %}
+  {% endfor %}
+{% endfor %}
diff --git a/_includes/project_ul.html b/_includes/project_ul.html
new file mode 100644
index 0000000000..bddc6d9461
--- /dev/null
+++ b/_includes/project_ul.html
@@ -0,0 +1,20 @@
+{% assign items = include.items %}
+
+<ul>
+{% for item in items %}
+  {% assign item_url = item | prepend:"/project/" | append:"/" %}
+
+  {% if item_url == page.url %}
+    {% assign c = "current" %}
+  {% else %}
+    {% assign c = "" %}
+  {% endif %}
+
+  {% for p in site.pages %}
+    {% if p.url == item_url %}
+      <li class="{{ c }}"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></li>
+    {% endif %}
+  {% endfor %}
+
+{% endfor %}
+</ul>
diff --git a/_layouts/project.html b/_layouts/project.html
new file mode 100644
index 0000000000..9705ae823d
--- /dev/null
+++ b/_layouts/project.html
@@ -0,0 +1,25 @@
+---
+layout: default
+---
+
+ <section class="docs">
+    <div class="grid">
+
+      {% include project_contents_mobile.html %}
+
+      <div class="unit four-fifths">
+        <article>
+          <h1>{{ page.title }}</h1>
+		  <div class ="post-content">
+				  {{ content }}
+		  </div>
+        </article>
+      </div>
+
+      {% include project_contents.html %}
+
+      <div class="clear"></div>
+
+    </div>
+  </section>
+
diff --git a/_posts/2016-04-01-flow-diagnostics-project.md b/_posts/2016-04-01-flow-diagnostics-project.md
new file mode 100644
index 0000000000..9c9bbae0a5
--- /dev/null
+++ b/_posts/2016-04-01-flow-diagnostics-project.md
@@ -0,0 +1,18 @@
+---
+layout: news_item
+title: "Flow Diagnostics Project"
+date: "2016-04-01 16:00:00 +0200"
+author: magnesj
+categories: 
+  - community
+---
+
+We are happy to announce a new development project for ResInsight named **Flow Diagnostics**, which will be delivered to Statoil Petroleum AS in 2017.
+
+The main goal of this project is to implement selected functionality of the flow diagnostics module from the **The Matlab Reservoir Simulation Toolbox – MRST** developed by SINTEF. Flow diagnostics capability will allow for interactive numerical flow experiments for probing a reservoir model, establish connections and basic volume estimates, and quickly provide a qualitative picture of the flow patterns in the reservoir.
+
+In addition, plotting of curves based on data from Eclipse Summary files will be implemented.
+
+See [Roadmap]({{ site.baseurl }}/project/roadmap) for more info.
+
+[MRST project at SINTEF](http://www.sintef.no/projectweb/mrst/modules/diagnostics/)
diff --git a/docs/BuildInstructions.md b/docs/BuildInstructions.md
index e56081df79..1a192bd940 100644
--- a/docs/BuildInstructions.md
+++ b/docs/BuildInstructions.md
@@ -5,6 +5,8 @@ permalink: /docs/buildinstructions/
 published: true
 ---
 
+## Source code
+The source code is hosted at [GitHub](https://github.com/opm/resinsight)
 
 ## CMake configuration
 
diff --git a/docs/about.md b/docs/about.md
deleted file mode 100644
index 02e46627fe..0000000000
--- a/docs/about.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: docs
-title: About
-permalink: /docs/about/
-published: true
----
-
-
-<p/>
-
-### Project organization
-The project was initiated by Statoil ASA in 2011. ResInsight was initially developed by Ceetron AS, and the development responsibility was handed over to Ceetron Solutions AS in 2013.
-
-### Licensing
-The software is copyrighted by Statoil ASA, Ceetron Solutions AS and Ceetron AS. The software is licensed under GPL 3+, see [Licensing details](https://github.com/OPM/ResInsight/blob/master/COPYING) for more.
-
-#### Project hosting
-The software is hosted at [GitHub](https://github.com/OPM/ResInsight)
-
-#### Web site programming and design
-The programming and design of this site is based on work by [Tom Preston-Werner](http://tom.preston-werner.com/). This is also the current theme of [Jekyll](http://jekyllrb.com/).
diff --git a/docs/contact.md b/docs/contact.md
deleted file mode 100644
index e2baf1ef10..0000000000
--- a/docs/contact.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: docs
-title: Contact
-permalink: /docs/contact/
-published: true
----
-
-For inquiries for new features,enhancements or support and maintenance agreements, please contact us for an offer:
-
-[Ceetron Solutions AS](http://www.ceetronsolutions.com) <br>
-Phone: +47 73 60 43 00 <br>
-e-mail: info@ceetronsolutions.com <br>
-
-
-Bug reports and general feature requests can be filed directly on [GitHub](https://github.com/OPM/ResInsight/issues?state=open)
-
-
-
diff --git a/index.html b/index.html
index 7363abee52..c4b515718c 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,13 @@
 ---
 layout: default
-title: ResInsight &bull; Fast and Free 3D Visualization of ECLIPSE and ABAQUS Reservoir Simulations
+title: ResInsight &bull; 3D viewer and post processing of reservoir models
 overview: true
 ---
 
 <section class="intro">
   <div class="grid">
     <div class="unit whole center-on-mobiles">
-      <p class="first">Fast and Free 3D Visualization of ECLIPSE and ABAQUS<sup>[1]</sup> Reservoir Simulations</p>
+      <p class="first">Fast and Free 3D Visualization of Reservoir Simulations</p>
     </div>
     <div class="post-content">
 	  <img src="{{ site.baseurl }}/images/FrontPageImage.png" alt="Reservoir" />
@@ -21,10 +21,8 @@ overview: true
       <p>
         &#x2713; Hazzle free<br>
         &#x2713; Starts in an instant<br>
-        &#x2713; Reads large Eclipse cases<br>
-        &#x2713; Handles more than 10 mill cells on a normal desktop<br>
+        &#x2713; Efficient handling of large Eclipse cases<br>
       </p>
-      
     </div>
     <div class="unit one-third">
       <h2>Unique Features</h2>
@@ -32,10 +30,9 @@ overview: true
         &#x2713; NNC visualization<br>
         &#x2713; Cell Edge Coloring<br>
         &#x2713; Detailed MSW visualization<br>
-        &#x2713; Combined XYZ properties<br>
-        &#x2713; Seemless integration to <a href="http://www.gnu.org/software/octave/"> Octave</a><br>
+        &#x2713; Seemless <a href="http://www.gnu.org/software/octave/"> Octave</a> integration<br>
+        &#x2713; Supports geomechanical ABAQUS simulations<br>
       </p>
-      
     </div>
     <div class="unit one-third">
       <h2>Getting started</h2>
@@ -44,12 +41,13 @@ overview: true
       </p>
       <a href="{{ site.baseurl }}/docs/installation/">Installation &rarr;</a><br>
       <a href="{{ site.baseurl }}/docs/gettingstarted/">Getting Started &rarr;</a>
-    </div>
-
+      </div>
     <div class="clear"></div>
-      <small>[1] Support for ABAQUS ODB-files is not included by default. See <a href="{{ site.baseurl }}/docs/odbsupport/">Odb-support</a> for more information.
-      </small>
-
+  </div>
+  
+  <div class="grid">
+    <div class="unit whole center-on-mobiles">
+      <p>Here are some words from a few of the happy ResInsight users <a href="{{ site.baseurl }}/project/testimonials/">Testimonials &rarr;</a> </p>
+    </div>
   </div>
 </section>
-
diff --git a/project/about.md b/project/about.md
new file mode 100644
index 0000000000..0c0e46f6c2
--- /dev/null
+++ b/project/about.md
@@ -0,0 +1,22 @@
+---
+layout: project
+title: About
+permalink: /project/about/
+published: true
+---
+
+
+### Project organization
+The development of ResInsight was initiated by Statoil Petroleum AS in 2011 following a series of projects. ResInsight is still under active development, c.f. [ Roadmap ]({{ site.baseurl }}/project/roadmap). Ceetron Solutions AS is responsible for the software development work.
+
+ResInsight is part of the [Open Porous Media](http://opm-project.org/) project.
+
+
+### Licensing
+The software is copyrighted by Statoil ASA, Ceetron Solutions AS and Ceetron AS. The software is licensed under GPL 3+, see [Licensing details](https://github.com/OPM/ResInsight/blob/master/COPYING).
+
+### Project hosting
+The software is hosted at [GitHub](https://github.com/OPM/ResInsight)
+
+### Web site programming and design
+The programming and design of this site is based on work by [Tom Preston-Werner](http://tom.preston-werner.com/). This is also the current theme of [Jekyll](http://jekyllrb.com/), the publishing engine used to produce content of [GitHub Pages](https://pages.github.com/).
diff --git a/project/contact.md b/project/contact.md
new file mode 100644
index 0000000000..86f143a1c5
--- /dev/null
+++ b/project/contact.md
@@ -0,0 +1,27 @@
+---
+layout: project
+title: Contact
+permalink: /project/contact/
+published: true
+---
+
+For inquiries for new features,enhancements or support and maintenance agreements, please contact us for an offer:
+
+Web : [Ceetron Solutions AS](http://www.ceetronsolutions.com) <br>
+Phone : +47 73 60 43 00 <br>
+e-mail : info@ceetronsolutions.com
+
+Bug reports and general feature requests can be filed directly on [GitHub](https://github.com/OPM/ResInsight/issues?state=open)
+
+## Newsletter subscription
+By subscribing to the **ResInsight Newsletter** you will get notified when new releases are available. Please use the button below to send a request for subscription mail.
+
+<div class="grid">
+  <nav class="main-nav">
+    <ul>
+      <li class="current">
+        <a href="mailto:info@ceetronsolutions.com?subject=ResInsight newsletter subscription&body=Hi ResInsight administrator, I would like to subscribe to the ResInsight newsletter.">Subscribe</a>
+      </li>
+    </ul>
+  </nav>
+</div>
diff --git a/project/download.md b/project/download.md
new file mode 100644
index 0000000000..84fc6b99e3
--- /dev/null
+++ b/project/download.md
@@ -0,0 +1,12 @@
+---
+layout: project
+title: Downloads
+permalink: /project/download/
+published: true
+---
+
+Windows : [ResInsight-bin-1.6.0-win64.zip](https://github.com/OPM/ResInsight/releases/download/v1.6.0/ResInsight-bin-1.6.0-win64.zip) (17.9 MB)
+
+Linux - RHEL6 : [ResInsight-bin-1.6.0-el6.tar.gz](https://github.com/OPM/ResInsight/releases/download/v1.6.0/ResInsight-bin-1.6.0-el6.tar.gz) (16 MB)
+
+For older versions, releasenotes and source code, please visit [ResInsight on Github](https://github.com/OPM/ResInsight/releases/)
diff --git a/project/roadmap.md b/project/roadmap.md
new file mode 100644
index 0000000000..2c2e05a804
--- /dev/null
+++ b/project/roadmap.md
@@ -0,0 +1,30 @@
+---
+layout: project
+title: Roadmap
+permalink: /project/roadmap/
+published: true
+---
+
+
+<p/>
+
+## Ongoing activities
+The following main features are part of ongoing development activities:
+
+### Planned delivery Q4 2016
+
+* Support for 2D plots based on data from Eclipse Summary files
+* Improve Eclipse input file parsing by using opm-parser
+
+### Planned delivery Q1 2017
+
+* Implementation of selected features from [MRST](http://www.sintef.no/projectweb/mrst/) (developed by SINTEF)
+* New visualization features based on flow diagnostics data
+
+## Candidate features for future projects
+
+The following lists a few project propolsals that have been up for discussion
+
+* Visualization of seismic data
+* Support for selected well planning features
+* Improvements related to visualization of ABAQUS reservoir models
diff --git a/project/testimonials.md b/project/testimonials.md
new file mode 100644
index 0000000000..f4548cbe01
--- /dev/null
+++ b/project/testimonials.md
@@ -0,0 +1,12 @@
+---
+layout: project
+title: Testimonials
+permalink: /project/testimonials/
+published: true
+---
+
+*“I have been using ResInsight now for some time and have stopped using the commercial software as ResInsight is much more responsive and easier to use. It really is an excellent piece of software.”*
+
+**David Baxendale<br>
+Senior Petroleum Engineering Advisor, RPS Energy**
+