diff --git a/src/core/templates/body-footer.html b/src/core/templates/body-footer.html
index fd47466..2fb1f93 100644
--- a/src/core/templates/body-footer.html
+++ b/src/core/templates/body-footer.html
@@ -1,29 +1,37 @@
 <nav class="navbar navbar-expand-lg bg-dark navbar-dark justify-content-center text-center fixed-bottom">
-    <div class="col col-lg-auto">
-        <ul class="navbar-nav">
-            <li class="nav-item">
-                <a class="nav-link" href="mailto:">
-                    <i title="Send Us an Email" class="fas fa-envelope"></i>
-                    Mail
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="https://twitter.com/">
-                    <i title="Find Us on Twitter" class="fab fa-twitter"></i>
-                    Twitter
-                </a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="https://www.linkedin.com/">
-                    <i title="Find Us on LinkedIn" class="fab fa-linkedin"></i>
-                    linkedIn
-                </a>
-            </li>
-            <li class="nav-item">
-                <span class="nav-link">
-                    <i class="fas fa-map-marker-alt">US, Earth</i>
-                </span>
-            </li>
-        </ul>
+    <button class="navbar-toggler" type="button" data-toggle="collapse"
+            data-target="#navbarTogglerFooter" aria-controls="navbarTogglerFooter"
+                aria-expanded="false" aria-label="Toggle Footer Navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div id="navbarTogglerFooter" class="row collapse navbar-collapse">
+        <div class="col col-lg-auto">
+            <ul class="navbar-nav">
+                <li class="nav-item">
+                    <a class="nav-link" href="mailto:">
+                        <i title="Send Us an Email" class="fas fa-envelope"></i>
+                        Mail
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="https://twitter.com/">
+                        <i title="Find Us on Twitter" class="fab fa-twitter"></i>
+                        Twitter
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="https://www.linkedin.com/">
+                        <i title="Find Us on LinkedIn" class="fab fa-linkedin"></i>
+                        linkedIn
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <span class="nav-link">
+                        <i class="fas fa-map-marker-alt">US, Earth</i>
+                    </span>
+                </li>
+            </ul>
+        </div>
     </div>
 </nav>
diff --git a/src/core/templates/body-header.html b/src/core/templates/body-header.html
index 41bd938..a8ea9f3 100644
--- a/src/core/templates/body-header.html
+++ b/src/core/templates/body-header.html
@@ -1,96 +1,103 @@
-<nav class="navbar navbar-expand-lg bg-dark navbar-dark sticky-top">
-    <div class="col-sm">
-        <!-- Branding -->
-        <div class="navbar-brand justify-content-center text-center">
-            <div class="site-branding">
-                <h1 class="site-title">
-                    <a href="{{ url_for('home') }}" title="{{TITLE}} Home" rel="home">
-                        Hello World!
-                    </a>
-                </h1>
-                <h2 class="site-description">Your Slogan...</h2>
+<nav class="navbar navbar-expand-lg bg-dark navbar-dark sticky-top justify-content-center text-center">
+    <button class="navbar-toggler" type="button" data-toggle="collapse"
+            data-target="#navbarTogglerHeader" aria-controls="navbarTogglerHeader"
+                aria-expanded="false" aria-label="Toggle Header Navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+
+        <div id="navbarTogglerHeader" class="row collapse navbar-collapse">
+        <div class="col-sm">
+            <!-- Branding -->
+            <div class="navbar-brand justify-content-center text-center">
+                <div class="site-branding">
+                    <h1 class="site-title">
+                        <a href="{{ url_for('home') }}" title="{{TITLE}} Home" rel="home">
+                            Hello World!
+                        </a>
+                    </h1>
+                    <h2 class="site-description">Your Slogan...</h2>
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="col col-lg-auto">
-        <!-- Links -->
-        <ul class="navbar-nav">
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('home') }}">
-                    <i class="fas fa-home"></i>&nbsp;&nbsp;Home</a>
-            </li>
-
-            <!-- Dropdowns -->
-            <!-- Others Dropdown -->
-
-            {% if not current_user.is_authenticated %}
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
-                    Account
-                </a>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item" href="{{ url_for('login') }}">
-                        <i title="Login" class="fas fa-user"></i>&nbsp;&nbsp;Login</a>
-                    <a class="dropdown-item" href="{{ url_for('register') }}">
-                        <i title="Register A User..." class="fas fa-user-plus"></i>&nbsp;&nbsp;Register</a>
-                </div>
-            </li>
-            {% endif %}
-
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
-                    Projects
-                </a>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item" href="#">
-                        <i class="fas fa-code"></i>&nbsp;&nbsp;Code</a>
-                </div>
-            </li>
-
-            <!-- Socials Dropdown -->
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
-                    Social
-                </a>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item" href="mailto:">
-                        <i title="Send Us an Email" class="fas fa-envelope"></i>&nbsp;&nbsp;Email</a>
-                    <a class="dropdown-item" href="#">
-                        <i title="Find Us on Twitter" class="fab fa-twitter"></i>&nbsp;&nbsp;Twitter</a>
-                    <a class="dropdown-item" href="#">
-                        <i title="Find Us on LinkedIn" class="fab fa-linkedin"></i>&nbsp;&nbsp;LinkedIn</a>
-                </div>
-            </li>
-
-            <!-- Donation Dropdown -->
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
-                    <i class="fa fa-coin"></i>
-                    Donate
-                </a>
-                <div class="dropdown-menu">
-                    <a class="dropdown-item" href="#">
-                        <i title="Donate via Patreon" class="fab fa-patreon"></i> Patreon</a>
-                    <a class="dropdown-item" href="#">
-                        <i title="Donate via Paypal" class="fab fa-paypal"></i> Paypal</a>
-                </div>
-            </li>
-
-            <!-- End Dropdowns -->
-
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('about') }}">
-                    <i class="far fa-address-card"></i> About</a>
-            </li>
-
-            {% if current_user.is_authenticated or oidc_loggedin() %}
+        <div class="col col-lg-auto">
+            <!-- Links -->
+            <ul class="navbar-nav">
                 <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('logout') }}">
-                        <i class="fas fa-sign-out-alt"></i> Logout</a>
+                    <a class="nav-link" href="{{ url_for('home') }}">
+                        <i class="fas fa-home"></i>&nbsp;&nbsp;Home</a>
                 </li>
-            {% endif %}
-        </ul>
-    </div>
 
+                <!-- Dropdowns -->
+                <!-- Others Dropdown -->
+
+                {% if not current_user.is_authenticated %}
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
+                        Account
+                    </a>
+                    <div class="dropdown-menu">
+                        <a class="dropdown-item" href="{{ url_for('login') }}">
+                            <i title="Login" class="fas fa-user"></i>&nbsp;&nbsp;Login</a>
+                        <a class="dropdown-item" href="{{ url_for('register') }}">
+                            <i title="Register A User..." class="fas fa-user-plus"></i>&nbsp;&nbsp;Register</a>
+                    </div>
+                </li>
+                {% endif %}
+
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
+                        Projects
+                    </a>
+                    <div class="dropdown-menu">
+                        <a class="dropdown-item" href="#">
+                            <i class="fas fa-code"></i>&nbsp;&nbsp;Code</a>
+                    </div>
+                </li>
+
+                <!-- Socials Dropdown -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
+                        Social
+                    </a>
+                    <div class="dropdown-menu">
+                        <a class="dropdown-item" href="mailto:">
+                            <i title="Send Us an Email" class="fas fa-envelope"></i>&nbsp;&nbsp;Email</a>
+                        <a class="dropdown-item" href="#">
+                            <i title="Find Us on Twitter" class="fab fa-twitter"></i>&nbsp;&nbsp;Twitter</a>
+                        <a class="dropdown-item" href="#">
+                            <i title="Find Us on LinkedIn" class="fab fa-linkedin"></i>&nbsp;&nbsp;LinkedIn</a>
+                    </div>
+                </li>
+
+                <!-- Donation Dropdown -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbardrop" data-toggle="dropdown">
+                        <i class="fa fa-coin"></i>
+                        Donate
+                    </a>
+                    <div class="dropdown-menu">
+                        <a class="dropdown-item" href="#">
+                            <i title="Donate via Patreon" class="fab fa-patreon"></i> Patreon</a>
+                        <a class="dropdown-item" href="#">
+                            <i title="Donate via Paypal" class="fab fa-paypal"></i> Paypal</a>
+                    </div>
+                </li>
+
+                <!-- End Dropdowns -->
+
+                <li class="nav-item">
+                    <a class="nav-link" href="{{ url_for('about') }}">
+                        <i class="far fa-address-card"></i> About</a>
+                </li>
+
+                {% if current_user.is_authenticated or oidc_loggedin() %}
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{ url_for('logout') }}">
+                            <i class="fas fa-sign-out-alt"></i> Logout</a>
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
+    </div>
 </nav>