4 files changed, 49 insertions, 3 deletions
diff --git a/plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte b/plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte
index 789e3c54..a9d83e5c 100644
--- a/plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte
+++ b/plugins/javadoc/src/main/resources/views/components/bottomNavbar.korte
@@ -13,7 +13,7 @@
         </div>
         <a id="skip.navbar.bottom">
             <!--   -->
-        </a></div>
+        </a>
         {% set type="bottom" %}{% include "components/subNav.korte" -%}
         <!-- ======== END OF BOTTOM NAVBAR ======= -->
     </nav>
diff --git a/plugins/javadoc/src/main/resources/views/components/navList.korte b/plugins/javadoc/src/main/resources/views/components/navList.korte
index e27bdecb..d18b44c4 100644
--- a/plugins/javadoc/src/main/resources/views/components/navList.korte
+++ b/plugins/javadoc/src/main/resources/views/components/navList.korte
@@ -22,6 +22,6 @@
     <li><a href="package-tree.html">Tree</a></li>
     {% end %}
     <li>Deprecated</li>
-    <li>Index</li>
+    <li><a href="{{ pathToRoot }}index-files/index-1.html">Index</a></li>
     <li>Help</li>
 </ul>
 \ No newline at end of file
diff --git a/plugins/javadoc/src/main/resources/views/components/subNav.korte b/plugins/javadoc/src/main/resources/views/components/subNav.korte
index aa0905cf..7869d747 100644
--- a/plugins/javadoc/src/main/resources/views/components/subNav.korte
+++ b/plugins/javadoc/src/main/resources/views/components/subNav.korte
@@ -1,6 +1,20 @@
 <div class="subNav">
+{% if kind == "indexPage" %}
+    <ul class="navList">
+        {%- if prevLetter != "" %}
+            <li><a href="{{ prevLetter }}.html">PREV&nbsp;LETTER</a></li>
+        {% else %}
+            <li>PREV&nbsp;LETTER</li>
+        {% endif -%}
+        {%- if nextLetter != "" %}
+            <li><a href="{{ nextLetter }}.html">NEXT&nbsp;LETTER</a></li>
+        {% else %}
+            <li>NEXT&nbsp;LETTER</li>
+        {% endif -%}
+    </ul>
+{% end -%}
 <ul class="navList" id="allclasses_navbar_top" style="display: block;">
-<li><a href="{{ pathToRoot }}allclasses.html">All&nbsp;Classes</a></li>
+    <li><a href="{{ pathToRoot }}allclasses.html">All&nbsp;Classes</a></li>
 </ul>
 {% if type != "bottom" %}
 <ul class="navListSearch">
diff --git a/plugins/javadoc/src/main/resources/views/indexPage.korte b/plugins/javadoc/src/main/resources/views/indexPage.korte
new file mode 100644
index 00000000..2881e86d
--- /dev/null
+++ b/plugins/javadoc/src/main/resources/views/indexPage.korte
@@ -0,0 +1,32 @@
+{% extends "components/base.korte" %}
+{% block content %}
+
+<main role="main">
+    <div class="contentContainer">
+        {% for key in dictionary %}
+            <a href="index-{{ loop.index }}.html">{{ key }}</a>&nbsp;
+        {% endfor %}
+        <h2 class="title">{{ dictionary[id - 1] }}</h2>
+        <dl>
+        {% for key in elements %}
+            <dt>
+                {% if key.isMember %}
+                <span class="memberNameLink">
+                {% endif %}
+                    <a href="{{ key.address }}">{{ key.name }}</a>
+                {% if key.isMember %}
+                </span> - {{ key.type }} in {{ key.origin|raw }}
+                {% else %}
+                 - {{ key.type }} {{ key.name }}
+                {% endif %}
+
+            </dt>
+            <dd>{{ key.description|raw }}</dd>
+
+        {% endfor %}
+        </dl>
+        {% for key in dictionary %}
+            <a href="index-{{ loop.index }}.html">{{ key }}</a>&nbsp;
+        {% endfor %}
+    </div>
+</main>
+\ No newline at end of file