diff --git a/dfrndir.sql b/dfrndir.sql
index b36c8a65..f019a274 100644
--- a/dfrndir.sql
+++ b/dfrndir.sql
@@ -167,7 +167,7 @@ CREATE TABLE IF NOT EXISTS `site-health` (
   `admin_name` varchar(255) NULL DEFAULT NULL,
   `admin_profile` varchar(255) NULL DEFAULT NULL,
   `ssl_state` bit(1) NULL DEFAULT NULL,
-  `ssl_grade` varchar(2) NULL DEFAULT NULL,
+  `ssl_grade` varchar(3) NULL DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `base_url` (`base_url`),
   KEY `health_score` (`health_score`),
diff --git a/include/site-health.php b/include/site-health.php
index c9ed4f92..bf94ad35 100644
--- a/include/site-health.php
+++ b/include/site-health.php
@@ -91,6 +91,12 @@ function parse_site_from_url($url)
 
 //Performs a ping to the given site ID
 //You may need to notice the site first before you know it's ID.
+//TODO: Probe server location using IP address or using the info the friendica server provides (preferred). 
+//      If IP needs to be used only provide country information.
+//TODO: Check SSLLabs Grade
+//      Check needs to be asynchronous, meaning that the check at SSLLabs will be initiated in one run while 
+//      the results must be fetched later. It might be good to mark sites, where a check has been inititated
+//      f.e. using the ssl_grade field. In the next run, results of these sites could be fetched.
 if(! function_exists('run_site_probe')){
 function run_site_probe($id, &$entry_out)
 {
diff --git a/mod/help.php b/mod/help.php
new file mode 100644
index 00000000..db14e7a6
--- /dev/null
+++ b/mod/help.php
@@ -0,0 +1,10 @@
+<?php
+use Friendica\Directory\Rendering\View;
+
+if(! function_exists('help_content')) {
+    function help_content(&$a) {
+        $view = new View('help');
+        $view->output();
+    }
+}
+
diff --git a/mod/stats.php b/mod/stats.php
new file mode 100644
index 00000000..866b33cd
--- /dev/null
+++ b/mod/stats.php
@@ -0,0 +1,10 @@
+<?php
+use Friendica\Directory\Rendering\View;
+
+if(! function_exists('stats_content')) {
+    function stats_content(&$a) {
+        $view = new View('stats');
+        $view->output();
+    }
+}
+
diff --git a/src/templates/layout/_navigation.php b/src/templates/layout/_navigation.php
index bdaf5bf2..4aa57bb1 100644
--- a/src/templates/layout/_navigation.php
+++ b/src/templates/layout/_navigation.php
@@ -2,7 +2,7 @@
 <nav id="links">
     <div class="viewport">
         <a href="/home" class="mobile">Home</a>
-        <a href="/servers">Servers</a>
+        <a href="/servers">Public Servers</a>
         <a href="/stats">Stats</a>
         <a href="/help">Help</a>
     </div>
diff --git a/src/templates/view/help.php b/src/templates/view/help.php
new file mode 100644
index 00000000..d7f6cbe3
--- /dev/null
+++ b/src/templates/view/help.php
@@ -0,0 +1,9 @@
+<div class="sites">
+    <div>
+        <h1>Help</h1>
+        <h2>Registering a Friendica account (with an existing server)</h2>
+        <h2>Setting up a Friendica server</h2>
+        <h2>Finding people - Getting new friends</h2>
+        <h2>More help</h2>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/templates/view/homepage.php b/src/templates/view/homepage.php
index a221a65a..a1d7f0c3 100644
--- a/src/templates/view/homepage.php
+++ b/src/templates/view/homepage.php
@@ -11,9 +11,8 @@
     <p class="about">
         Friendica is a decentralized social network.
         And this is a directory to find people on this network.
-        Vivamus condimentum tempor pellentesque. Phasellus turpis nulla, lacinia vitae quam in,
-        cursus semper est. Ut lobortis ex quis sodales porta. Nam rhoncus tortor lobortis auctor
-        efficitur. Ut ac ullamcorper lorem.
+        If you want to create your own account on a public server, have a look 
+        on our <a href="servers">Public servers listing</a>.
     </p>
     
     <div class="profiles">
diff --git a/src/templates/view/stats.php b/src/templates/view/stats.php
new file mode 100644
index 00000000..a62a4e2c
--- /dev/null
+++ b/src/templates/view/stats.php
@@ -0,0 +1,5 @@
+<div class="sites">
+    <div>
+        <h1>Stats</h1>
+    </div>
+</div>