diff --git a/web/components/management/area.js b/web/components/management/area.js
index 220dcd3c1c30d56392b97914b1ec2289a5190cc9..60eeb31d0038f449632c602313348f4e9e21ded4 100644
--- a/web/components/management/area.js
+++ b/web/components/management/area.js
@@ -124,6 +124,7 @@ class Area {
   }
 
   async displayAreas() {
+    document.getElementById("areas").style.display = "block";
     document.getElementById("area-list").innerHTML = /* HTML */ `<button
       id="area-new"
       class="button large-button is-success"
@@ -168,9 +169,8 @@ class Area {
 
   emptyAreas() {
     this.election = null;
-    document.getElementById("area-title").innerHTML = "Circonscriptions";
-    document.getElementById("area-list").innerHTML =
-      "Veuillez sélectionner une élection";
+    document.getElementById("sections").style.display = "none";
+    document.getElementById("desks").style.display = "none";
   }
 
   areaTemplate(area) {
diff --git a/web/components/management/candidate-lists.js b/web/components/management/candidate-lists.js
index 4ab5d21a8b097b7dd0257e36895ff3f52f5bf562..3de3f048dd41439f4056896a4c8cf0156bbf7822 100644
--- a/web/components/management/candidate-lists.js
+++ b/web/components/management/candidate-lists.js
@@ -33,15 +33,15 @@ class CandidateList {
     this.CandidateModel.current_user = await Auth.GetUser();
     const mountpoint = where;
     document.getElementById(mountpoint).innerHTML = /* HTML */ `
-      <header class="card-header">
+      <header id="dropdown-candidate-lists" class="card-header clickable">
         <p id="candidate-list-title" class="card-header-title">
           Liste des candidats par circonscription
         </p>
-        <button id="dropdown-candidate-lists" class="button">
-          <span class="icon is-small">
+        <a>
+          <span class="icon is-large">
             <i class="fas fa-caret-down"></i>
           </span>
-        </button>
+        </a>
       </header>
       <div id="candidate-lists-dropdown-content" class="columns card-content">
         <div class="column">
diff --git a/web/components/management/desk.js b/web/components/management/desk.js
index af0748568c2c1b0f9d42c2a4e44623e9a15d8fa0..c268ced24f5630451580b58cc578f16508042a03 100644
--- a/web/components/management/desk.js
+++ b/web/components/management/desk.js
@@ -121,6 +121,7 @@ class Desk {
   }
 
   async displayDesks() {
+    document.getElementById("desks").style.display = "block";
     document.getElementById("desk-list").innerHTML = /* HTML */ `<button
       id="desk-new"
       class="button large-button is-success"
diff --git a/web/components/management/genericElection.js b/web/components/management/genericElection.js
index a15bd3fb23a170c6a5641f5336fa0f73b0fddc20..bb65aca21ba874931deeb31794b7835dcf32b478 100644
--- a/web/components/management/genericElection.js
+++ b/web/components/management/genericElection.js
@@ -23,13 +23,17 @@ class GenericElection {
           <div id="election" class="card-no-hover"></div>
         </div>
         <div class="column">
-          <div id="areas" class="card-no-hover"></div>
+          <div id="areas" class="card-no-hover" style="display: none ;"></div>
         </div>
         <div class="column">
-          <div id="sections" class="card-no-hover"></div>
+          <div
+            id="sections"
+            class="card-no-hover"
+            style="display: none ;"
+          ></div>
         </div>
         <div class="column">
-          <div id="desks" class="card-no-hover"></div>
+          <div id="desks" class="card-no-hover" style="display: none ;"></div>
         </div>
       </div>
 
diff --git a/web/components/management/party.js b/web/components/management/party.js
index b366615701128cb1c462f9a07cc8d3b8f8c6b2a6..c104a3ffdea146a3d064115136f1122f9fed7e58 100644
--- a/web/components/management/party.js
+++ b/web/components/management/party.js
@@ -116,8 +116,8 @@ class Party {
         <div class="content">
           <nav class="level">
             <div class="level-left" style="color:${party.Color}">
-              ${party.Name} &nbsp&nbsp
               <p style="background-color:${party.Color}">Couleur</p>
+              &nbsp&nbsp ${party.Name}
             </div>
             <div class="level-right">
               <a
diff --git a/web/components/management/round-desks.js b/web/components/management/round-desks.js
index d32c75bffa783a1b4be29ce9ae64bfc166461675..b1d43672c695c6e238054d57a9cd5819108bc4a6 100644
--- a/web/components/management/round-desks.js
+++ b/web/components/management/round-desks.js
@@ -30,15 +30,15 @@ class RoundDesk {
     this.SectionModel.current_user = await Auth.GetUser();
     const mountpoint = where;
     document.getElementById(mountpoint).innerHTML = /* HTML */ `
-      <header class="card-header">
+      <header id="dropdown-round-desks" class="card-header clickable">
         <p id="desk-round-title" class="card-header-title">
           Bureaux de votes
         </p>
-        <button id="dropdown-round-desks" class="button">
-          <span class="icon is-small">
+        <a>
+          <span class="icon is-large">
             <i class="fas fa-caret-down"></i>
           </span>
-        </button>
+        </a>
       </header>
       <div id="desk-rounds-dropdown-content" class="columns card-content">
         <div class="column">
@@ -112,7 +112,10 @@ class RoundDesk {
 
   deskRoundTemplate(deskRound) {
     return /* HTML */ `<div class="card card-list">
-      <div id="deskrounds-deskround-${deskRound.ID}" class="card-content clickable">
+      <div
+        id="deskrounds-deskround-${deskRound.ID}"
+        class="card-content clickable"
+      >
         <div class="content">
           <nav class="level">
             <div
diff --git a/web/components/management/round.js b/web/components/management/round.js
index 2b6f7a5db7f61d80ebc301ef489f6fc067a5fac9..6f7c3a176d59a3f53a5daf004d8543515d9d6e48 100644
--- a/web/components/management/round.js
+++ b/web/components/management/round.js
@@ -54,24 +54,39 @@ class Round {
     let dropdownCandidateList = document.getElementById(
       "dropdown-candidate-lists"
     );
-    dropdownRoundDesks.addEventListener("click", function () {
-      document.getElementById("desk-rounds-dropdown-content").style.display =
-        "flex";
-      document.getElementById("round-desks").style.height = "70vh";
-      document.getElementById(
-        "candidate-lists-dropdown-content"
-      ).style.display = "none";
-      document.getElementById("candidate-lists").style.height = "auto";
+
+    dropdownRoundDesks.addEventListener("click", () => {
+      if (document.getElementById("round-desks").style.height == "auto") {
+        this.hideCandidateLists();
+      } else {
+        this.hideDesks();
+      }
     });
 
-    dropdownCandidateList.addEventListener("click", function () {
-      document.getElementById("desk-rounds-dropdown-content").style.display =
-        "none";
-      document.getElementById("round-desks").style.height = "auto";
-      document.getElementById(
-        "candidate-lists-dropdown-content"
-      ).style.display = "flex";
-      document.getElementById("candidate-lists").style.height = "70vh";
+    dropdownCandidateList.addEventListener("click", () => {
+      if (document.getElementById("round-desks").style.height == "auto") {
+        this.hideCandidateLists();
+      } else {
+        this.hideDesks();
+      }
     });
   }
+
+  hideDesks() {
+    document.getElementById("desk-rounds-dropdown-content").style.display =
+      "none";
+    document.getElementById("round-desks").style.height = "auto";
+    document.getElementById("candidate-lists-dropdown-content").style.display =
+      "flex";
+    document.getElementById("candidate-lists").style.height = "70vh";
+  }
+
+  hideCandidateLists() {
+    document.getElementById("desk-rounds-dropdown-content").style.display =
+      "flex";
+    document.getElementById("round-desks").style.height = "70vh";
+    document.getElementById("candidate-lists-dropdown-content").style.display =
+      "none";
+    document.getElementById("candidate-lists").style.height = "auto";
+  }
 }
diff --git a/web/components/management/section.js b/web/components/management/section.js
index 653664c4437e83793eca8620d178e62020c6dbbd..a262d7d318045e3303f10e2a5e258eb5f43ca972 100644
--- a/web/components/management/section.js
+++ b/web/components/management/section.js
@@ -126,6 +126,7 @@ class Section {
   }
 
   async displaySections() {
+    document.getElementById("sections").style.display = "block";
     document.getElementById("section-list").innerHTML = /* HTML */ `<button
       id="section-new"
       class="button large-button is-success"
@@ -175,9 +176,7 @@ class Section {
 
   emptySections() {
     this.area = null;
-    document.getElementById("section-title").innerHTML = "Sections";
-    document.getElementById("section-list").innerHTML =
-      "Veuillez sélectionner une circonscription";
+    document.getElementById("desks").style.display = "none";
   }
 
   sectionTemplate(section) {