diff --git a/src/html_index.py b/src/html_index.py
index a804cd0..641248c 100755
--- a/src/html_index.py
+++ b/src/html_index.py
@@ -17,7 +17,7 @@ def gen_obj(bundle_id):
 
 def gen_entry(obj):
     return '''
-<a href="/app/{id}/index.html">
+<a href="/app/{id}/">
   <div>
     <img src="{img}" width="100" height="100">
     <span class="name">{name}</span><br />
@@ -30,7 +30,7 @@ def gen_pager(current, total):
 
     def mklink(i, name, active=False):
         clss = ' class="active"' if active else ''
-        return '<a href="../{}"{}>{}</a>'.format(i, clss, name)
+        return '<a href="../{}/"{}>{}</a>'.format(i, clss, name)
 
     links = ''
     # if current > 1:
diff --git a/src/html_root.py b/src/html_root.py
index 1b75484..7797fae 100755
--- a/src/html_root.py
+++ b/src/html_root.py
@@ -18,16 +18,16 @@ def gen_root():
   </p>
 </a>
 <p>
-  The source code of the app is available <a href="https://github.com/relikd/appcheck" target="_blank">on GitHub</a>.
+  The source code of the app is available <a href="https://github.com/relikd/appcheck/" target="_blank">on GitHub</a>.
 </p>
 <h2>Results</h2>
 <p>
-  If you're just interested in the results, go ahead to <a href="/index/page/1">all apps</a>.
+  If you're just interested in the results, go ahead to <a href="/index/page/1/">all apps</a>.
 </p>
 <h2>Current research</h2>
 <p>
   We have an ongoing research project open. Your help is highly appreciated. <br>
-  For mor infos follow <a href="/help">this link</a>.
+  For mor infos follow <a href="/help/">this link</a>.
 </p>
 '''))
 
@@ -65,7 +65,7 @@ def gen_help():
 
             txt += '''
 <tr><td>{0}</td>
-<td><a href="/app/{1}/index.html">{2}</a></td>
+<td><a href="/app/{1}/">{2}</a></td>
 <td>{3}</td>
 <td><a href="{4}" target="_blank">{4}</a></td>
 </tr>'''.format(i + 1, bid, x[0], rr, asurl)
@@ -85,7 +85,7 @@ def gen_search():
 <script type="text/javascript">
   var GET={};
   window.location.search.substr(1).split("&").forEach(function(x){GET[x.split("=")[0]]=x.split("=")[1]});
-  if (GET["id"]) { window.location = "/app/" + GET["id"] + "/index.html"; }
+  if (GET["id"]) { window.location = "/app/" + GET["id"] + "/"; }
 </script>'''))
 
 
diff --git a/templates/base.html b/templates/base.html
index 50a42b3..712de0e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,8 +21,8 @@
   <header>
     <nav>
       <ul id="main-nav">
-        <li><a href="/index/page/1">All Apps</a></li>
-        <li><a href="/help">Help needed</a></li>
+        <li><a href="/index/page/1/">All Apps</a></li>
+        <li><a href="/help/">Help needed</a></li>
         <li><a class="no-ul" href="https://github.com/relikd/appcheck" target="_blank"><img src="/static/github.svg" alt="GitHub"></a></li>
       </ul>
     </nav>