diff --git a/assets/scss/_table.scss b/assets/scss/_table.scss
index c395d5e..395a1e4 100644
--- a/assets/scss/_table.scss
+++ b/assets/scss/_table.scss
@@ -28,4 +28,7 @@ table {
       }
     }
   }
+  ul {
+    list-style-type: none;
+  }
 }
diff --git a/templates/frontpage.html b/templates/frontpage.html
index 75a41ab..a0aea21 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -2,6 +2,11 @@
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
   {{ this.body }}
+  {% if this.roles is defined %}
+    {% if this.roles.blocks | length != 0 %}
+      <a href="#roles">Ansible Roles</a>
+    {% endif %}
+  {% endif %}
   {% if this.roles is defined %}
     {% if this.roles.blocks | length != 0 %}
       <h2 id="roles">{{ this.tabletitle }}</h2>
@@ -9,9 +14,19 @@
         <thead>
           <tr>
             <th>Role Name</th>
-            <td>Ansible Galaxy</td>
-            <td>Maintainance Status</td>
-            <td>License</td>
+            <td>
+              <ul>
+                <li>Github</li>
+                <li>Gitea</li>
+              </ul>
+            </td>
+            <td>
+              <ul>
+                <li>Ansible Galaxy</li>
+                <li>Maintainance Status</li>
+                <li>License</li>
+              </ul>
+            </td>
           </tr>
         </thead>
         <tbody>
@@ -19,17 +34,33 @@
           <tr>
             <th><a href="{{ blk.gitrepo }}" target="_blank">{{ blk.name }}</a></th>
             <td>
-              {% if blk.no_galaxy %}
-              <a href="{{ blk.galaxy_url }}">
-                <img src="{{ {'name': blk.galaxy_name, 'state': blk.galaxy_name, 'label': 'ansible-galaxy'} | svg }}" />
-              </a>
-              {% else %}-{% endif %}
+              <code>
+                <ul>
+                  <li>
+                    <a href="{{ blk.gitrepo }}" target="_blank" titel="Github Link">{{ blk.gitrepo }}</a>
+                  </li>
+                  <li>
+                    <a href="{{ blk.gitearepo }}" target="_blank">{{ blk.gitearepo }}</a>
+                  </li>
+                </ul>
+              </code>
             </td>
             <td>
-              <img src="{{ {'name': blk.galaxy_name, 'state': blk.maintainance, 'label': 'maintainance'} | svg }}" />
-            </td>
-            <td>
-              <img src="{{ {'name': blk.galaxy_name, 'state': blk.license, 'label': 'license'} | svg }}" />
+              <ul>
+                <li>
+                  {% if blk.no_galaxy %}
+                  <a href="{{ blk.galaxy_url }}">
+                    <img src="{{ {'name': blk.galaxy_name, 'state': blk.galaxy_name, 'label': 'ansible-galaxy'} | svg }}" />
+                  </a>
+                  {% else %}-{% endif %}
+                </li>
+                <li>
+                  <img src="{{ {'name': blk.galaxy_name, 'state': blk.maintainance, 'label': 'maintainance'} | svg }}" />
+                </li>
+                <li>
+                  <img src="{{ {'name': blk.galaxy_name, 'state': blk.license, 'label': 'license'} | svg }}" />
+                </li>
+              </ul>
             </td>
           </tr>
       {% endfor %}