diff --git a/templates/admin.html b/templates/admin.html
index 5c49c30..6a5d85a 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -7,17 +7,22 @@
     <div class="container">
         <div class="row">
             <div class="col-md-10">
-                <ul class="nav nav-tabs">
-                    <li class="nav-item">
-                        <a class="nav-link active" data-toggle="tab" href="#rubrique1">VMs actives</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#rubrique2">Comptes</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#rubrique3">Templates</a>
-                    </li>
-                </ul>
+                <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+                    <div class="collapse navbar-collapse" id="navbarNav">
+                        <ul class="navbar-nav">
+                            <li class="nav-item active">
+                                <a class="nav-link nav-link-with-border" data-toggle="tab" href="#rubrique1">Machines virtuelles disponibles</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link nav-link-with-border" data-toggle="tab" href="#rubrique2">Comptes</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link nav-link-with-border" data-toggle="tab" href="#rubrique3">Templates</a>
+                            </li>
+                            </li>
+                        </ul>
+                    </div>
+                </nav>
             </div>
         </div>
     </div>
diff --git a/templates/base.html b/templates/base.html
index 453361b..0f7600d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -93,6 +93,13 @@ <h5 class="modal-title" id="alertModalLabel"></h5>
             </div>
         </div>
         <script>
+            $('.navbar-nav a').on('click', function () {
+                var targetId = $(this).attr('href');
+                $('.navbar-nav a').removeClass('active');
+                $(this).addClass('active');
+                $('.container > div').hide();
+                $(targetId).show();
+            });
             function checkIfVmAliveAdmin(vmId) {
                 return new Promise(function (resolve, reject) {
                     showLoadingCardModal(vmId);   
@@ -283,6 +290,13 @@ <h5 class="modal-title" id="alertModalLabel"></h5>
         </script>
 
         <style>
+            .nav-link-with-border {
+                border: 1px solid white;
+                border-radius: 5px;
+                padding: 5px 10px;
+                margin-right: 5px;
+            }
+
             .border-bottom-nav {
                 border-bottom: 2px solid #FFF;
             }
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 38b0884..73dc12a 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -258,7 +258,7 @@
                     <div class="collapse navbar-collapse" id="navbarNav">
                         <ul class="navbar-nav">
                             <li class="nav-item active">
-                                <a class="nav-link" data-toggle="tab" href="#rubrique1">Machines virtuelles disponibles</a>
+                                <a class="nav-link nav-link-with-border" data-toggle="tab" href="#rubrique1">Machines virtuelles disponibles</a>
                             </li>
                         </ul>
                     </div>
diff --git a/templates/professor.html b/templates/professor.html
index 3eea636..bd52a18 100644
--- a/templates/professor.html
+++ b/templates/professor.html
@@ -7,14 +7,18 @@
     <div class="container">
         <div class="row">
             <div class="col-md-10">
-                <ul class="nav nav-tabs">
-                    <li class="nav-item">
-                        <a class="nav-link active" data-toggle="tab" href="#rubrique1">VMs actives</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" data-toggle="tab" href="#rubrique2">Comptes</a>
-                    </li>
-                </ul>
+                <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+                    <div class="collapse navbar-collapse" id="navbarNav">
+                        <ul class="navbar-nav">
+                            <li class="nav-item active">
+                                <a class="nav-link nav-link-with-border active" data-toggle="tab" href="#rubrique1">VMs actives</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link nav-link-with-border" data-toggle="tab" href="#rubrique2">Comptes</a>
+                            </li>
+                        </ul>
+                    </div>
+                </nav>
             </div>
         </div>
     </div>