diff --git a/app/css/all.css b/app/css/all.css
index afc607e7..babf73fb 100644
--- a/app/css/all.css
+++ b/app/css/all.css
@@ -6,16 +6,6 @@ Description: Classes shared by all themes
 License: GNU General Public License v3.0
 */
 
-/* Small devices (portrait phones, up to 576px) */
-@media (max-width: 576px) {
-  .container-fluid, .card-body, .col-md-6 { padding-left: 0.5rem; padding-right: 0.5rem; }
-  .card .card-header { padding: .75rem .5rem; font-size: 1.0rem; }
-  .row { margin-left: 0rem; margin-right: 0rem; }
-  .col-lg-12 { padding-right: 0.25rem; padding-left: 0.25rem; }
-  .form-group.col-md-6 { margin-left: -0.5rem; }
-  h4.mt-3 { margin-left: 0.5rem; }
-}
-
 a {
     color: #2b8080;
     text-decoration: none;
@@ -26,7 +16,7 @@ a {
   padding-bottom: 0.6rem;
 }
 
-.sb-sidenav-light .sb-sidenav-menu .nav-link {
+.sb-sidenav-light .sb-sidenav-menu .nav-link, .card-title, h4 {
   color: #495057;
 }
 
diff --git a/includes/navbar.php b/includes/navbar.php
index 9c314a62..03966396 100755
--- a/includes/navbar.php
+++ b/includes/navbar.php
@@ -5,20 +5,16 @@
   <button class="btn btn-link btn-sm order-1 order-lg-0 me-auto p-3 bd-highlight" id="sidebarToggle" href="#!"><i class="fas fa-bars"></i></button>
   <!-- Navbar-->
   <ul class="navbar-nav ms-auto ms-md-0 me-2 me-lg-4">
-    <!-- Nav Item - Insiders -->
-    <div class="insiders mt-4">
-      <a href="https://docs.raspap.com/insiders" target="_blank"><i class="fas fa-heart mr-3" style="color: #e63946"></i></a>
-    </div>
-    <!-- Nav Item - Night mode -->
+    <!-- Display mode -->
     <div class="form-check form-switch p-4 mt-1">
-      <input type="checkbox" class="form-check-input" id="night-mode" <?php echo getNightmode() ? 'checked' : null ; ?> >
-      <label class="form-check-label" for="night-mode"><i class="far fa-moon mr-1 text-muted"></i></label>
+      <input type="checkbox" class="form-check-input" id="darkModeSwitch" <?php echo getNightmode() ? 'checked' : null ; ?> >
+      <label class="form-check-label" for="darkModeSwitch"><i class="far fa-moon mr-1 text-muted"></i></label>
     </div>
-    <!-- Nav Item - User -->
-    <li class="nav-item dropdown no-arrow">
+    <!-- Auth user -->
+    <li class="nav-item mt-1">
       <a class="nav-link" href="auth_conf">
-        <span class="mr-2 d-none d-lg-inline small"><?php echo htmlspecialchars($_SESSION['user_id'], ENT_QUOTES); ?></span>
-        <i class="fas fa-user-circle fa-3x"></i>
+        <span class="mr-2 small nav-user"><?php echo htmlspecialchars($_SESSION['user_id'], ENT_QUOTES); ?></span>
+        <i class="fas fa-user-circle text-muted mt-2 fa-3x"></i>
       </a>
     </li>
   </ul>
diff --git a/index.php b/index.php
index 9708c20b..09aa18a7 100755
--- a/index.php
+++ b/index.php
@@ -118,9 +118,9 @@ initializeApp();
         <footer class="py-4 bg-light mt-auto">
           <div class="container-fluid px-4">
             <div class="d-flex align-items-center justify-content-between small">
-              <div class="text-muted">Created by the <a href="https://github.com/RaspAP">RaspAP Team</a></div>
+              <div class="text-muted">Created by the <a href="https://github.com/RaspAP" target="_blank" rel="noopener">RaspAP Team</a></div>
               <div class="text-muted">
-                <i class="fas fa-heart heart"></i> <a href="https://docs.raspap.com/insiders" target="_blank">Get Insiders</a>
+                <i class="fas fa-heart heart"></i> <a href="https://docs.raspap.com/insiders" target="_blank" rel="noopener">Get Insiders</a>
               </div>
             </div>
           </div>