diff --git a/labonneboite/web/app.py b/labonneboite/web/app.py
index eead457ee..8efc79f09 100644
--- a/labonneboite/web/app.py
+++ b/labonneboite/web/app.py
@@ -210,6 +210,33 @@ def inject_user():
     def inject_jepostule_enabled():
         return {'jepostule_enabled': jepostule_enabled}
 
+    def inject_compute_input_attributes():
+        """
+        Template side function to populate 'aria-required' and
+        'aria-describedby' attributes in form fields
+        """
+        def compute_input_attributes(field):
+            attrs = {}
+
+            if field.flags.required:
+                attrs['aria-required'] = 'true'
+
+            # aria-describedby are used to link input fields to their description and/or error messages
+            aria_describedby = []
+            if field.description:
+                aria_describedby.append('{}_description'.format(field.id))
+            if field.errors:
+                aria_describedby.append('{}_errors'.format(field.id))
+
+            if aria_describedby:
+                attrs['aria-describedby'] = ' '.join(aria_describedby)
+
+            return attrs
+
+        return dict(compute_input_attributes=compute_input_attributes)
+
+
+    flask_app.context_processor(inject_compute_input_attributes)
     flask_app.context_processor(inject_dict_for_all_templates)
     flask_app.context_processor(inject_user)
     flask_app.context_processor(inject_jepostule_enabled)
diff --git a/labonneboite/web/contact_form/forms.py b/labonneboite/web/contact_form/forms.py
index b02d4bbc4..4857aa7c9 100644
--- a/labonneboite/web/contact_form/forms.py
+++ b/labonneboite/web/contact_form/forms.py
@@ -25,7 +25,7 @@ class OfficeIdentificationForm(FlaskForm):
         'N° de Siret *',
         validators=[
             DataRequired(),
-            Regexp('[0-9]{14}', message=("Le siret de l'établissement est invalide (14 chiffres)"))
+            Regexp('[0-9]{14}', message=("Le siret de l'établissement est invalide (14 chiffres sans espace)"))
         ],
         description="14 chiffres, sans espace. Exemple: 36252187900034",
     )
@@ -34,13 +34,13 @@ class OfficeIdentificationForm(FlaskForm):
     first_name = StringField('Prénom *', validators=[DataRequired()])
     phone = TelField(
         'Téléphone *',
-        validators=[DataRequired(), Regexp(PHONE_REGEX)],
-        render_kw={"placeholder": "01 77 86 39 49, +331 77 86 39 49"}
+        description="Exemple: 01 77 86 39 49 ou +331 77 86 39 49",
+        validators=[DataRequired(), Regexp(PHONE_REGEX, message="Entrée invalide. Exemple valide: 01 77 86 39 49 ou +331 77 86 39 49")],
     )
     email = EmailField(
         'Adresse email *',
-        validators=[DataRequired(), Email()],
-        render_kw={"placeholder": "exemple@domaine.com"}
+        description="Exemple: exemple@domaine.com",
+        validators=[DataRequired(), Email(message="Entrée invalide. Exemple valide: exemple@domaine.com")],
     )
 
 
@@ -48,16 +48,8 @@ class OfficeHiddenIdentificationForm(FlaskForm):
     siret = HiddenField('Siret *', validators=[DataRequired()])
     last_name = HiddenField('Nom *', validators=[DataRequired()])
     first_name = HiddenField('Prénom *', validators=[DataRequired()])
-    phone = HiddenField(
-        'Téléphone *',
-        validators=[DataRequired(), Regexp(PHONE_REGEX)],
-        render_kw={"placeholder": "01 77 86 39 49, +331 77 86 39 49"}
-    )
-    email = HiddenField(
-        'Adresse email *',
-        validators=[DataRequired(), Email()],
-        render_kw={"placeholder": "exemple@domaine.com"}
-    )
+    phone = HiddenField('Téléphone *', validators=[DataRequired(), Regexp(PHONE_REGEX)])
+    email = HiddenField('Adresse email *', validators=[DataRequired(), Email()])
 
 
 class OfficeOtherRequestForm(OfficeHiddenIdentificationForm):
@@ -77,27 +69,33 @@ class OfficeUpdateCoordinatesForm(OfficeHiddenIdentificationForm):
     new_contact_mode = RadioField('Mode de contact à privilégier', choices=CONTACT_MODES, default='email')
     new_website = StringField(
         'Site Internet',
-        validators=[URL(), Optional()], render_kw={"placeholder": "http://exemple.com"}
+        description="Exemple: http://exemple.com",
+        validators=[URL(message="Entrée invalide. Exemple: http://exemple.com"), Optional()]
     )
     new_email = EmailField(
         'Email recruteur',
-        validators=[Email(), Optional()], render_kw={"placeholder": "exemple@domaine.com"}
+        description="Exemple: exemple@domaine.com",
+        validators=[Email(message="Entrée invalide. Exemple valide: exemple@domaine.com"), Optional()]
     )
     new_phone = StringField(
         'Téléphone',
-        validators=[Optional(), Regexp(PHONE_REGEX)],
-        render_kw={"placeholder": "01 77 86 39 49, +331 77 86 39 49"}
+        description="Exemple: 01 77 86 39 49 ou +331 77 86 39 49",
+        validators=[Optional(), Regexp(PHONE_REGEX, message="Entrée invalide. Exemple valide: 01 77 86 39 49 ou +331 77 86 39 49")]
+    )
+    social_network = StringField(
+        'Réseau social',
+        description="Exemple: https://twitter.com/0123456_abcdef",
+        validators=[URL(message="Entrée invalide. Exemple: https://twitter.com/0123456_abcdef"), Optional()]
     )
-    social_network = StringField('Réseau social', validators=[URL(), Optional()])
     new_email_alternance = EmailField(
         'Email recruteur spécialisé alternance',
-        validators=[validators.optional(), Email()],
-        render_kw={"placeholder": "exemple-alternance@domaine.com"}
+        description="Exemple: exemple@domaine.com",
+        validators=[validators.optional(), Email(message="Entrée invalide. Exemple valide: exemple@domaine.com")]
     )
     new_phone_alternance = StringField(
         'Téléphone du recruteur spécialisé alternance',
-        validators=[validators.optional(), Regexp(PHONE_REGEX)],
-        render_kw={"placeholder": "01 77 86 39 49, +331 77 86 39 49"}
+        description="Exemple: 01 77 86 39 49 ou +331 77 86 39 49",
+        validators=[validators.optional(), Regexp(PHONE_REGEX, message="Entrée invalide. Exemple valide: 01 77 86 39 49 ou +331 77 86 39 49")]
     )
     rgpd_consent = BooleanField(
         'En cochant cette case, vous consentez à diffuser des données à caractère personnel sur les services numériques de Pôle emploi.',
diff --git a/labonneboite/web/contact_form/views.py b/labonneboite/web/contact_form/views.py
index cbacb2d5a..37c16b8a6 100644
--- a/labonneboite/web/contact_form/views.py
+++ b/labonneboite/web/contact_form/views.py
@@ -152,7 +152,7 @@ def change_info():
     if form.validate_on_submit():
         office = models.Office.query.filter(models.Office.siret == form.siret.data).first()
         if not office:
-            flash(unknown_siret_message(), 'error')
+            form.siret.errors.append(unknown_siret_message())
         else:
             params = {key: form.data[key] for key in ['siret', 'last_name', 'first_name', 'phone', 'email']}
             if is_recruiter_from_lba():
@@ -162,14 +162,15 @@ def change_info():
             return redirect(url)
 
     return render_template('contact_form/form.html',
-        title='Identifiez-vous',
+        title='Erreur - Identifiez-vous' if form.errors else 'Identifiez-vous',
         submit_text='suivant',
         extra_submit_class='identification-form',
         form=form,
         is_certified_recruiter=peam_recruiter.is_certified_recruiter(),
         is_recruiter=peam_recruiter.is_recruiter(),
         use_lba_template=is_recruiter_from_lba(),
-        show_disclaimer=True,
+        show_credentials_disclaimer=True,
+        show_required_disclaimer=True,
         hide_return=True,
         custom_ga_pageview='/recruteur/%s/identification' % action_name,
     )
@@ -237,7 +238,7 @@ def update_coordinates_form(form):
             else:
                 redirect_params = get_success_value()
                 return render_template('contact_form/success_message.html',
-                    title="Merci pour votre message",
+                    title="Confirmation - Merci pour votre message",
                     use_lba_template=is_recruiter_from_lba(),
                     site_name=redirect_params.get('site_name'),
                     email=redirect_params.get('email'),
@@ -249,8 +250,9 @@ def update_coordinates_form(form):
                 )
 
     return render_template('contact_form/form.html',
-        title='Modifier ma fiche entreprise',
+        title='Erreur - Modifier ma fiche entreprise' if form.errors else 'Modifier ma fiche entreprise',
         form=form,
+        submit_text='Modifier ma fiche entreprise',
         params=extract_recruiter_data(),
         use_lba_template=is_recruiter_from_lba(),
         show_entreprise_page=True,
@@ -297,7 +299,7 @@ def update_jobs_form(form):
         else:
             redirect_params = get_success_value()
             return render_template('contact_form/success_message.html',
-                title="Merci pour votre message",
+                title="Confirmation - Merci pour votre message",
                 use_lba_template=is_recruiter_from_lba(),
                 site_name=redirect_params.get('site_name'),
                 email=redirect_params.get('email'),
@@ -311,8 +313,9 @@ def update_jobs_form(form):
 
 
     return render_template('contact_form/change_job_infos.html',
-        title='Demande de modification des métiers',
+        title='Erreur - Demande de modification des métiers' if form.errors else 'Demande de modification des métiers',
         form=form,
+        submit_text='Modifier mes métiers',
         params=extract_recruiter_data(),
         use_lba_template=is_recruiter_from_lba(),
         manually_added_jobs=extract_manually_added_jobs(office),
@@ -340,7 +343,7 @@ def delete_form(form):
         else:
             redirect_params = get_success_value()
             return render_template('contact_form/success_message.html',
-                title="Merci pour votre message",
+                title="Confirmation - Merci pour votre message",
                 use_lba_template=is_recruiter_from_lba(),
                 site_name=redirect_params.get('site_name'),
                 email=redirect_params.get('email'),
@@ -351,8 +354,9 @@ def delete_form(form):
 
 
     return render_template('contact_form/form.html',
-        title='Supprimer mon entreprise',
+        title='Erreur - Supprimer mon entreprise' if form.errors else 'Supprimer mon entreprise',
         form=form,
+        submit_text='Supprimer mon entreprise',
         params=extract_recruiter_data(),
         use_lba_template=is_recruiter_from_lba(),
         custom_ga_pageview='/recruteur/delete/delete',
@@ -378,7 +382,7 @@ def other_form(form):
         else:
             redirect_params = get_success_value()
             return render_template('contact_form/success_message.html',
-                title="Merci pour votre message",
+                title="Confirmation - Merci pour votre message",
                 use_lba_template=is_recruiter_from_lba(),
                 site_name=redirect_params.get('site_name'),
                 email=redirect_params.get('email'),
@@ -390,8 +394,9 @@ def other_form(form):
 
     return render_template(
         'contact_form/form.html',
+        title='Erreur - Autre demande' if form.errors else 'Autre demande',
         form=form,
-        title='Autre demande',
+        submit_text='Envoyer votre message',
         params=extract_recruiter_data(),
         use_lba_template=is_recruiter_from_lba(),
         show_required_disclaimer=True,
diff --git a/labonneboite/web/static/css/forms.css b/labonneboite/web/static/css/forms.css
index 58fc2a581..05c9745c5 100644
--- a/labonneboite/web/static/css/forms.css
+++ b/labonneboite/web/static/css/forms.css
@@ -187,7 +187,7 @@ textarea.form-error,
     margin-bottom: 30px;
     font-size: 1.1em;
 }
-.action-chooser-form h2 {
+.action-chooser-form h1 {
     margin-bottom: 50px;
 }
 
@@ -229,14 +229,29 @@ textarea.form-error,
     margin-top: 50px;
 }
 
+/* Fieldset */
+fieldset {
+    padding: 0;
+    border: none;
+}
+fieldset legend {
+    padding: 0;
+    font-weight: bold;
+}
+
+
 /* Update jobs form */
 .update-jobs-form table,
 .update-jobs-form table th,
 .update-jobs-form table td {
     border: none;
 }
-.update-jobs-form table th {
+.update-jobs-form table tr.header td {
     text-align: center;
+    background: #e0e0e0;
+    vertical-align: bottom;
+    font-weight: bold;
+    padding: .625rem 1rem;
 }
 
 .update-jobs-form table td {
diff --git a/labonneboite/web/static/js/recruiter-forms.js b/labonneboite/web/static/js/recruiter-forms.js
index f93f835c8..9020d7189 100644
--- a/labonneboite/web/static/js/recruiter-forms.js
+++ b/labonneboite/web/static/js/recruiter-forms.js
@@ -118,10 +118,10 @@
   var $newJobTable = $('.add-new-jobs table');
   var $newJobTbody = $newJobTable.find('tbody');
   var $newJobInput = $('.add-new-jobs input[name=new-job]');
-  var jobRowTemplate = '<tr id="{ROME}"><td><span><label for="{ROME}">{LABEL}</label></span></td>' +
-      '<td class="text-center"><span class="sr-only">Intéressé par les candidatures</span><input checked="checked" type="checkbox" name="{ROME}" value="lbb"></td>' +
-      '<td class="text-center"><span class="sr-only">Ouvert aux contrats d\'alternance</span><input checked="checked" type="checkbox" name="{ROME}" value="lba"></td>' +
-      '<td class="text-center"><button class="btn remove" data-rome="{ROME}">Supprimer</button></td></tr>';
+  var jobRowTemplate = '<tr id="{ROME}"><td class="text-left"><b>{LABEL}</b></td>' +
+      '<td class="text-center"><label for="lbb-{ROME}" class="sr-only">Intéressé par les candidatures pour le métier de {LABEL}</label><input checked="checked" id="lbb-{ROME}" type="checkbox" name="{ROME}" value="lbb" /></td>' +
+      '<td class="text-center"><label for="lbb-{ROME}" class="sr-only">Ouvert aux contrats d\'alternance pour le métier de {LABEL}</span><input checked="checked" id="lbb-{ROME}" type="checkbox" name="{ROME}" value="lba" /></td>' +
+      '<td class="text-center"><button class="btn remove" data-rome="{ROME}" title="Supprimer le métier {LABEL}">Supprimer<span class="sr-only">le métier de {LABEL}</span></button></td></tr>';
 
   $newJobInput.autocomplete({
     delay: 200,
diff --git a/labonneboite/web/templates/base.html b/labonneboite/web/templates/base.html
index 83f22457c..348dff2f6 100644
--- a/labonneboite/web/templates/base.html
+++ b/labonneboite/web/templates/base.html
@@ -82,7 +82,7 @@
 
   {% with messages = get_flashed_messages(with_categories=true) %}
     {% if messages %}
-      <div class="lbb-flash-alerts">
+      <div class="lbb-flash-alerts" role="alert">
         {% for category, message in messages %}
           <div class="alert alert-{{ category }} js-alert-close">
             <p>{{ message }}</p>
diff --git a/labonneboite/web/templates/base_lba.html b/labonneboite/web/templates/base_lba.html
index 9cbe055d2..edbe23270 100644
--- a/labonneboite/web/templates/base_lba.html
+++ b/labonneboite/web/templates/base_lba.html
@@ -24,7 +24,7 @@
 
   {% with messages = get_flashed_messages(with_categories=true) %}
     {% if messages %}
-      <div class="lbb-flash-alerts">
+      <div class="lbb-flash-alerts" role="alert">
         {% for category, message in messages %}
           <div class="alert alert-{{ category }} js-alert-close">
             <p>{{ message }}</p>
diff --git a/labonneboite/web/templates/contact_form/ask_action.html b/labonneboite/web/templates/contact_form/ask_action.html
index ef020c600..dd4e9b741 100644
--- a/labonneboite/web/templates/contact_form/ask_action.html
+++ b/labonneboite/web/templates/contact_form/ask_action.html
@@ -10,7 +10,7 @@
 <div class="lbb-content">
   <div class="lbb-single-column-content action-chooser-form">
 
-    <h2>Que voulez-vous faire ?</h2>
+    <h1>Que voulez-vous faire ?</h1>
 
     <a class="btn btn-small" href="{{ url_for('contact_form.ask_recruiter_pe_connect', siret=siret, action_name='update_coordinates', origin=('labonnealternance' if use_lba_template else '')) }}">Modifier les coordonnées de mon entreprise</a>
     <a class="btn btn-small" href="{{ url_for('contact_form.ask_recruiter_pe_connect', siret=siret, action_name='update_jobs', origin=('labonnealternance' if use_lba_template else '')) }}">Modifier les métiers pour lesquels je reçois des candidatures spontanées</a>
diff --git a/labonneboite/web/templates/contact_form/ask_recruiter_pe_connect.html b/labonneboite/web/templates/contact_form/ask_recruiter_pe_connect.html
index 4ae97940e..ac8f35337 100644
--- a/labonneboite/web/templates/contact_form/ask_recruiter_pe_connect.html
+++ b/labonneboite/web/templates/contact_form/ask_recruiter_pe_connect.html
@@ -10,7 +10,7 @@
 <div class="lbb-content">
     <div class="lbb-single-column-content verification-form">
 
-        <h2>Demande de modification des informations de mon entreprise</h2>
+        <h1>Demande de modification des informations de mon entreprise</h1>
 
         <p class="text-center">Veuillez utiliser vos identifiants Pôle emploi “accès recruteur” pour une prise en
             compte plus rapide de vos modifications.</p>
diff --git a/labonneboite/web/templates/contact_form/change_info_or_apply_for_job.html b/labonneboite/web/templates/contact_form/change_info_or_apply_for_job.html
index d44d25a3d..e15a4958b 100644
--- a/labonneboite/web/templates/contact_form/change_info_or_apply_for_job.html
+++ b/labonneboite/web/templates/contact_form/change_info_or_apply_for_job.html
@@ -10,7 +10,7 @@
 <div class="lbb-content">
     <div class="lbb-single-column-content verification-form">
 
-        <h2>Demande de modification des informations de mon entreprise</h2>
+        <h1>Demande de modification des informations de mon entreprise</h1>
 
         <p class="text-center">Veuillez sélectionner votre situation :</p>
 
diff --git a/labonneboite/web/templates/contact_form/change_job_infos.html b/labonneboite/web/templates/contact_form/change_job_infos.html
index 1f52ebc6a..c56955873 100644
--- a/labonneboite/web/templates/contact_form/change_job_infos.html
+++ b/labonneboite/web/templates/contact_form/change_job_infos.html
@@ -9,7 +9,7 @@
 <div class="lbb-content">
   <div class="lbb-single-column-content">
 
-    <a class="return-btn" href="{{ url_for('contact_form.ask_action') }}?{{ params }}">Retour</a>
+    <a class="return-btn" href="{{ url_for('contact_form.ask_action') }}?{{ params }}" title="Retourner aux choix des actions">Retour</a>
 
     <form class="form-vertical update-jobs-form" action="" method="post">
       <h2>{{ title }}</h2>
@@ -19,80 +19,85 @@ <h2>{{ title }}</h2>
         Notre algorithme se base sur une analyse fine des déclaration préalables à l'embauche faites en fonction du secteur d'activité auquel appartient votre entreprise (votre code Insee NAF).
       </p>
 
-      <table class="jobs">
-        <thead>
-          <th></th>
-          <th>Intéressé par des candidatures</th>
-          <th>Ouvert aux contrats d'alternance</th>
-          <th></th>
-        </thead>
-        <tbody>
-
-          {% for rome_field in rome_fields %}
-            <tr id="{{ rome_field.code }}" {% if rome_field.current_values[0] == 'hide' %}class="removed"{% endif %}>
-              <td>
-                <label for={{ rome_field.code }}>{{ rome_field.name }}</label>
-              </td>
+      <table class="jobs" role="presentation">
+        <tr class="header">
+          <td></td>
+          <td>Intéressé par des candidatures</td>
+          <td>Ouvert aux contrats d'alternance</td>
+          <td></td>
+        </tr>
+
+        {% for rome_field in rome_fields %}
+          <tr id="{{ rome_field.code }}" {% if rome_field.current_values[0] == 'hide' %}class="removed"{% endif %}>
+            <td class="text-left">
+              <b>{{ rome_field.name }}</b>
+            </td>
+
+            <td class="text-center">
+                <label for="lbb-{{ rome_field.code }}" class="sr-only">Intéressé par les candidatures pour le métier de {{ rome_field.name }}</label>
+                <input
+                  {% if 'lbb' in rome_field.current_values %}checked="checked" {% endif %}
+                  id="lbb-{{ rome_field.code }}" type="checkbox" name="{{ rome_field.code }}" value="lbb" />
+            </td>
+
+            <td class="text-center">
+                <label for="lba-{{ rome_field.code }}" class="sr-only">Métier ouvert à l'alternance</label>
+                <input
+                  {% if 'lba' in rome_field.current_values %}checked="checked" {% endif %}
+                  id="lba-{{ rome_field.code }}" type="checkbox" name="{{ rome_field.code }}" value="lba" />
+            </td>
+
+            <td>
+                <label for="remove-{{ rome_field.code }}" class="sr-only">Supprimer ce métier</label>
+                <input class="hide sr-only"
+                  {% if 'hide' in rome_field.current_values %}checked="checked" {% endif %}
+                  id="remove-{{ rome_field.code }}" type="checkbox" name="{{ rome_field.code }}" value="hide" />
+
+                  <button class="remove btn">
+                    {% if 'hide' in rome_field.current_values %}Restaurer{% else %}Supprimer{% endif %}
+                  </button>
+            </td>
+          </tr>
+        {% endfor %}
+      </table>
 
+      <div class="add-new-jobs">
+        <label for="j">Ajouter un nouveau métier :</label>
+        <input class="ui-autocomplete-input" name="new-job" placeholder="" type="text" value="" autocomplete="off">
+
+
+        <table class="{% if not manually_added_jobs %}hidden{% endif %}" role="presentation">
+          <tr class="header">
+            <td></td>
+            <td>Intéressé par des candidatures</td>
+            <td>Ouvert aux contrats d'alternance</td>
+            <td></td>
+          </tr>
+
+          {% for job in manually_added_jobs %}
+            <tr id="{{ job.id }}">
+              <td class="text-left">
+                <span>
+                  <b>{{ job.label }}</b>
+              </span>
+              </td>
               <td class="text-center">
-                  <span class="sr-only">Intéressé par les candidatures</span>
-                  <input
-                    {% if 'lbb' in rome_field.current_values %}checked="checked" {% endif %}
-                    type="checkbox" name="{{ rome_field.code }}" value="lbb" />
+                <label for="lbb-{{ job.id }}" class="sr-only">Intéressé par les candidatures pour le métier de {{ job.label }}</label>
+                <input {% if job.lbb %}checked{% endif %} id="lbb-{{ job.id }}" type="checkbox" name="{{ job.id }}" value="lbb" />
               </td>
-
               <td class="text-center">
-                  <span class="sr-only">Métier ouvert à l'alternance</span>
-                  <input
-                    {% if 'lba' in rome_field.current_values %}checked="checked" {% endif %}
-                    type="checkbox" name="{{ rome_field.code }}" value="lba" />
+                <label for="lbb-{{ job.id }}" class="sr-only">Ouvert aux contrats d'alternance pour le métier de {{ job.label }}</span>
+                <input {% if job.lba %}checked{% endif %} id="lbb-{{ job.id }}" type="checkbox" name="{{ job.id }}" value="lba" />
               </td>
-
-              <td>
-                  <span class="sr-only">Supprimer ce métier</span>
-                  <input class="hide sr-only"
-                    {% if 'hide' in rome_field.current_values %}checked="checked" {% endif %}
-                    type="checkbox" name="{{ rome_field.code }}" value="hide" />
-
-                    <button class="remove btn">
-                      {% if 'hide' in rome_field.current_values %}Restaurer{% else %}Supprimer{% endif %}
-                    </button>
+              <td class="text-center">
+                <button class="btn remove" data-rome="{{ job.id }}" title="Supprimer le métier {{ job.label }}">
+                  Supprimer
+                  <span class="sr-only">le métier de {{ job.label }}</span>
+                </button>
               </td>
             </tr>
           {% endfor %}
-        </tbody>
-      </table>
-
-      <div class="add-new-jobs">
-        <label for="j">Ajouter un nouveau métier :</label>
-        <input class="ui-autocomplete-input" name="new-job" placeholder="" type="text" value="" autocomplete="off">
-
 
-        <table class="{% if not manually_added_jobs %}hidden{% endif %}">
-          <thead>
-            <th></th>
-            <th>Intéressé par des candidatures</th>
-            <th>Ouvert aux contrats d'alternance</th>
-            <th></th>
-          </thead>
-          <tbody>
-            {% for job in manually_added_jobs %}
-              <tr id="{{ job.id }}">
-                <td><span><label for="{{ job.id }}">{{ job.label }}</label></span></td>
-                <td class="text-center">
-                  <span class="sr-only">Intéressé par les candidatures</span>
-                  <input {% if job.lbb %}checked{% endif %} type="checkbox" name="{{ job.id }}" value="lbb" />
-                </td>
-                <td class="text-center">
-                  <span class="sr-only">Ouvert aux contrats d'alternance</span>
-                  <input {% if job.lba %}checked{% endif %} type="checkbox" name="{{ job.id }}" value="lba" />
-                </td>
-                <td class="text-center">
-                  <button class="btn remove" data-rome="{{ job.id }}">Supprimer</button>
-                </td>
-              </tr>
-            {% endfor %}
-          </tbody>
         </table>
       </div>
 
diff --git a/labonneboite/web/templates/contact_form/form.html b/labonneboite/web/templates/contact_form/form.html
index 6a4f35cac..200737bce 100644
--- a/labonneboite/web/templates/contact_form/form.html
+++ b/labonneboite/web/templates/contact_form/form.html
@@ -14,7 +14,7 @@
 <div class="lbb-content">
   <div class="lbb-single-column-content" {% if is_recruiter %}data-esd-recruiter="true"{% endif %}>
 
-    {% if not hide_return %}<a class="return-btn" href="{{ url_for('contact_form.ask_action') }}?{{ params }}">Retour</a>{% endif %}
+    {% if not hide_return %}<a class="return-btn" href="{{ url_for('contact_form.ask_action') }}?{{ params }}" title="Retourner aux choix des actions">Retour</a>{% endif %}
 
     <form class="form-vertical contact-form {{ extra_submit_class }}" action="" method="post">
       <h1>{{ title }}</h1>
@@ -31,7 +31,7 @@ <h1>{{ title }}</h1>
 
         {% include "includes/form_content.html" %}
 
-        {% if show_disclaimer %}
+        {% if show_credentials_disclaimer %}
           <p>* Lors de cette première étape d’identification, vos données personnelles nous permettent de lancer le processus de contrôle et ainsi valider votre légitimité à modifier une fiche entreprise. Vos données personnelles d’identification ne seront pas utilisées à d’autres fins.</p>
         {% endif %}
 
diff --git a/labonneboite/web/templates/includes/form_content.html b/labonneboite/web/templates/includes/form_content.html
index 7d7d138f0..273fbb361 100644
--- a/labonneboite/web/templates/includes/form_content.html
+++ b/labonneboite/web/templates/includes/form_content.html
@@ -17,7 +17,6 @@
   {% endwith %}
 
 #}
-{% set aria_required = {'aria-required':'true'} %}
 
 {% for field in form if field.widget.input_type != 'hidden' %}
   <div{% if field.errors %} class="form-error"{% endif %}>
@@ -25,17 +24,22 @@
 
     {% if field.type == 'BooleanField' %}
       <div class="checkbox-container">
-        {{ field(**aria_required) if is_required else field() }}
+        {{ field(**compute_input_attributes(field)) }}
         {{ field.label }}
       </div>
+    {% elif field.type == 'RadioField'%}
+      <fieldset>
+        <legend>{{ field.label.text }}</legend>
+        {{ field(**compute_input_attributes(field)) }}
+      </fieldset>
     {% else %}
       {{ field.label }}
-      {{ field(**aria_required) if is_required else field() }}
+      {{ field(**compute_input_attributes(field)) }}
     {% endif %}
 
-    {% if field.description %}<p class="form-help-text">{{ field.description|safe }}</p>{% endif %}
+    {% if field.description %}<p id="{{ field.id }}_description" class="form-help-text">{{ field.description|safe }}</p>{% endif %}
     {% if field.errors %}
-    <ul class="form-errorlist">
+    <ul class="form-errorlist" id="{{ field.id }}_errors">
       {% for error in field.errors %}
         <li>{{ error }}</li>
       {% endfor %}
@@ -48,4 +52,4 @@
 
 <p class="submit-button">
   <input class="btn" type="submit" value="{{ submit_text if submit_text else 'Valider' }}">
-</p>
+</p>
\ No newline at end of file