diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py
index 54e0176b..28d6249b 100644
--- a/app/scodoc/html_sco_header.py
+++ b/app/scodoc/html_sco_header.py
@@ -134,7 +134,7 @@ def scodoc_top_html_header(page_title="ScoDoc: bienvenue"):
 def sco_header(
     # optional args
     page_title="",  # page title
-    no_side_bar=False,  # hide sidebar
+    no_sidebar=False,  # hide sidebar
     cssstyles=(),  # additionals CSS sheets
     javascripts=(),  # additionals JS filenames to load
     scripts=(),  # script to put in page header
@@ -154,13 +154,13 @@ def sco_header(
 
     params = {
         "page_title": page_title or sco_version.SCONAME,
-        "no_side_bar": no_side_bar,
+        "no_sidebar": no_sidebar,
         "ScoURL": url_for("scolar.index_html", scodoc_dept=g.scodoc_dept),
         "encoding": scu.SCO_ENCODING,
         "titrebandeau_mkup": "<td>" + titrebandeau + "</td>",
         "authuser": current_user.user_name,
     }
-    if no_side_bar:
+    if no_sidebar:
         params["margin_left"] = "1em"
     else:
         params["margin_left"] = "140px"
@@ -217,7 +217,7 @@ def sco_header(
 <!-- Legacy ScoDoc header -->
 <body>
 {scu.CUSTOM_HTML_HEADER}
-{'' if no_side_bar else html_sidebar.sidebar(etudid)}
+{'' if no_sidebar else html_sidebar.sidebar(etudid)}
 <div id="gtrcontent">
 """
     )
diff --git a/app/scodoc/sco_archives_formsemestre.py b/app/scodoc/sco_archives_formsemestre.py
index f2fbde23..cbcbd201 100644
--- a/app/scodoc/sco_archives_formsemestre.py
+++ b/app/scodoc/sco_archives_formsemestre.py
@@ -127,7 +127,7 @@ def do_formsemestre_archive(
             [
                 html_sco_header.sco_header(
                     page_title=f"Moyennes archivées le {date}",
-                    no_side_bar=True,
+                    no_sidebar=True,
                 ),
                 f'<h2 class="fontorange">Valeurs archivées le {date}</h2>',
                 """<style type="text/css">table.notes_recapcomplet tr {  color: rgb(185,70,0); }
diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py
index 1d3d3da4..afaa44ed 100644
--- a/app/scodoc/sco_edit_ue.py
+++ b/app/scodoc/sco_edit_ue.py
@@ -765,23 +765,6 @@ def ue_table(formation_id=None, semestre_idx=1, msg=""):  # was ue_list
         "delete_small_dis_img", title="Suppression impossible (module utilisé)"
     )
     H = [
-<<<<<<< HEAD
-=======
-        html_sco_header.sco_header(
-            cssstyles=html_sco_header.BOOTSTRAP_CSS
-            + ["libjs/jQuery-tagEditor/jquery.tag-editor.css", "css/ue_table.css"],
-            javascripts=html_sco_header.BOOTSTRAP_JS
-            + [
-                "libjs/jinplace-1.2.1.min.js",
-                "js/ue_list.js",
-                "js/edit_ue.js",
-                "libjs/jQuery-tagEditor/jquery.tag-editor.min.js",
-                "libjs/jQuery-tagEditor/jquery.caret.min.js",
-                "js/module_tag_editor.js",
-            ],
-            page_title=f"Formation {formation.acronyme} v{formation.version}",
-        ),
->>>>>>> iziram-frontend
         f"""<h2>{formation.html()} {lockicon}
         </h2>
         """,
@@ -1076,9 +1059,9 @@ du programme" (menu "Semestre") si vous avez un semestre en cours);
         "sco_page_dept.j2",
         content="".join(H),
         page_title=f"Formation {formation.acronyme} v{formation.version}",
-        cssstyles=html_sco_header.BOOTSTRAP_MULTISELECT_CSS
+        cssstyles=html_sco_header.BOOTSTRAP_CSS
         + ["libjs/jQuery-tagEditor/jquery.tag-editor.css", "css/ue_table.css"],
-        javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS
+        javascripts=html_sco_header.BOOTSTRAP_JS
         + [
             "libjs/jinplace-1.2.1.min.js",
             "js/ue_list.js",
@@ -1147,7 +1130,9 @@ def _ue_table_ues(
             scodoc_dept=g.scodoc_dept,
             ue_id=ue["ue_id"],
         )
-        ue["code_apogee_str"] = f""", Apo: <span
+        ue[
+            "code_apogee_str"
+        ] = f""", Apo: <span
             class="{klass}" data-url="{edit_url}" id="{ue['ue_id']}"
             data-placeholder="{scu.APO_MISSING_CODE_STR}">{
                 ue["code_apogee"] or ""
diff --git a/app/scodoc/sco_find_etud.py b/app/scodoc/sco_find_etud.py
index 6fad97cb..ecf97dc9 100644
--- a/app/scodoc/sco_find_etud.py
+++ b/app/scodoc/sco_find_etud.py
@@ -180,7 +180,7 @@ def search_etud_in_dept(expnom=""):
     H = [
         html_sco_header.sco_header(
             page_title="Recherche d'un étudiant",
-            no_side_bar=False,
+            no_sidebar=False,
             javascripts=["js/etud_info.js"],
         )
     ]
diff --git a/app/scodoc/sco_recapcomplet.py b/app/scodoc/sco_recapcomplet.py
index 98075d76..35eb2f81 100644
--- a/app/scodoc/sco_recapcomplet.py
+++ b/app/scodoc/sco_recapcomplet.py
@@ -122,7 +122,7 @@ def formsemestre_recapcomplet(
         html_sco_header.sco_header(
             page_title=f"{formsemestre.sem_modalite()}: "
             + ("jury" if mode_jury else "moyennes"),
-            no_side_bar=True,
+            no_sidebar=True,
             javascripts=["js/etud_info.js", "js/table_recap.js"],
         ),
         sco_formsemestre_status.formsemestre_status_head(
diff --git a/app/scodoc/sco_report.py b/app/scodoc/sco_report.py
index 919f70e4..5fa740c6 100644
--- a/app/scodoc/sco_report.py
+++ b/app/scodoc/sco_report.py
@@ -1747,7 +1747,7 @@ def formsemestre_graph_cursus(
                 cssstyles=sco_groups_view.CSSSTYLES,
                 javascripts=sco_groups_view.JAVASCRIPTS,
                 page_title="Graphe cursus de %(titreannee)s" % sem,
-                no_side_bar=True,
+                no_sidebar=True,
             ),
             """<h2 class="formsemestre">Cursus des étudiants de ce semestre</h2>""",
             doc,
diff --git a/app/static/css/scodoc97.css b/app/static/css/scodoc97.css
index f13607e7..3b6d3c78 100644
--- a/app/static/css/scodoc97.css
+++ b/app/static/css/scodoc97.css
@@ -21,9 +21,10 @@
     display: flex;
     flex-direction: column;
     flex-grow: 1;
+    font-family: Arial, Helvetica, sans-serif;
     justify-content: left;
     white-space: nowrap;
-    padding: 0 10px;
+    padding: 0 0px;
     /* Optional: Padding for some space around the text */
 }
 
diff --git a/app/templates/formsemestre/menu.j2 b/app/templates/formsemestre/menu.j2
index cc60c22a..bc8d3e76 100644
--- a/app/templates/formsemestre/menu.j2
+++ b/app/templates/formsemestre/menu.j2
@@ -1,10 +1,9 @@
 {# Styles du menu #}
 <style>
-    /**
+/**
  * Menu Formsemestre
  *
  * @author Matthias HARTMANN (Iziram)
- * @license MIT
 
  * Approche Mobile-first
  */
@@ -33,7 +32,7 @@
         border-top: var(--sco-formsemestre-color-accent) solid 3px;
         padding: 0 1rem;
         border-radius: 4px;
-        margin: 0 4px;
+        margin: 0 0px;
     }
 
     .sco-formsemestre-menu-container {
@@ -119,7 +118,7 @@
     .sco-formsemestre-menu-menu>.dropdown>summary {
         text-transform: uppercase;
         font-weight: bold;
-        font-size: 14px !important;
+        font-size: 12px !important;
     }
 
     .sco-formsemestre-menu-link {
@@ -179,6 +178,7 @@
         }
 
         .sco-formsemestre-menu .dropdown {
+            padding-right: 16px;
             position: relative;
         }
 
@@ -460,7 +460,7 @@
             <button class="sco-formsemestre-menu-toggle" aria-label="Toggle menu">
                 <span class="sco-formsemestre-menu-toggle-icon"></span>
             </button>
-    
+
             {# Menu #}
             <ul class="sco-formsemestre-menu-menu">
                 {% for category, items in menu.items() %}
