4 files changed, 11 insertions, 18 deletions
diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html
index d7e764a2..a419521c 100644
--- a/pydis_site/templates/base/base.html
+++ b/pydis_site/templates/base/base.html
@@ -16,11 +16,7 @@
   {% bulma %}
 
   {# Font-awesome here is defined explicitly so that we can have Pro #}
-  <link rel="stylesheet"
-        href="https://pro.fontawesome.com/releases/v5.7.2/css/all.css"
-        integrity="sha384-6jHF7Z3XI3fF4XZixAuSu0gGKrXwoX/w3uFPxC56OtjChio7wtTGJWRW53Nhx6Ev"
-        crossorigin="anonymous"
-  >
+  <script src="https://kit.fontawesome.com/ae6a3152d8.js"></script>
 
   <link rel="stylesheet" href="{% static "css/base/base.css" %}">
   {% block head %}{% endblock %}
diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index bee503ee..17edd60d 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -61,20 +61,23 @@
           More
         </a>
         <div class="navbar-dropdown">
-          <a class="navbar-item">
-            Resources
+          <a class="navbar-item" href="{% url 'wiki:get' path="resources/" %}">
+            Learning Resources
           </a>
-          <a class="navbar-item">
+          <a class="navbar-item" href="{% url 'wiki:get' path="tools/" %}">
+            Tools
+          </a>
+          <a class="navbar-item" href="{% url 'wiki:get' path="frequently-asked-questions/" %}">
             FAQ
           </a>
-          <a class="navbar-item">
+          <a class="navbar-item" href="{% url 'wiki:get' path="rules/" %}">
             Rules
           </a>
-          <a class="navbar-item">
+          <a class="navbar-item" href="{% url 'wiki:get' path="privacy/" %}">
             Privacy
           </a>
           <hr class="navbar-divider">
-          <a class="navbar-item">
+          <a class="navbar-item" href="{% url 'wiki:get' path="code-jams/" %}">
             Code Jams
           </a>
         </div>
diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html
index 192c25f6..36349758 100644
--- a/pydis_site/templates/wiki/base.html
+++ b/pydis_site/templates/wiki/base.html
@@ -2,9 +2,7 @@
 {% load static %}
 {% load wiki_tags %}
 
-{% block title %}
-  Wiki | {% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %}
-{% endblock %}
+{% block title %}{% block wiki_pagetitle %}{% endblock %}{% block wiki_site_title %}{% endblock %}{% endblock %}
 
 {% block head %}
   {{ block.super }}
diff --git a/pydis_site/templates/wiki/create_root.html b/pydis_site/templates/wiki/create_root.html
index 330fea33..2d09089d 100644
--- a/pydis_site/templates/wiki/create_root.html
+++ b/pydis_site/templates/wiki/create_root.html
@@ -32,11 +32,7 @@
 
   <form method="POST" class="form-horizontal">
     {% wiki_form form %}
-
     <div class="field is-horizontal">
-      <div class="field-label">
-        {# Empty for spacing #}
-      </div>
       <div class="field-body">
         <div class="control">
           <button type="submit" class="button is-primary" name="save_changes">