diff --git a/src/Form/EntryArticleType.php b/src/Form/EntryArticleType.php
index ea0769218..999096291 100644
--- a/src/Form/EntryArticleType.php
+++ b/src/Form/EntryArticleType.php
@@ -10,7 +10,7 @@
 use App\Form\EventListener\DefaultLanguage;
 use App\Form\EventListener\DisableFieldsOnEntryEdit;
 use App\Form\EventListener\ImageListener;
-use App\Form\Type\BadgesType;
+// use App\Form\Type\BadgesType;
 use App\Form\Type\LanguageType;
 use App\Form\Type\MagazineAutocompleteType;
 use Symfony\Component\Form\AbstractType;
@@ -47,13 +47,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'delimiter' => ' ',
                 ],
             ])
-            ->add(
-                'badges',
-                BadgesType::class,
-                [
-                    'required' => false,
-                ]
-            )
+            // ->add(
+            //     'badges',
+            //     BadgesType::class,
+            //     [
+            //         'required' => false,
+            //     ]
+            // )
             ->add(
                 'image',
                 FileType::class,
diff --git a/src/Form/EntryEditType.php b/src/Form/EntryEditType.php
index 1747be892..c331eed00 100644
--- a/src/Form/EntryEditType.php
+++ b/src/Form/EntryEditType.php
@@ -10,7 +10,7 @@
 use App\Form\EventListener\DefaultLanguage;
 use App\Form\EventListener\DisableFieldsOnEntryEdit;
 use App\Form\EventListener\ImageListener;
-use App\Form\Type\BadgesType;
+// use App\Form\Type\BadgesType;
 use App\Form\Type\LanguageType;
 use App\Form\Type\MagazineAutocompleteType;
 use Symfony\Component\Form\AbstractType;
@@ -48,13 +48,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'delimiter' => ' ',
                 ],
             ])
-            ->add(
-                'badges',
-                BadgesType::class,
-                [
-                    'required' => false,
-                ]
-            )
+            // ->add(
+            //     'badges',
+            //     BadgesType::class,
+            //     [
+            //         'required' => false,
+            //     ]
+            // )
             ->add(
                 'image',
                 FileType::class,
diff --git a/src/Form/EntryImageType.php b/src/Form/EntryImageType.php
index 44c53a625..49ea7f2c9 100644
--- a/src/Form/EntryImageType.php
+++ b/src/Form/EntryImageType.php
@@ -11,7 +11,7 @@
 use App\Form\EventListener\DisableFieldsOnEntryEdit;
 use App\Form\EventListener\ImageListener;
 use App\Form\EventListener\RemoveFieldsOnEntryImageEdit;
-use App\Form\Type\BadgesType;
+// use App\Form\Type\BadgesType;
 use App\Form\Type\LanguageType;
 use App\Form\Type\MagazineAutocompleteType;
 use Symfony\Component\Form\AbstractType;
@@ -48,13 +48,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'delimiter' => ' ',
                 ],
             ])
-            ->add(
-                'badges',
-                BadgesType::class,
-                [
-                    'required' => false,
-                ]
-            )
+            // ->add(
+            //     'badges',
+            //     BadgesType::class,
+            //     [
+            //         'required' => false,
+            //     ]
+            // )
             ->add(
                 'image',
                 FileType::class,
diff --git a/src/Form/EntryLinkType.php b/src/Form/EntryLinkType.php
index f3e78811e..f879d5484 100644
--- a/src/Form/EntryLinkType.php
+++ b/src/Form/EntryLinkType.php
@@ -10,7 +10,7 @@
 use App\Form\EventListener\DefaultLanguage;
 use App\Form\EventListener\DisableFieldsOnEntryEdit;
 use App\Form\EventListener\ImageListener;
-use App\Form\Type\BadgesType;
+// use App\Form\Type\BadgesType;
 use App\Form\Type\LanguageType;
 use App\Form\Type\MagazineAutocompleteType;
 use Symfony\Component\Form\AbstractType;
@@ -51,13 +51,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ->add('body', TextareaType::class, [
                 'required' => false,
             ])
-            ->add(
-                'badges',
-                BadgesType::class,
-                [
-                    'required' => false,
-                ]
-            )
+            // ->add(
+            //     'badges',
+            //     BadgesType::class,
+            //     [
+            //         'required' => false,
+            //     ]
+            // )
             ->add('magazine', MagazineAutocompleteType::class)
             ->add(
                 'image',
diff --git a/templates/entry/_form_article.html.twig b/templates/entry/_form_article.html.twig
index b493b39ec..ca937bf19 100644
--- a/templates/entry/_form_article.html.twig
+++ b/templates/entry/_form_article.html.twig
@@ -24,7 +24,7 @@
             }}) }}
     {{ form_row(form.magazine, {label: false}) }}
     {{ form_row(form.tags, {label: 'tags'}) }}
-    {{ form_row(form.badges, {label: 'badges'}) }}
+    {# form_row(form.badges, {label: 'badges'}) #}
 <div class="row params">
     {{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
     {{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
diff --git a/templates/entry/_form_edit.html.twig b/templates/entry/_form_edit.html.twig
index 9034a2acc..df791e587 100644
--- a/templates/entry/_form_edit.html.twig
+++ b/templates/entry/_form_edit.html.twig
@@ -31,7 +31,7 @@
         }}) }}
     {{ form_row(form.magazine, {label: false}) }}
     {{ form_row(form.tags, {label: 'tags'}) }}
-    {{ form_row(form.badges, {label: 'badges'}) }}
+    {# form_row(form.badges, {label: 'badges'}) #}
 <div class="row params">
     {{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
     {{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
diff --git a/templates/entry/_form_image.html.twig b/templates/entry/_form_image.html.twig
index 6c18f211f..88b3306bc 100644
--- a/templates/entry/_form_image.html.twig
+++ b/templates/entry/_form_image.html.twig
@@ -14,7 +14,7 @@
     }}) }}
     {{ form_row(form.magazine, {label: false}) }}
     {{ form_row(form.tags, {label: 'tags'}) }}
-    {{ form_row(form.badges, {label: 'badges'}) }}
+    {# form_row(form.badges, {label: 'badges'}) #}
 <div class="row params">
     {{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
     {{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
diff --git a/templates/entry/_form_link.html.twig b/templates/entry/_form_link.html.twig
index 3b2eb0eb1..6e7eea005 100644
--- a/templates/entry/_form_link.html.twig
+++ b/templates/entry/_form_link.html.twig
@@ -34,7 +34,7 @@
         }}) }}
     {{ form_row(form.magazine, {label: false}) }}
     {{ form_row(form.tags, {label: 'tags'}) }}
-    {{ form_row(form.badges, {label: 'badges'}) }}
+    {# form_row(form.badges, {label: 'badges'}) #}
 <div class="row params">
     {{ form_row(form.isAdult, {label: 'is_adult', row_attr: {class: 'checkbox'}}) }}
     {{ form_row(form.isOc, {label: 'oc', row_attr: {class: 'checkbox'}}) }}
diff --git a/templates/entry/create_article.html.twig b/templates/entry/create_article.html.twig
index 017fec1e7..16951974c 100644
--- a/templates/entry/create_article.html.twig
+++ b/templates/entry/create_article.html.twig
@@ -14,7 +14,9 @@
 
 {% block body %}
     {% include 'entry/_create_options.html.twig' %}
-    <h1 hidden>{{ 'add_new_article'|trans }}</h1>
+    <header>
+        <h1 hidden>{{ 'add_new_article'|trans }}</h1>
+    </header>
     {% include 'layout/_flash.html.twig' %}
     {% include('user/_visibility_info.html.twig') %}
 
diff --git a/templates/entry/create_image.html.twig b/templates/entry/create_image.html.twig
index 2c1896b14..ae50099d2 100644
--- a/templates/entry/create_image.html.twig
+++ b/templates/entry/create_image.html.twig
@@ -14,7 +14,9 @@
 
 {% block body %}
     {% include 'entry/_create_options.html.twig' %}
-    <h1 hidden>{{ 'add_new_photo'|trans }}</h1>
+    <header>
+        <h1 hidden>{{ 'add_new_photo'|trans }}</h1>
+    </header>
     {% include('user/_visibility_info.html.twig') %}
     {% include 'layout/_flash.html.twig' %}
 
diff --git a/templates/entry/create_link.html.twig b/templates/entry/create_link.html.twig
index 1f3b17942..8c6dbab7e 100644
--- a/templates/entry/create_link.html.twig
+++ b/templates/entry/create_link.html.twig
@@ -14,7 +14,9 @@
 
 {% block body %}
     {% include 'entry/_create_options.html.twig' %}
-    <h1 hidden>{{ 'add_new_link'|trans }}</h1>
+    <header>
+        <h1 hidden>{{ 'add_new_link'|trans }}</h1>
+    </header>
     {% include 'layout/_flash.html.twig' %}
     {% include('user/_visibility_info.html.twig') %}
 
diff --git a/templates/entry/edit_entry.html.twig b/templates/entry/edit_entry.html.twig
index f1626172f..c274bf8c2 100644
--- a/templates/entry/edit_entry.html.twig
+++ b/templates/entry/edit_entry.html.twig
@@ -18,7 +18,9 @@
         class: 'section--top'
     }) }}
 
-    <h1 hidden>{{ 'edit_entry'|trans }}</h1>
+    <header>
+        <h1 hidden>{{ 'edit_entry'|trans }}</h1>
+    </header>
     {% include 'layout/_flash.html.twig' %}
     <div id="content" class="section">
         <div class="container" data-controller="entry-link-create">
diff --git a/templates/magazine/create.html.twig b/templates/magazine/create.html.twig
index 6f1af4d13..598587163 100644
--- a/templates/magazine/create.html.twig
+++ b/templates/magazine/create.html.twig
@@ -17,7 +17,9 @@
     {% include('user/_visibility_info.html.twig') %}
 
     {% if user.visibility is same as 'visible' %}
-    <h1 hidden>{{ 'create_new_magazine'|trans }}</h1>
+    <header>
+        <h1 hidden>{{ 'create_new_magazine'|trans }}</h1>
+    </header>
     <div id="content" class="section">
         <div class="container">
             {{ form_start(form) }}
diff --git a/templates/magazine/list_abandoned.html.twig b/templates/magazine/list_abandoned.html.twig
index fe51ad43e..8210dea61 100644
--- a/templates/magazine/list_abandoned.html.twig
+++ b/templates/magazine/list_abandoned.html.twig
@@ -16,6 +16,7 @@
     <header>
         <h1 hidden>{{ 'magazines'|trans }}</h1>
     </header>
+
     {% include 'magazine/_options.html.twig' %}
     <div id="content">
         {% if magazines|length %}