diff --git a/shared/locale/en/LC_MESSAGES/django.mo b/shared/locale/en/LC_MESSAGES/django.mo
index 3e72073..f43c077 100644
Binary files a/shared/locale/en/LC_MESSAGES/django.mo and b/shared/locale/en/LC_MESSAGES/django.mo differ
diff --git a/shared/locale/en/LC_MESSAGES/django.po b/shared/locale/en/LC_MESSAGES/django.po
index 67c295c..8355f82 100644
--- a/shared/locale/en/LC_MESSAGES/django.po
+++ b/shared/locale/en/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-20 12:15+0200\n"
-"PO-Revision-Date: 2021-08-20 12:21+0200\n"
+"POT-Creation-Date: 2021-08-23 01:18+0200\n"
+"PO-Revision-Date: 2021-08-23 01:19+0200\n"
 "Last-Translator: Test Translator <test@translator>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -58,9 +58,9 @@ msgstr ""
 msgid "Supprimer le vote de {} ({}) ?"
 msgstr "Delete the vote of {} ({}) ?"
 
-#: elections/forms.py:118 elections/templates/elections/election_admin.html:243
-#: elections/templates/elections/election_admin.html:270
-#: elections/templates/elections/election_voters.html:82
+#: elections/forms.py:118 elections/templates/elections/admin/option.html:6
+#: elections/templates/elections/admin/question.html:23
+#: elections/templates/elections/election_voters.html:61
 msgid "Supprimer"
 msgstr "Delete"
 
@@ -224,6 +224,27 @@ msgstr ""
 "b>, if you leave an option's ranking blank, it will be ranked last "
 "automatically."
 
+#: elections/templates/elections/admin/option.html:12
+#: elections/templates/elections/admin/question.html:32
+#: elections/templates/elections/election_admin.html:157
+#: faqs/templates/faqs/faq.html:22
+msgid "Modifier"
+msgstr "Edit"
+
+#: elections/templates/elections/admin/option.html:12
+msgid "Modifier l'option"
+msgstr "Change the option"
+
+#: elections/templates/elections/admin/question.html:27
+msgid "Modifier la question"
+msgstr "Change the question"
+
+#: elections/templates/elections/admin/question.html:63
+#: elections/templates/elections/admin/question.html:67
+#: elections/templates/elections/election_admin.html:277
+msgid "Rajouter une option"
+msgstr "Add an option"
+
 #: elections/templates/elections/delete_vote.html:7
 msgid "Supprimer un vote"
 msgstr "Delete a vote"
@@ -281,7 +302,7 @@ msgstr ""
 "received by e-mail."
 
 #: elections/templates/elections/election.html:154
-#: elections/templates/elections/election_voters.html:65
+#: elections/templates/elections/election_voters.html:44
 msgid ""
 "Pour voter lors de cette élection, vous devez vous connecter à l'aide du CAS "
 "élève, d'autres restrictions peuvent s'appliquer et votre vote pourra être "
@@ -304,90 +325,69 @@ msgstr "Login via CAS"
 msgid "A voté"
 msgstr "Voted"
 
-#: elections/templates/elections/election_admin.html:51
+#: elections/templates/elections/election_admin.html:95
 #: elections/templates/elections/election_list.html:58
 msgid "Élection invisible"
 msgstr "Invisible election"
 
-#: elections/templates/elections/election_admin.html:58
+#: elections/templates/elections/election_admin.html:102
 msgid "Élection visible"
 msgstr "Visible election"
 
-#: elections/templates/elections/election_admin.html:72
+#: elections/templates/elections/election_admin.html:116
 msgid "Actions"
 msgstr "Actions"
 
-#: elections/templates/elections/election_admin.html:84
+#: elections/templates/elections/election_admin.html:128
 msgid "Vue classique"
 msgstr "Classic view"
 
-#: elections/templates/elections/election_admin.html:95
+#: elections/templates/elections/election_admin.html:139
 msgid "Rendre l'élection visible"
 msgstr "Make the election visible"
 
-#: elections/templates/elections/election_admin.html:104
+#: elections/templates/elections/election_admin.html:148
 msgid "Exporter les votant·e·s"
 msgstr "Export the list of voters"
 
-#: elections/templates/elections/election_admin.html:113
-#: elections/templates/elections/election_admin.html:252
-#: elections/templates/elections/election_admin.html:276
-#: faqs/templates/faqs/faq.html:22
-msgid "Modifier"
-msgstr "Edit"
-
-#: elections/templates/elections/election_admin.html:122
+#: elections/templates/elections/election_admin.html:166
 #: elections/templates/elections/upload_voters.html:32
 msgid "Gestion de la liste de votant·e·s"
 msgstr "Management of the voters' list"
 
-#: elections/templates/elections/election_admin.html:134
-#: elections/templates/elections/election_voters.html:48
+#: elections/templates/elections/election_admin.html:178
+#: elections/templates/elections/election_voters.html:27
 msgid "Liste des votant·e·s"
 msgstr "Voters' list"
 
-#: elections/templates/elections/election_admin.html:142
+#: elections/templates/elections/election_admin.html:186
 msgid "Dépouiller"
 msgstr "Count"
 
-#: elections/templates/elections/election_admin.html:154
+#: elections/templates/elections/election_admin.html:198
 msgid "Publier"
 msgstr "Publish"
 
-#: elections/templates/elections/election_admin.html:156
+#: elections/templates/elections/election_admin.html:200
 msgid "Dépublier"
 msgstr "De-publish"
 
-#: elections/templates/elections/election_admin.html:166
+#: elections/templates/elections/election_admin.html:210
 msgid "Télécharger les résultats"
 msgstr "Download the results"
 
-#: elections/templates/elections/election_admin.html:175
+#: elections/templates/elections/election_admin.html:219
 msgid "Archiver"
 msgstr "Archive"
 
-#: elections/templates/elections/election_admin.html:247
-msgid "Modifier la question"
-msgstr "Change the question"
-
-#: elections/templates/elections/election_admin.html:276
-msgid "Modifier l'option"
-msgstr "Change the option"
-
-#: elections/templates/elections/election_admin.html:315
-#: elections/templates/elections/election_admin.html:319
-#: elections/templates/elections/election_admin.html:330
-msgid "Rajouter une option"
-msgstr "Add an option"
-
-#: elections/templates/elections/election_admin.html:334
-#: elections/templates/elections/election_admin.html:339
-#: elections/templates/elections/election_admin.html:343
+#: elections/templates/elections/election_admin.html:281
+#: elections/templates/elections/election_admin.html:286
+#: elections/templates/elections/election_admin.html:290
 msgid "Rajouter une question"
 msgstr "Add a question"
 
 #: elections/templates/elections/election_ballots.html:18
-#: elections/templates/elections/election_voters.html:40
+#: elections/templates/elections/election_voters.html:19
 #: elections/templates/elections/upload_voters.html:71
 #: elections/templates/elections/vote.html:49
 #: shared/templates/auth/create-user.html:32
@@ -441,7 +441,7 @@ msgstr "Archived election"
 msgid "Modification d'une élection"
 msgstr "Editing an election"
 
-#: elections/templates/elections/election_voters.html:63
+#: elections/templates/elections/election_voters.html:42
 msgid ""
 "Seules les personnes présentes sur cette liste peuvent voter, vous avez dû "
 "recevoir un mail avec vos identifiants de connexion."
@@ -449,16 +449,16 @@ msgstr ""
 "Only people on this list can vote, you should have received an e-mail with "
 "your login credentials."
 
-#: elections/templates/elections/election_voters.html:79
+#: elections/templates/elections/election_voters.html:58
 #: elections/templates/elections/upload_voters.html:131
 msgid "Nom"
 msgstr "Name"
 
-#: elections/templates/elections/election_voters.html:80
+#: elections/templates/elections/election_voters.html:59
 msgid "Vote enregistré"
 msgstr "Recorded vote"
 
-#: elections/templates/elections/election_voters.html:113
+#: elections/templates/elections/election_voters.html:92
 #, python-format
 msgid "Supprimer le vote de %(v_name)s"
 msgstr "Delete the vote of %(v_name)s"
@@ -583,33 +583,29 @@ msgstr "Confirm"
 msgid "Annuler"
 msgstr "Cancel"
 
-#: elections/templates/elections/vote/rank.html:151
+#: elections/templates/elections/vote/rank.html:134
 msgid "Classement"
 msgstr "Ranking"
 
-#: elections/templates/elections/vote/rank.html:152
-#: elections/templates/elections/vote/select.html:24
+#: elections/templates/elections/vote/rank.html:135
+#: elections/templates/elections/vote/select.html:21
 msgid "Option(s) selectionnée(s)"
 msgstr "Selected option(s)"
 
-#: elections/templates/elections/vote/rank.html:172
-#: elections/templates/elections/vote/rank.html:225
+#: elections/templates/elections/vote/rank.html:155
+#: elections/templates/elections/vote/rank.html:206
 msgid "Utiliser le formulaire classique"
 msgstr "Use the traditional form"
 
-#: elections/templates/elections/vote/rank.html:177
+#: elections/templates/elections/vote/rank.html:160
 msgid "Utiliser le cliquer-déposer"
 msgstr "Use Drag & Drop"
 
-#: elections/templates/elections/vote/rank.html:235
+#: elections/templates/elections/vote/rank.html:216
 #, python-format
 msgid "Rang %(i)s"
 msgstr "Rank %(i)s"
 
-#: elections/templates/elections/vote/rank.html:246
-msgid "Ajouter un rang"
-msgstr "Add an rank"
-
 #: elections/tests/test_models.py:55 shared/auth/staticdefs.py:5
 msgid "CAS"
 msgstr "CAS"
@@ -634,7 +630,7 @@ msgstr "The maximum ranking is {}."
 msgid "Le classement minimal est 1."
 msgstr "The minimum ranking is 1."
 
-#: elections/utils.py:341
+#: elections/utils.py:351
 msgid ""
 "Format invalide. Vérifiez que le fichier est bien formé (i.e. chaque ligne "
 "de la forme 'login,nom,email')."
@@ -642,79 +638,71 @@ msgstr ""
 "Invalid format. Check that the file is properly formed (i.e. each line of "
 "the form 'login,name,e-mail')."
 
-#: elections/utils.py:355
+#: elections/utils.py:365
 msgid "La ligne {} n'a pas le bon nombre d'éléments."
 msgstr "The line {} has the wrong number of elements."
 
-#: elections/utils.py:360
+#: elections/utils.py:370
 msgid "Valeur manquante dans la ligne {} : 'login'."
 msgstr "Missing value in line {}: 'login'."
 
-#: elections/utils.py:365
+#: elections/utils.py:375
 msgid "Doublon dans les logins : lignes {} et {}."
 msgstr "Duplicate logins: lines {} and {}."
 
-#: elections/utils.py:373
+#: elections/utils.py:383
 msgid "Valeur manquante dans la ligne {} : 'nom'."
 msgstr "Missing value in line {}: 'name'."
 
-#: elections/utils.py:379
+#: elections/utils.py:389
 msgid "Adresse mail invalide à la ligne {} : '{}'."
 msgstr "Invalid e-mail address in line {}: '{}'."
 
-#: elections/views.py:59
+#: elections/views.py:58
 msgid "Élection créée avec succès !"
 msgstr "Election successfully created!"
 
-#: elections/views.py:100
+#: elections/views.py:98
 msgid "Élection visible !"
 msgstr "Election now visible!"
 
-#: elections/views.py:128
+#: elections/views.py:126
 msgid "Liste de votant·e·s importée avec succès !"
 msgstr "Voters list successfully imported!"
 
-#: elections/views.py:162
+#: elections/views.py:160
 msgid "Mail d'annonce en cours d'envoi !"
 msgstr "Announcement e-mail being distributed!"
 
-#: elections/views.py:199
+#: elections/views.py:197
 msgid "Élection modifiée avec succès !"
 msgstr "Election successfully modified!"
 
-#: elections/views.py:282
+#: elections/views.py:280
 msgid "Élection dépouillée avec succès !"
 msgstr "Election successfully counted!"
 
-#: elections/views.py:309
+#: elections/views.py:307
 msgid "Élection publiée avec succès !"
 msgstr "Election successfully published!"
 
-#: elections/views.py:310
+#: elections/views.py:308
 msgid "Élection dépubliée avec succès !"
 msgstr "Election successfully de-published!"
 
-#: elections/views.py:341
+#: elections/views.py:339
 msgid "Élection archivée avec succès !"
 msgstr "Election successfully archived!"
 
 #: elections/views.py:373
-msgid "Question modifiée avec succès !"
-msgstr "Question successfully modified!"
-
-#: elections/views.py:385
 msgid "Question supprimée !"
 msgstr "Question deleted!"
 
-#: elections/views.py:423
-msgid "Option modifiée avec succès !"
-msgstr "Option successfully modified!"
-
-#: elections/views.py:435
+#: elections/views.py:401
 msgid "Option supprimée !"
 msgstr "Option deleted!"
 
-#: elections/views.py:589
+#: elections/views.py:546
 msgid "Votre choix a bien été enregistré !"
 msgstr "Your choice has been recorded!"
 
@@ -937,24 +925,32 @@ msgstr ""
 msgid "L'équipe %(site_name)s"
 msgstr ""
 
-#: shared/templates/base.html:130
+#: shared/templates/base.html:32
 msgid "Revenir en haut de la page"
 msgstr "Scroll back to top"
 
-#: shared/templates/base.html:146
+#: shared/templates/base.html:55 shared/templates/base.html:159
 msgid "Élections"
 msgstr "Elections"
 
-#: shared/templates/base.html:178
+#: shared/templates/base.html:85
 #, python-format
 msgid "Connecté·e en tant que %(name)s par %(connection)s"
 msgstr "Logged in as %(name)s via %(connection)s"
 
-#: shared/templates/base.html:194
+#: shared/templates/base.html:100 shared/templates/base.html:198
 msgid "Se connecter"
 msgstr "Log in"
 
-#: shared/templates/base.html:278
+#: shared/templates/base.html:180
+msgid "Administration"
+msgstr "Management"
+
+#: shared/templates/base.html:191
+msgid "Déconnexion"
+msgstr "Log out"
+
+#: shared/templates/base.html:253
 msgid ""
 "Développé par <a class=\"tag is-light is-danger\" href=\"https://www.eleves."
 "ens.fr/kde\">KDEns</a>. En cas de pépin, contacter <span class=\"tag is-info "
@@ -996,6 +992,15 @@ msgstr "Log back in"
 msgid "Accueil"
 msgstr "Home"
 
+#~ msgid "Ajouter un rang"
+#~ msgstr "Add an rank"
+
+#~ msgid "Question modifiée avec succès !"
+#~ msgstr "Question successfully modified!"
+
+#~ msgid "Option modifiée avec succès !"
+#~ msgstr "Option successfully modified!"
+
 #~ msgid " [{}] :"
 #~ msgstr " [{}]:"