diff --git a/README.md b/README.md
index 1c17e65..24d2092 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,12 @@
-# CheerpJ - Convert Java to WebAssembly and JavaScript
+---
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
+#layout: home
+title: CheerpJ - Convert Java to WebAssembly and JavaScript
+permalink: /
+---
+
 [![Gitter chat](https://badges.gitter.im/leaningtech/cheerpj.svg)](https://gitter.im/leaningtech/cheerpj)
 [![GitHub Issues](https://img.shields.io/github/issues/leaningtech/cheerpj-meta.svg)](https://github.com/leaningtech/cheerpj-meta/issues)
 [![Live Demos](https://img.shields.io/badge/demo-online-green.svg)](https://leaningtech.com/cheerpj/)
diff --git a/_config.yml b/_config.yml
index b4bb421..dfb562f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,6 +29,8 @@ social_links:
   linkedin: leaning-technologies-Ltd
 
 download: "https://leaningtech.com/cheerpj-download/"
+licence: "https://leaningtech.com/cheerpj-licensing/"
+demo: "https://leaningtech.com/demo/?cheerpjfilter"
 
 # Build settings
 markdown: kramdown
@@ -48,7 +50,7 @@ website: https://leaningtech.com/cheerpj/
 issues: https://github.com/leaningtech/cheerpj-meta/issues
 chat: https://gitter.im/leaningtech/cheerpj
 blog: https://medium.com/leaningtech
-has_about: false
+has_about: true
 
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list
diff --git a/_includes/index-specific.html b/_includes/index-specific.html
new file mode 100644
index 0000000..5557806
--- /dev/null
+++ b/_includes/index-specific.html
@@ -0,0 +1,5 @@
+<ul>
+      {%- if site.download -%}<li><a href="{{site.download}}">Download</a></li>{%- endif -%}
+      {%- if site.licence -%}<li><a href="{{site.licence}}">Licencing</a></li>{%- endif -%}
+      {%- if site.demo -%}<li><a href="{{site.demo}}">Demo</a></li>{%- endif -%}
+</ul>
diff --git a/_includes/index.html b/_includes/index.html
new file mode 100644
index 0000000..032e983
--- /dev/null
+++ b/_includes/index.html
@@ -0,0 +1,22 @@
+<ul>
+  <li><a href="{{site.baseurl}}/">Home</a></li>
+  <li><a href="{{site.baseurl}}/pages/Getting-Started">Getting started</a>
+    <ul>
+      <li><a href="{{site.baseurl}}/pages/Tutorial">Tutorial</a></li>
+    </ul>
+  </li>
+  <li><a href="{{site.baseurl}}/pages/CheerpJ-demos">Demos</a></li>
+  <li><a href="{{site.baseurl}}/pages/Command-Line-Options">Command line options</a></li>
+  <li>APIs
+    <ul>
+      <li><a href="{{site.baseurl}}/pages/Runtime-API">Runtime API</a></li>
+      <li><a href="{{site.baseurl}}/pages/WebWorker-API">WebWorker API</a></li>
+      <li><a href="{{site.baseurl}}/pages/Startup-time-optimization">Startup time optimization</a></li>
+      <li><a href="{{site.baseurl}}/pages/File-System-support">File System support</a></li>
+      <li><a href="{{site.baseurl}}/pages/DOM-and-JavaScript-interoperability">DOM and JavaScript interoperability</a></li>
+      <li><a href="{{site.baseurl}}/pages/Implementing-Java-native-methods-in-JavaScript">Implementing Java native methods in JavaScript</a></li>
+    </ul>
+  </li>
+  <li><a href="{{site.baseurl}}/pages/Changelog">Changelog</a></li>
+  <li><a href="{{site.baseurl}}/pages/Frequently-Asked-Questions">FAQs (Frequently asked questions)</a></li>
+</ul>