diff --git a/website/master/download.html.in b/website/master/download.html.in
index 566629e8..994ba5b5 100644
--- a/website/master/download.html.in
+++ b/website/master/download.html.in
@@ -9,7 +9,8 @@ __navbar__
     <h1>Download Exiv2</h1>
     <p class="lead">Two packages are available for download: the source
       distribution with the complete source code and a Windows package
-      with just the command line utility and manual page.
+      with just the command line utility and manual page. The current version
+      is __version__.
     </p>
   </div>
 </div><!-- /.jumbotron -->
@@ -49,6 +50,7 @@ __navbar__
 	  <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>&nbsp; Download source
 	</a>
       </p>
+      <p class="version text-center text-muted"><small>Currently v__version__</small></p>
     </div><!-- /.col-sm-6 -->
     <div class="col-sm-6">
       <p class="text-center">
@@ -56,6 +58,7 @@ __navbar__
 	  <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>&nbsp; Download exiv2.exe
 	</a>
       </p>
+      <p class="text-center text-muted"><small>Currently v__version__</small></p>
     </div><!-- /.col-sm-6 -->
   </div><!-- /.row -->
   <p>&nbsp;</p>
diff --git a/website/master/getting-started.html.in b/website/master/getting-started.html.in
index cd39ae3b..c796d579 100644
--- a/website/master/getting-started.html.in
+++ b/website/master/getting-started.html.in
@@ -6,33 +6,18 @@ __navbar__
 
     <div class="jumbotron">
       <div class="container">
-	__maintitle__
-	<p class="lead">Exiv2 is a <a href="#lib">C++ library</a> and a <a href="#util">command line utility</a>
-	  to manage image <a href="http://en.wikipedia.org/wiki/Metadata">metadata</a>.
-	  It provides fast and easy read and write access to the 
-	  <a href="http://en.wikipedia.org/wiki/Exif">Exif</a>, 
-	  <a href="http://en.wikipedia.org/wiki/IPTC">IPTC</a> and 
-	  <a href="http://en.wikipedia.org/wiki/Extensible_Metadata_Platform">XMP</a> metadata 
-	  of images in <a href="http://dev.exiv2.org/projects/exiv2/wiki/Supported_image_formats">various formats</a>.
-	  Exiv2 is available as <a href="download.html#license">free software</a> and with a 
-	  <a href="download.html#license">commercial license</a>, and is used in many projects.
+	<h1>Getting started</h1>
+	<p class="lead">An overview of the basic Exiv2 C++ library and command line utility features and the Exiv2 project,
+	  examples and more.
         </p>
-        <a href="download.html" class="btn btn-lg btn-success">
-	  <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>&nbsp; Download Exiv2
-	</a>
       </div>
     </div><!-- /.jumbotron -->
 
     <div class="container">
-      <div class="page-header">
-	<h1>Getting started</h1>
-      </div>
-
       <div class="row">
         <div class="col-sm-6">
 
 	  <h2 id="lib">Exiv2 library features</h2>
-
 	  <ul>
 	    <li>Fast read and write access to the Exif, IPTC, and XMP metadata of an image</li>
 	    <li>Easy to use and <a href="doc/index.html" title="Exiv2 API documentation">extensively documented</a> API</li>
@@ -83,26 +68,27 @@ __navbar__
 	  <a class="btn btn-primary" href="sample.html" role="button">Utility samples</a>
 	  <p>&nbsp;</p>
 
-	  <h2>Future plans</h2>
-	  <ul>
-	    <li>a unified metadata container</li>
-	    <li>support for additional image formats</li>
-	    <li>more Makernotes</li>
-	    <li>to support CMake on all platforms</li>
-	  </ul>
-	  <p>The <a href="http://dev.exiv2.org/projects/exiv2/roadmap">roadmap</a> has details for the upcoming version.</p>
         </div><!-- /.col-sm-6 -->
 
         <div class="col-sm-6">
 
 	  __whatsnew-latest__
 
+	  <p>&nbsp;</p>
 	  <div id="openhub_factoids">
-            <h2>Open HUB factoids</h2>
-<!--
+            <h2>Project factoids</h2>
+	    <p>Analyzed by Open HUB</p>
 	    <script type="text/javascript" src="http://www.openhub.net/p/13985/widgets/project_factoids.js"></script>
--->
 	  </div>
+
+	  <h2>Future plans</h2>
+	  <ul>
+	    <li>A unified metadata container</li>
+	    <li>Support for additional image formats</li>
+	    <li>More Makernotes</li>
+	    <li>CMake support for all platforms</li>
+	  </ul>
+	  <p>The <a href="http://dev.exiv2.org/projects/exiv2/roadmap">roadmap</a> has details for the upcoming version.</p>
         </div><!-- /.col-sm-6 -->
       </div><!-- /.row -->
 
diff --git a/website/master/index.html.in b/website/master/index.html.in
index 9d53c41f..4b67bcdc 100644
--- a/website/master/index.html.in
+++ b/website/master/index.html.in
@@ -1,88 +1,38 @@
 __doctype__
-<html>
-__header1__
+<html lang="en">
+__header4__
 <body>
-__sidebar1__
-
-<div id="content">
-__maintitle__
-<h2>Exiv2 Overview</h2>
-<p>Exiv2 is a <a href="#lib">C++ library</a> and a <a href="#util">command line utility</a>
-to manage image <a href="http://en.wikipedia.org/wiki/Metadata">metadata</a>.
-It provides fast and easy read and write access to the 
-<a href="http://en.wikipedia.org/wiki/Exif">Exif</a>, 
-<a href="http://en.wikipedia.org/wiki/IPTC">IPTC</a> and 
-<a href="http://en.wikipedia.org/wiki/Extensible_Metadata_Platform">XMP</a> metadata 
-of images in <a href="http://dev.exiv2.org/projects/exiv2/wiki/Supported_image_formats">various formats</a>.
-Exiv2 is available as <a href="download.html#license">free software</a> and with a 
-<a href="download.html#license">commercial license</a>, and is used in many projects</a>.</p>
-
-<p><a name="lib">The Exiv2 library provides</a></p>
-<ul>
- <li>
-
-  <table cellspacing="0" align="right" border="0" cellpadding="0">
-    <tr>
-      <td>
-        <div id="ohloh_factoids">
-          <script type="text/javascript" src="http://www.ohloh.net/p/13985/widgets/project_factoids.js"></script>
-        </div>
-      </td>
-    </tr>
-  </table>
-
-  fast read and write access to the Exif, IPTC, and XMP metadata 
-  of an image
-</li>
- <li>an easy to use and <a href="doc/index.html" title="Exiv2 API documentation">extensively documented</a> API</li>
- <li><a href="conversion.html" title="Exiv2 Conversions">conversions</a> of Exif and IPTC metadata to XMP and vice versa</li>
- <li>a smart IPTC implementation that does not affect data that programs like Photoshop store
-  in the same image segment</li>
- <li>Exif <a href="makernote.html" title="Exif Makernote Formats and Specifications">Makernote</a> support:
-  <ul>
-   <li>Makernote tags can be read and written just like any other metadata</li>
-   <li>a sophisticated write algorithm avoids corrupting the Makernote</li>
-  </ul>
- </li>
- <li>a simple interface to extract previews embedded in RAW images and Exif thumbnails</li>
- <li>set and delete methods for Exif thumbnails</li>
-</ul>
-
-<p>Examples: <a title="Reading and printing the Exif metadata of an image" href="example1.html">read Exif</a>;
-   <a title="Sample usage of high-level Exif metadata operations" href="example2.html">add, modify, delete Exif</a>;
-   <a title="Reading and printing the IPTC metadata of an image" href="example3.html">read IPTC</a>;
-   <a title="The quickest way to access, set or modify IPTC metadata" href="example4.html">set IPTC</a>;
-   <a title="Sample (test) usage of high level XMP classes" href="example5.html">set XMP</a>
-</p>
-
-<p><a name="util">Exiv2 is also a command line utility to</a></p>
-<ul>
- <li>print Exif, IPTC and XMP image metadata in different formats: Exif summary info, interpreted values,
-  or the plain data for each tag (a <a title="Sample Exiv2 utility output" href="sample.html">sample</a> is here)</li>
- <li><a title="Modify" href="sample.html#modify">set, add and delete</a> Exif, IPTC and XMP image metadata
-  from command line modify commands or command scripts</li>
- <li>adjust the Exif timestamp (that's how it all started...)</li>
- <li>rename Exif image files according to the Exif timestamp</li>
- <li>extract, insert and delete Exif, IPTC and XMP metadata and JPEG comments</li>
- <li><a href="conversion.html" title="Exiv2 Conversions">convert</a> from Exif and IPTC to XMP properties and vice versa</li>
-  <li>extract previews from RAW images and thumbnails from the Exif metadata</li>
- <li>insert and delete the thumbnail image embedded in the Exif metadata</li>
- <li>print, set and delete the JPEG comment of JPEG images</li>
- <li>fix the Exif ISO setting of picture taken with Canon and Nikon cameras</li>
-</ul>
-
-<p>Future plans include</p>
-<ul>
- <li>a unified metadata container</li>
- <li>support for additional image formats</li>
- <li>more Makernotes</li>
- <li>to support CMake on all platforms</li>
-</ul>
-<p>The <a href="http://dev.exiv2.org/projects/exiv2/roadmap">roadmap</a> has details for the upcoming version.</p>
-
-__footer__
-</div>
-<!-- closes content -->
-__tracker__
-</body>
+__navbar__
+
+    <div class="jumbotron">
+      <div class="container text-center">
+	<img src="include/exiv2.jpg" alt="Exiv2 home page">
+	__maintitle__
+	<p class="lead">Exiv2 is a <a href="getting-started.html#lib">C++ library</a> and a <a href="getting-started.html#util">command line utility</a>
+	  to manage image <a href="http://en.wikipedia.org/wiki/Metadata">metadata</a>.
+	  It provides fast and easy read and write access to the 
+	  <a href="http://en.wikipedia.org/wiki/Exif">Exif</a>, 
+	  <a href="http://en.wikipedia.org/wiki/IPTC">IPTC</a> and 
+	  <a href="http://en.wikipedia.org/wiki/Extensible_Metadata_Platform">XMP</a> metadata 
+	  of images in <a href="http://dev.exiv2.org/projects/exiv2/wiki/Supported_image_formats">various formats</a>.
+	  Exiv2 is available as <a href="download.html#license">free software</a> and with a 
+	  <a href="download.html#license">commercial license</a>, and is used in many projects.
+	  <br>
+	  &nbsp;
+        </p>
+        <a href="download.html" class="btn btn-lg btn-success">
+	  <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>&nbsp; Download Exiv2
+	</a>
+      </div>
+    </div><!-- /.jumbotron -->
+
+    <div class="container">
+
+      __footer__
+
+    </div><!-- /.container -->
+
+    __bootstrap__
+
+  </body>
 </html>
diff --git a/website/var/__navbar__ b/website/var/__navbar__
index a54d5a8f..04ed7247 100644
--- a/website/var/__navbar__
+++ b/website/var/__navbar__
@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="http://www.exiv2.org/">Exiv2</a>
+      <a class="navbar-brand" href="index.html">Exiv2</a>
     </div>
     <div id="navbar" class="collapse navbar-collapse">
       <ul class="nav navbar-nav">