diff --git a/README.md b/README.md
index 4ebb646..718824e 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,7 @@
 [![Build Status](https://travis-ci.org/owntracks/frontend.svg?branch=master)](https://travis-ci.org/owntracks/frontend)
 [![License](https://img.shields.io/github/license/owntracks/frontend?color=d63e97)](https://github.com/owntracks/frontend/blob/master/LICENSE)
 
-<p style="text-align: center;">
-  <img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/owntracks-ui.png" alt="OwnTracks UI">
-</p>
+![OwnTracks UI](https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/owntracks-ui.png)
 
 ## Introduction
 
@@ -17,6 +15,8 @@ This is a web interface for [OwnTracks](https://github.com/owntracks/recorder) b
 a Vue.js single page application. The recorder itself already ships with some basic web
 pages, this is a more advanced interface with more functionality, all in one place.
 
+![Map features](https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/map-features.png)
+
 ## Installation
 
 ### Manually
@@ -108,17 +108,21 @@ Finally update `api.baseUrl` in your config to `"http://0.0.0.0:8888/https://own
 - Quickly fit all shown objects on the map into view
 - Display data in a specific date range
 - Filter by user and device
+- Download selected location data as JSON
 - Highly customisable
 
 ## Screenshots
 
-_Click to enlarge._
+<p align="center">
+  <img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/loading.gif" alt="Loading...">
+  <br>
+  <br>
+  <img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/downloader.png" alt="Download location data">
+  <br>
+  <br>
+  <img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/info.png" alt="Info">
+</p>
 
-<a href="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/live.png" target="_blank"><img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/live.png" alt="Live" height="200"></a>
-<a href="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/multiple.png" target="_blank"><img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/multiple.png" alt="Multiple" height="200"></a>
-<a href="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/date-selection.png" target="_blank"><img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/date-selection.png" alt="Date selection" height="200"></a>
-<a href="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/heatmap.png" target="_blank"><img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/heatmap.png" alt="Heatmap" height="200"></a>
-<a href="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/customized.png" target="_blank"><img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/customized.png" alt="Customized" height="200"></a>
 
 ## Contributing
 
diff --git a/docs/images/customized.png b/docs/images/customized.png
deleted file mode 100644
index 5cf8756..0000000
Binary files a/docs/images/customized.png and /dev/null differ
diff --git a/docs/images/date-selection.png b/docs/images/date-selection.png
deleted file mode 100644
index 7d94913..0000000
Binary files a/docs/images/date-selection.png and /dev/null differ
diff --git a/docs/images/downloader.png b/docs/images/downloader.png
new file mode 100644
index 0000000..5357721
Binary files /dev/null and b/docs/images/downloader.png differ
diff --git a/docs/images/heatmap.png b/docs/images/heatmap.png
deleted file mode 100644
index 2b66e61..0000000
Binary files a/docs/images/heatmap.png and /dev/null differ
diff --git a/docs/images/info.png b/docs/images/info.png
new file mode 100644
index 0000000..1b0625d
Binary files /dev/null and b/docs/images/info.png differ
diff --git a/docs/images/live.png b/docs/images/live.png
deleted file mode 100644
index f96c9a5..0000000
Binary files a/docs/images/live.png and /dev/null differ
diff --git a/docs/images/loading.gif b/docs/images/loading.gif
new file mode 100644
index 0000000..cbe5398
Binary files /dev/null and b/docs/images/loading.gif differ
diff --git a/docs/images/map-features.png b/docs/images/map-features.png
new file mode 100644
index 0000000..59af2b2
Binary files /dev/null and b/docs/images/map-features.png differ
diff --git a/docs/images/multiple.png b/docs/images/multiple.png
deleted file mode 100644
index e05a6d4..0000000
Binary files a/docs/images/multiple.png and /dev/null differ
diff --git a/docs/images/owntracks-ui.png b/docs/images/owntracks-ui.png
index 6e7054a..730cedb 100644
Binary files a/docs/images/owntracks-ui.png and b/docs/images/owntracks-ui.png differ