diff --git a/README.rst b/README.rst
index 1d62a34..cbc73e3 100644
--- a/README.rst
+++ b/README.rst
@@ -20,7 +20,7 @@ Because this project is powered by Flask we are restricted to:
     * Python 2.6
     * Python 2.7
 
-.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/node-v3.png
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/overview.png
    :alt: View of a node
    :width: 1024
    :height: 700
@@ -197,8 +197,32 @@ messages have a look at this post by `Tim Pope`_.
 Screenshots
 ===========
 
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/overview.png
+   :alt: Overview / Index / Homepage
+   :width: 1024
+   :height: 700
+   :align: center
+
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/nodes.png
+   :alt: Nodes view, all active nodes
+   :width: 1024
+   :height: 700
+   :align: center
+
 .. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/node.png
-   :alt: Node without experimental endpoints endabled
+   :alt: Single node page / overview
+   :width: 1024
+   :height: 700
+   :align: center
+
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/report.png
+   :alt: Report view
+   :width: 1024
+   :height: 700
+   :align: center
+
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/report_message.png
+   :alt: Report view with message
    :width: 1024
    :height: 700
    :align: center
@@ -209,26 +233,26 @@ Screenshots
    :height: 700
    :align: center
 
-.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/nodes.png
-   :alt: Nodes table without experimental endpoints enabled
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/fact.png
+   :alt: Single fact, with graphs
    :width: 1024
    :height: 700
    :align: center
 
-.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/overview.png
-   :alt: Overview / Index / Homepage
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/fact_value.png
+   :alt: All nodes that have this fact with that value
    :width: 1024
    :height: 700
    :align: center
 
 .. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/metrics.png
-   :alt: Query view
+   :alt: Metrics view
    :width: 1024
    :height: 700
    :align: center
 
 .. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/metric.png
-   :alt: Query view
+   :alt: Single metric
    :width: 1024
    :height: 700
    :align: center
@@ -239,23 +263,8 @@ Screenshots
    :height: 700
    :align: center
 
-API v3
-------
-           
-.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/nodes-v3.png
-   :alt: Nodes table with experimental endpoints enabled
-   :width: 1024
-   :height: 700
-   :align: center
-
-.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/node-v3.png
-   :alt: Node view with experimental endpoints enabled
-   :width: 1024
-   :height: 700
-   :align: center
-
-.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/report.png
-   :alt: Nodes table with experimental endpoints enabled
+.. image:: https://raw.github.com/nedap/puppetboard/master/screenshots/broken.png
+   :alt: Error page
    :width: 1024
    :height: 700
    :align: center
diff --git a/screenshots/fact.png b/screenshots/fact.png
new file mode 100644
index 0000000..0fff917
Binary files /dev/null and b/screenshots/fact.png differ
diff --git a/screenshots/fact_value.png b/screenshots/fact_value.png
new file mode 100644
index 0000000..ad42e69
Binary files /dev/null and b/screenshots/fact_value.png differ
diff --git a/screenshots/metric.png b/screenshots/metric.png
index 42d4f0b..3759e0d 100644
Binary files a/screenshots/metric.png and b/screenshots/metric.png differ
diff --git a/screenshots/node-v3.png b/screenshots/node-v3.png
deleted file mode 100644
index b2d3e2e..0000000
Binary files a/screenshots/node-v3.png and /dev/null differ
diff --git a/screenshots/node.png b/screenshots/node.png
index c3f3e34..1ea35b4 100644
Binary files a/screenshots/node.png and b/screenshots/node.png differ
diff --git a/screenshots/nodes-v3.png b/screenshots/nodes-v3.png
deleted file mode 100644
index 78aef96..0000000
Binary files a/screenshots/nodes-v3.png and /dev/null differ
diff --git a/screenshots/nodes.png b/screenshots/nodes.png
index 30583b4..947201f 100644
Binary files a/screenshots/nodes.png and b/screenshots/nodes.png differ
diff --git a/screenshots/overview.png b/screenshots/overview.png
index 1b04be1..9bcaa59 100644
Binary files a/screenshots/overview.png and b/screenshots/overview.png differ
diff --git a/screenshots/query.png b/screenshots/query.png
index b505f2b..b56c27f 100644
Binary files a/screenshots/query.png and b/screenshots/query.png differ
diff --git a/screenshots/report.png b/screenshots/report.png
index 6491346..88dc934 100644
Binary files a/screenshots/report.png and b/screenshots/report.png differ
diff --git a/screenshots/report_message.png b/screenshots/report_message.png
new file mode 100644
index 0000000..cfaaf7a
Binary files /dev/null and b/screenshots/report_message.png differ