diff --git a/Gemfile b/Gemfile
index 9d11303cd0e477437bb4f22d70f58c7986143fd6..656941c1dc65bc7cefc58ca4eb460ebe856f0ec7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,8 +4,7 @@ gem 'rake'
 gem 'jekyll'
 
 group :default, :jekyll_plugins do
-#  gem 'jekyll-scholar'
-  gem 'jekyll-scholar', :git => 'https://github.com/edgemaster/jekyll-scholar.git', :branch => 'master'
+  gem 'jekyll-scholar'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index e19d68897ced655820ee3f1d46ec0a30f8b38266..6699a3f4aab234709ef5ede38ea7a56c0500640f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,3 @@
-GIT
-  remote: https://github.com/edgemaster/jekyll-scholar.git
-  revision: 867c1f71c4a0f76e08cceb2b2a012243c83ecceb
-  branch: master
-  specs:
-    jekyll-scholar (5.7.0)
-      bibtex-ruby (~> 4.0, >= 4.0.13)
-      citeproc-ruby (~> 1.0)
-      csl-styles (~> 1.0)
-      jekyll (~> 3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -56,6 +45,11 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
+    jekyll-scholar (5.7.1)
+      bibtex-ruby (~> 4.0, >= 4.0.13)
+      citeproc-ruby (~> 1.0)
+      csl-styles (~> 1.0)
+      jekyll (~> 3.0)
     jekyll-watch (1.3.1)
       listen (~> 3.0)
     json (1.8.3)
@@ -63,9 +57,9 @@ GEM
     latex-decode (0.2.2)
       unicode (~> 0.4)
     liquid (3.0.6)
-    listen (3.0.5)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+      rb-inotify (>= 0.9.7)
     mercenary (0.3.5)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
@@ -75,7 +69,7 @@ GEM
     parallel (1.6.1)
     rake (10.5.0)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rouge (1.10.1)
     safe_yaml (1.0.4)
@@ -94,7 +88,7 @@ PLATFORMS
 DEPENDENCIES
   html-proofer
   jekyll
-  jekyll-scholar!
+  jekyll-scholar
   rake
 
 BUNDLED WITH
diff --git a/_config.yml b/_config.yml
index 26b1b41ee28209a8e740d00895d50e2dcbc8308f..93fa063ff63590d51b3044ccc241352c60ea3580 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,13 +18,15 @@ exclude:
 collections:
   people:
     output: true
+  research:
+    output: true
 
 defaults:
   -
     scope:
       path: ""
     values:
-      layout: "page"
+      layout: page
       menu: false
       menu_order: 9
   -
@@ -33,6 +35,12 @@ defaults:
       type: people
     values:
       layout: person
+  -
+    scope:
+      path: ""
+      type: research
+    values:
+      layout: research
 
 scholar:
   source: publications
diff --git a/_layouts/home.html b/_layouts/home.html
new file mode 100644
index 0000000000000000000000000000000000000000..befaf2990aac4308e4b5d1574a385567f120ad21
--- /dev/null
+++ b/_layouts/home.html
@@ -0,0 +1,27 @@
+---
+layout: default
+---
+<div class="jumbotron">
+  <div class="lead">
+    {{ content }}
+  </div>
+  <a class="btn btn-primary btn-lg" href="{{ site.pages | where:'title','Research' | map:'url' }}">Our Research</a>
+</div>
+
+
+<div class="row">
+  <div class="col-sm-6">
+    <h2>News</h2>
+      {% for post in site.posts %}
+      <h3 class="blog-post-title"><a href="{{ post.url }}">{{ post.title }}</a></h3>
+      <p class="blog-post-meta">{{ post.date | date: "%b %-d, %Y" }}</p>
+      {{ post.excerpt}}
+      {% endfor %}
+    </div>
+
+  <div class="col-sm-6">
+    <h2>Recent Publications</h2>
+    {% bibliography --max 5 %}
+  </div>
+</div>
+
diff --git a/advert.md b/_posts/2016-02-18-advert.md
similarity index 93%
rename from advert.md
rename to _posts/2016-02-18-advert.md
index 1c92ffdf41c19791205aa36ca37e3da7efa919fe..b9ebef574b592fa75a8ba355dc736ddac21eba49 100644
--- a/advert.md
+++ b/_posts/2016-02-18-advert.md
@@ -1,11 +1,6 @@
 ---
-title: Job Announcements
-menu: true
-menu_order: 10
+title: Two new postdoc positions at Imperial College!
 ---
-
-<h4> Two new postdoc positions at Imperial College! </h4> 
-
 We are seeking two outstanding postdocs (one dominantly theoretical, one 
 dominantly practical) with strong interests in the formal specification and 
 verification of concurrent and distributed systems to join the Program 
diff --git a/_research/concurrency.md b/_research/concurrency.md
index 1ee85df7dc91e86d8e1de4533d968ee7febaf311..0df63bbf98e20bab9aec6af35d72b51bff9ae4bb 100644
--- a/_research/concurrency.md
+++ b/_research/concurrency.md
@@ -7,7 +7,7 @@ Concurrent programs and libraries are ubiquitous in today's world of multi-core
 and the need for reasoning about concurrent programs and verifying their correctness grows 
 increasingly more important. These research problems are still considered difficult for a variety of reasons,
 such as the fact that we need to consider and reach conclusions about a shared state 
-affected by multiple threads, or that we require effective abstractions for describing the complex behaviour created by multiple threads.
+affected by multiple threads.
 
 Our research agenda is to develop formal reasoning methods about concurrency with a focus on concurrent program logics.
 Recently, various logics based on separation logic were introduced with the aim of verifying functional correctness of fine-grained concurrent programs.
diff --git a/_research/javascript.md b/_research/javascript.md
new file mode 100644
index 0000000000000000000000000000000000000000..f8273dc84b2272f8a99d2f4322472253bf4ee395
--- /dev/null
+++ b/_research/javascript.md
@@ -0,0 +1,5 @@
+---
+title: JavaScript
+project_id: javascript
+---
+
diff --git a/favicon.ico b/favicon.ico
index c0a2c269f1b819799237c166b307f0af962a6067..1e4580ad1e0f2050475dd8f6829697af2eea2d42 100644
Binary files a/favicon.ico and b/favicon.ico differ
diff --git a/index.md b/index.md
index a6bd718d13a56555bd0e80a9f4f3c4229bf26add..b2054a0e5f7dbb8057db82fc4668f140b154b769 100644
--- a/index.md
+++ b/index.md
@@ -1,19 +1,8 @@
 ---
+layout: home
 title: Home
 menu: true
 menu_order: 1
 ---
+One paragraph about the group and its research, about 4 lines of text would be good here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ante enim, bibendum vitae vestibulum in, luctus et diam. Quisque pulvinar accumsan nisl, et lobortis enim euismod quis. Praesent pulvinar nulla justo, ut vulputate leo blandit sit amet. Mauris fringilla sodales nulla at porta. Vivamus ligula leo, ultrices ut quam sit amet, ullamcorper volutpat magna. Quisque consequat, sem in lobortis scelerisque, quam turpis ornare odio, auctor congue nisi velit in dolor. Curabitur auctor fermentum eros at dictum.
 
-Concurrent programs and libraries are ubiquitous in today's world of multi-core processor architectures, 
-and the need for reasoning about concurrent programs and verifying their correctness grows 
-increasingly more important. These research problems are still considered difficult for a variety of reasons,
-such as the fact that we need to consider and reach conclusions about a shared state 
-affected by multiple threads, or [another reason].
-
-Our research agenda is to develop formal reasoning methods about concurrency with a focus on concurrent program logics.
-Recently, various logics based on separation logic were introduced with the aim of verifying functional correctness of fine-grained concurrent programs.
-We have played a significant role in the development of {% cite_details Dinsdale-Young2010Concurrent --text Concurrent Abstract Predicates %}, {% cite_details Dinsdale-Young2013Views --text Views %}, {% cite_details daRochaPinto2014TaDA --text TaDA %}, {% cite_details Raad2015CoLoSL --text CoLoSL %}, {% cite_details Ntzik2015Fault --text Fault-tolerant Concurrent Separation Logic %} and {% cite_details daRochaPinto2016Modular --text Total-TaDA %}.
-These logics have tackled a range of problems, including data abstraction, atomicity abstraction, fault-tolerance, terminal, while introducing more modular and compositional ways to reason about concurrent programs.
-We have applied these logics to the verification of large problems, such as data structures used in databases and java.util.concurrent, as well as the specification of file systems.
-
-Our mission is to continually challenge and improve the state-of-the-art, targeting progress properties, specification of concurrency in POSIX filesystems, refinement of our logics so that we are able to deal with more advanced algorithms, and the development of automated reasoning tools based on these logics.
diff --git a/people.html b/people.html
index 991455d0cefbf37c1447a327fa870841e869ebfb..f85c8eb3bc14df847b425aa16423fc10ed23d483 100644
--- a/people.html
+++ b/people.html
@@ -1,7 +1,6 @@
 ---
 title: People
 menu: true
-menu_order: 2
-permalink: /people/
+menu_order: 3
 ---
 {% include person-cards.html people=site.people %}
diff --git a/research.md b/research.md
new file mode 100644
index 0000000000000000000000000000000000000000..cbdd8a7adfa87ea2488efde67d96b0b57ad732df
--- /dev/null
+++ b/research.md
@@ -0,0 +1,14 @@
+---
+title: Research
+menu: true
+menu_order: 2
+---
+
+Details about the group's research, more than on the homepage. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ante enim, bibendum vitae vestibulum in, luctus et diam. Quisque pulvinar accumsan nisl, et lobortis enim euismod quis. Praesent pulvinar nulla justo, ut vulputate leo blandit sit amet. Mauris fringilla sodales nulla at porta. Vivamus ligula leo, ultrices ut quam sit amet, ullamcorper volutpat magna. Quisque consequat, sem in lobortis scelerisque, quam turpis ornare odio, auctor congue nisi velit in dolor. Curabitur auctor fermentum eros at dictum.
+
+{% for item in site.research %}
+<h3><a href="{{ item.url }}">{{ item.title }}</a></h3>
+{{ item.excerpt }}
+<p><a href="{{ item.url }}">Read more...</a></p>
+{% endfor %}
+