diff --git a/pod/authentication/tests/test_populated.py b/pod/authentication/tests/test_populated.py
index 996ee8f02d..86279388af 100644
--- a/pod/authentication/tests/test_populated.py
+++ b/pod/authentication/tests/test_populated.py
@@ -474,7 +474,7 @@ def _authenticate_shib_user(self, u):
 
     @override_settings(DEBUG=False)
     def test_make_profile(self):
-        """Test if user attributes are retreived"""
+        """Test if user attributes are retrieved."""
         user, shib_meta = self._authenticate_shib_user(
             {
                 "username": "jdo@univ.fr",
diff --git a/pod/chapter/forms.py b/pod/chapter/forms.py
index b76ea4120f..3b45d60c95 100644
--- a/pod/chapter/forms.py
+++ b/pod/chapter/forms.py
@@ -1,3 +1,4 @@
+"""Forms to create/edit and import Esup-Pod video chapter."""
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -5,7 +6,7 @@
 
 from pod.chapter.models import Chapter
 from pod.chapter.utils import vtt_to_chapter
-from pod.main.forms_utils import add_placeholder_and_asterisk
+from pod.main.forms_utils import add_placeholder_and_asterisk, add_describedby_attr
 
 if getattr(settings, "USE_PODFILE", False):
     __FILEPICKER__ = True
@@ -17,7 +18,10 @@
 
 
 class ChapterForm(forms.ModelForm):
+    """A form to create/edit a video chapter."""
+
     def __init__(self, *args, **kwargs):
+        """Initialize fields."""
         super(ChapterForm, self).__init__(*args, **kwargs)
         self.fields["video"].widget = forms.HiddenInput()
         self.fields["time_start"].widget.attrs["min"] = 0
@@ -28,16 +32,22 @@ def __init__(self, *args, **kwargs):
         except Exception:
             self.fields["time_start"].widget.attrs["max"] = 36000
         self.fields = add_placeholder_and_asterisk(self.fields)
+        self.fields = add_describedby_attr(self.fields)
 
     class Meta:
+        """Form Metadata."""
+
         model = Chapter
         fields = "__all__"
 
 
 class ChapterImportForm(forms.Form):
+    """A form to import chapters from VTT file."""
+
     file = forms.ModelChoiceField(queryset=CustomFileModel.objects.all())
 
     def __init__(self, *args, **kwargs):
+        """Initialize fields."""
         self.user = kwargs.pop("user")
         self.video = kwargs.pop("video")
         super(ChapterImportForm, self).__init__(*args, **kwargs)
@@ -48,10 +58,14 @@ def __init__(self, *args, **kwargs):
             )
         else:
             self.fields["file"].queryset = CustomFileModel.objects.all()
+        # self.fields = add_placeholder_and_asterisk(self.fields)
+        self.fields = add_describedby_attr(self.fields)
         self.fields["file"].label = _("File to import")
+        self.fields["file"].help_text = _("The file must be in VTT format.")
 
     def clean_file(self):
+        """Convert VTT to chapters and return cleaned Data."""
         msg = vtt_to_chapter(self.cleaned_data["file"], self.video)
         if msg:
-            raise ValidationError("Error ! {0}".format(msg))
+            raise ValidationError("Error! {0}".format(msg))
         return self.cleaned_data["file"]
diff --git a/pod/chapter/models.py b/pod/chapter/models.py
index 3151fa8e04..1643bc3779 100644
--- a/pod/chapter/models.py
+++ b/pod/chapter/models.py
@@ -60,6 +60,7 @@ def verify_title_items(self):
         return list()
 
     def verify_time(self):
+        """Check that start time is included inside video duration."""
         msg = list()
         if (
             self.time_start == ""
diff --git a/pod/chapter/static/js/chapters.js b/pod/chapter/static/js/chapters.js
index 906c81b0cc..1a881db90c 100644
--- a/pod/chapter/static/js/chapters.js
+++ b/pod/chapter/static/js/chapters.js
@@ -16,14 +16,23 @@ function show_form(data) {
   });
   fadeIn(form_chapter);
 
+  var describedby_list = [];
   let inputStart = document.getElementById("id_time_start");
   if (inputStart) {
     inputStart.insertAdjacentHTML(
       "beforebegin",
       "&nbsp;<span class='getfromvideo'><a id='getfromvideo_start' class='btn btn-primary btn-sm'>" +
         gettext("Get time from the player") +
-        "</a><span class='timecode'>&nbsp;</span></span>",
+        "</a><span class='timecode' id='chapter_time_start'>&nbsp;</span></span>",
     );
+
+    if(inputStart.getAttribute("aria-describedby")) {
+      describedby_list = inputStart.getAttribute("aria-describedby").split(" ");
+    }
+    if (describedby_list.indexOf("chapter_time_start") === -1){
+        describedby_list.push("chapter_time_start");
+    }
+    inputStart.setAttribute("aria-describedby", describedby_list.join(" "));
   }
   let inputEnd = document.getElementById("id_time_end");
   if (inputEnd) {
@@ -31,8 +40,15 @@ function show_form(data) {
       "beforebegin",
       "&nbsp;<span class='getfromvideo'><a id='getfromvideo_end' class='btn btn-primary btn-sm'>" +
         gettext("Get time from the player") +
-        "</a><span class='timecode'>&nbsp;</span></span>",
+        "</a><span class='timecode' id='chapter_time_end'>&nbsp;</span></span>",
     );
+    if(inputEnd.getAttribute("aria-describedby")) {
+      describedby_list = inputEnd.getAttribute("aria-describedby").split(" ");
+    }
+    if (describedby_list.indexOf("chapter_time_end") === -1){
+        describedby_list.push("chapter_time_end");
+    }
+    inputEnd.setAttribute("aria-describedby", describedby_list.join(" "));
   }
 }
 
@@ -208,53 +224,90 @@ var sendform = async function (elt, action) {
 
 /*** Verify if value of field respect form field ***/
 function verify_start_title_items() {
+  var ret = true;
+
+  // First, check Title field.
+
   let inputTitle = document.getElementById("id_title");
+  inputTitle.classList.remove("is-invalid");
+  inputTitle.classList.remove("is-valid");
+  var describedby_list = [];
+  if(inputTitle.getAttribute("aria-describedby")) {
+    describedby_list = inputTitle.getAttribute("aria-describedby").split(" ");
+  }
+
+  var errormsg_id = "lengthErrorMsg";
   if (
     inputTitle.value === "" ||
     inputTitle.value.length < 2 ||
     inputTitle.value.length > 100
   ) {
-    if (typeof lengthErrorSpan === "undefined") {
-      lengthErrorSpan = document.createElement("span");
-      lengthErrorSpan.className = "form-help-inline";
-      lengthErrorSpan.innerHTML =
-        "&nbsp;&nbsp;" +
-        gettext("Please enter a title from 2 to 100 characters.");
-      inputTitle.insertAdjacentHTML("beforebegin", lengthErrorSpan.outerHTML);
+    if (typeof lengthErrorMsg === "undefined") {
+      lengthErrorMsg = document.createElement("div");
+      lengthErrorMsg.id = errormsg_id;
+      lengthErrorMsg.className = "invalid-feedback";
+      lengthErrorMsg.innerHTML = gettext("Please enter a title from 2 to 100 characters.");
+      inputTitle.insertAdjacentHTML("afterend", lengthErrorMsg.outerHTML);
       inputTitle.parentNode.parentNode
         .querySelectorAll("div.form-group")
         .forEach(function (elt) {
           elt.classList.add("has-error");
         });
     }
-    return false;
+    if (describedby_list.indexOf(errormsg_id) === -1){
+      describedby_list.push(errormsg_id);
+    }
+    inputTitle.classList.add("is-invalid");
+    ret = false;
+  } else {
+    describedby_list.pop(errormsg_id);
+    inputTitle.classList.add("is-valid");
   }
+  inputTitle.setAttribute("aria-describedby", describedby_list.join(" "));
+
+  // Then check inputStart field.
   let inputStart = document.getElementById("id_time_start");
+  inputStart.classList.remove("is-invalid");
+  inputStart.classList.remove("is-valid");
+
+  errormsg_id = "timeErrorMsg";
+  if(inputStart.getAttribute("aria-describedby")) {
+    describedby_list = inputStart.getAttribute("aria-describedby").split(" ");
+  } else {
+    describedby_list = [];
+  }
   if (
     inputStart.value === "" ||
     inputStart.value < 0 ||
     inputStart.value >= video_duration
   ) {
-    if (typeof timeErrorSpan === "undefined") {
-      timeErrorSpan = document.createElement("span");
-      timeErrorSpan.className = "form-help-inline";
-      timeErrorSpan.innerHTML =
-        "&nbsp;&nbsp;" +
+    if (typeof timeErrorMsg === "undefined") {
+      timeErrorMsg = document.createElement("div");
+      timeErrorMsg.id = errormsg_id;
+      timeErrorMsg.className = "invalid-feedback";
+      timeErrorMsg.innerHTML =
         gettext("Please enter a correct start field between 0 and") +
-        " " +
-        (video_duration - 1);
-      inputStart.insertAdjacentHTML("beforebegin", timeErrorSpan.outerHTML);
+        " " + (video_duration - 1);
+      inputStart.insertAdjacentHTML("afterend", timeErrorMsg.outerHTML);
+      inputStart.setAttribute("aria-describedby", errormsg_id);
       inputStart.parentNode.parentNode
         .querySelectorAll("div.form-group")
         .forEach(function (elt) {
           elt.classList.add("has-error");
         });
     }
-    return false;
+    inputStart.classList.add("is-invalid");
+    if (describedby_list.indexOf(errormsg_id) === -1){
+      describedby_list.push(errormsg_id);
+    }
+    ret = false;
+  } else {
+    inputStart.classList.add("is-valid");
+    describedby_list.pop(errormsg_id);
   }
-  timeErrorSpan = undefined;
-  lengthErrorSpan = undefined;
-  return true;
+  inputStart.setAttribute("aria-describedby", describedby_list.join(" "));
+
+  return ret;
 }
 
 function overlaptest() {
@@ -352,10 +405,10 @@ var updateDom = function (data) {
 
 var manageSave = function () {
   let player = window.videojs.players.podvideoplayer;
-  if (player.usingPlugin("videoJsChapters")) {
+  if (player.usingPlugin("podVideoJsChapters")) {
     player.main();
   } else {
-    player.videoJsChapters();
+    player.podVideoJsChapters();
   }
 };
 
@@ -366,7 +419,7 @@ var manageDelete = function () {
     player.main();
   } else {
     player.controlBar.chapters.dispose();
-    player.videoJsChapters().dispose();
+    player.podVideoJsChapters().dispose();
   }
 };
 
@@ -374,17 +427,17 @@ var manageImport = function () {
   let player = window.videojs.players.podvideoplayer;
   let n = document.querySelector("div.chapters-list");
   if (n != null) {
-    if (player.usingPlugin("videoJsChapters")) {
+    if (player.usingPlugin("podVideoJsChapters")) {
       player.main();
     } else {
-      player.videoJsChapters();
+      player.podVideoJsChapters();
     }
   } else {
     if (typeof player.controlBar.chapters != "undefined") {
       player.controlBar.chapters.dispose();
     }
-    if (player.usingPlugin("videoJsChapters")) {
-      player.videoJsChapters().dispose();
+    if (player.usingPlugin("podVideoJsChapters")) {
+      player.podVideoJsChapters().dispose();
     }
   }
 };
diff --git a/pod/chapter/static/js/videojs-chapters.js b/pod/chapter/static/js/videojs-chapters.js
index 1b405bdb9b..490b5e4c88 100644
--- a/pod/chapter/static/js/videojs-chapters.js
+++ b/pod/chapter/static/js/videojs-chapters.js
@@ -8,8 +8,7 @@
   }
 
   (function (window, videojs) {
-    var videoJsChapters,
-      defaults = {
+    var defaults = {
         ui: true,
       };
 
@@ -29,24 +28,24 @@
         videojs.dom.addClass(span, "vjs-chapters-icon");
         this.el().appendChild(span);
       }
-    };
-    ChapterMenuButton.prototype.handleClick = function (event) {
-      MenuButton.prototype.handleClick.call(this, event);
-      if (document.querySelectorAll(".chapters-list.inactive li").length > 0) {
-        document
-          .querySelector(".chapters-list.inactive")
-          .setAttribute("class", "chapters-list active");
-        document.querySelector(".vjs-chapters-button button").style =
-          "text-shadow: 0 0 1em #fff";
-      } else {
-        document
-          .querySelector(".chapters-list.active")
-          .setAttribute("class", "chapters-list inactive");
-
-        document.querySelector(".vjs-chapters-button button").style =
-          "text-shadow: '' ";
+      handleClick(event) {
+        MenuButton.prototype.handleClick.call(this, event);
+        if (document.querySelectorAll(".chapters-list.inactive li").length > 0) {
+          document
+            .querySelector(".chapters-list.inactive")
+            .setAttribute("class", "chapters-list active");
+          document.querySelector(".vjs-chapters-button button").style =
+            "text-shadow: 0 0 1em #fff";
+        } else {
+          document
+            .querySelector(".chapters-list.active")
+            .setAttribute("class", "chapters-list inactive");
+
+          document.querySelector(".vjs-chapters-button button").style =
+            "text-shadow: '' ";
+        }
       }
-    };
+    }
     MenuButton.registerComponent("ChapterMenuButton", ChapterMenuButton);
 
     /**
diff --git a/pod/chapter/templates/chapter/form_chapter.html b/pod/chapter/templates/chapter/form_chapter.html
index 978c25f37e..a4027ecd4d 100644
--- a/pod/chapter/templates/chapter/form_chapter.html
+++ b/pod/chapter/templates/chapter/form_chapter.html
@@ -1,75 +1,80 @@
 {# HTML for chapter form. Don't use this file alone it must be integrated into another template! #}
 {% load i18n %}
 {% load static %}
-<div class="card m-2">
-	<div class="card-body">
-		<div class="panel-heading mb-3 p-1">
-			<h4 class="card-title pod-card__title">{% trans 'Create / Edit chapters' %}</h4>
-		</div>
-		<form id="form_chapter" class="form_save" action="{% url 'video:chapter:video_chapter' slug=video.slug %}" method="POST">
-			{% csrf_token %}
-			<div id="formcontent" class="form-container">
-				{% if form_chapter.errors or form_chapter.non_field_errors %}
-					{% trans 'One or more errors have been found in the form:' %}<br>
-					{% for error in form_chapter.non_field_errors %}
-						- {{error}}<br>
-					{% endfor %}
-				{% endif %}
-				{% for field_hidden in form_chapter.hidden_fields %}
-					{{field_hidden}}
-				{% endfor %}
-				{% for field in form_chapter.visible_fields %}
-					<div class="row mb-3">
-						<label for="{{field.auto_id}}" class="col-sm-2 col-form-label">{{field.label}}</label>
-						<div class="col-sm-10">{{field}}</div>
-					</div>
-				{% endfor %}
-				{% if form_chapter.instance %}
-					<input type="hidden" id="id_chapter" name="chapter_id" value="{{form_chapter.instance.id}}">
-				{% endif %}
-				<input type="hidden" name="action" value="save">
-				<div class="mb-3">
-					<input type="submit" id="save_chapter" value="{% trans 'Save' %}" class="btn btn-primary">
-					<input type="reset" action="cancel" id="cancel_chapter" value="{% trans 'Cancel' %}" class="btn btn-secondary">
-				</div>
-			</div>
-		</form>
-		&nbsp;
-		{% if request.user.is_staff %}
-		  <div class="panel-heading mt-3 mb-3 p-1">
-			<h4 class="card-title pod-card__title">{% trans 'Import chapters' %}</h4>
-		  </div>
-		  <form id="form_chapter_import" class="form_save" action="{% url 'video:chapter:video_chapter' slug=video.slug %}" method="POST">
-			{% csrf_token %}
-			<div id="formcontent" class="form-container">
-				{% if form_import.errors or form_import.non_field_errors %}
-					{% trans 'One or more errors have been found in the form:' %}<br>
-					{% for error in form_import.non_field_errors %}
-						- {{error}}<br>
-					{% endfor %}
-				{% endif %}
-				{% for field_hidden in form_import.hidden_fields %}
-					{{field_hidden}}
-				{% endfor %}
-				{% for field in form_import.visible_fields %}
-					<div class="row mb-3">
-						<label for="{{field.auto_id}}" class="col-sm-2 col-form-label">{{field.label}}</label>
-						<div class="col-sm-10">{{field}}</div>
-					</div>
-					{% for error in field.errors %}
-						<div class="alert alert-danger">
-							<strong>{{error|escape}}</strong>
-						</div>
-					{% endfor %}
-				{% endfor %}
-				<input type="hidden" name="action" value="import">
-				<span>{% trans 'The file must be in VTT format.' %}</span>
-				<div class="mt-3">
-					<input type="submit" id="save_chapter_import" value="{% trans 'Import chapters' %}" class="btn btn-primary">
-				</div>
-			</div>
-		  </form>
-		  {{form_import.media}}
-		{% endif %}
-	</div>
-</div>
+<fieldset class="border rounded p-3 m-2">
+  <legend class="float-none w-auto">{% trans 'Create / Edit chapters' %}</legend>
+  <form id="form_chapter" class="form_save" action="{% url 'video:chapter:video_chapter' slug=video.slug %}" method="POST">
+    {% csrf_token %}
+    <div class="form-container">
+      {% if form_chapter.errors or form_chapter.non_field_errors %}
+        {% trans 'One or more errors have been found in the form:' %}<br>
+        {% for error in form_chapter.non_field_errors %}
+          - {{error}}<br>
+        {% endfor %}
+      {% endif %}
+      {% for field_hidden in form_chapter.hidden_fields %}
+        {{field_hidden}}
+      {% endfor %}
+      {% for field in form_chapter.visible_fields %}
+        <div class="row mb-3">
+          <label for="{{field.auto_id}}" class="col-sm-2 col-form-label">{{field.label}}</label>
+          <div class="col-sm-10">
+            {{field}}
+            {% if field.help_text %}
+              <small id="{{field.id_for_label}}Help" class="form-text">{{ field.help_text|safe }}</small>
+            {% endif %}
+          </div>
+        </div>
+      {% endfor %}
+      {% if form_chapter.instance %}
+        <input type="hidden" id="id_chapter" name="chapter_id" value="{{form_chapter.instance.id}}">
+      {% endif %}
+      <input type="hidden" name="action" value="save">
+      <div class="mb-3">
+        <input type="submit" id="save_chapter" value="{% trans 'Save' %}" class="btn btn-primary">
+        <input type="reset" action="cancel" id="cancel_chapter" value="{% trans 'Cancel' %}" class="btn btn-secondary">
+      </div>
+    </div>
+  </form>
+</fieldset>
+
+{% if request.user.is_staff and form_import.visible_fields %}
+  <fieldset class="border rounded p-3 m-2">
+    <legend class="float-none w-auto">{% trans 'Import chapters' %}</legend>
+    <form id="form_chapter_import" class="form_save" action="{% url 'video:chapter:video_chapter' slug=video.slug %}" method="POST">
+    {% csrf_token %}
+      <div class="form-container">
+        {% if form_import.errors or form_import.non_field_errors %}
+          {% trans 'One or more errors have been found in the form:' %}<br>
+          {% for error in form_import.non_field_errors %}
+            - {{error}}<br>
+          {% endfor %}
+        {% endif %}
+        {% for field_hidden in form_import.hidden_fields %}
+          {{field_hidden}}
+        {% endfor %}
+        {% for field in form_import.visible_fields %}
+          <div class="row mb-3">
+            <label for="{{field.auto_id}}" class="col-sm-2 col-form-label">{{field.label}}</label>
+            <div class="col-sm-10">
+              {{field}}
+              {% if field.help_text %}
+                <small id="{{field.id_for_label}}Help" class="form-text">{{ field.help_text|safe }}</small>
+              {% endif %}
+            </div>
+          </div>
+          {% for error in field.errors %}
+            <div class="alert alert-danger">
+              <strong>{{error|escape}}</strong>
+            </div>
+          {% endfor %}
+        {% endfor %}
+        <input type="hidden" name="action" value="import">
+        <div class="mt-3">
+          <input type="submit" id="save_chapter_import" value="{% trans 'Import chapters' %}" class="btn btn-primary">
+        </div>
+      </div>
+    </form>
+    {{form_import.media}}
+  </fieldset>
+{% endif %}
diff --git a/pod/chapter/templates/video_chapter.html b/pod/chapter/templates/video_chapter.html
index 23ffad5e19..55afdb495e 100644
--- a/pod/chapter/templates/video_chapter.html
+++ b/pod/chapter/templates/video_chapter.html
@@ -4,77 +4,85 @@
 {% load static %}
 {% block page_title %}{% trans 'Chapter video' %} "{{video.title}}" {% endblock page_title %}
 {% block page_extra_head %}
-
-{% include 'videos/video-header.html' %}
-<script src="{% static 'js/chapters.js' %}?ver={{VERSION}}"></script>
-<script>
-  const video_duration = {{ video.duration }};
-</script>
+  {% include 'videos/video-header.html' %}
+  <script src="{% static 'js/chapters.js' %}?ver={{VERSION}}"></script>
+  <script>
+    const video_duration = {{ video.duration }};
+  </script>
 {% endblock page_extra_head %}
 {% block breadcrumbs %}
-{{block.super}}
-<li class="breadcrumb-item"><a href="{% url 'video:my_videos'%}">{% trans 'My videos' %}</a></li>
-<li class="breadcrumb-item">
-  <a href="{% url 'video:video' slug=video.slug %}" title="{{video.title}}">
-    {{video.title|title|truncatechars:45}}
-  </a>
-</li>
-<li class="breadcrumb-item active" aria-current="page">
-  {% trans 'Chapter video' %}
-</li>
-{% endblock %}
+  {{block.super}}
+  <li class="breadcrumb-item"><a href="{% url 'video:my_videos'%}">{% trans 'My videos' %}</a></li>
+  <li class="breadcrumb-item">
+    <a href="{% url 'video:video' slug=video.slug %}" title="{{video.title}}">
+      {{video.title|title|truncatechars:45}}
+    </a>
+  </li>
+  <li class="breadcrumb-item active" aria-current="page">
+    {% trans 'Chapter video' %}
+  </li>
+{% endblock breadcrumbs %}
 {% block page_content %}
-<span id="chapter_player">
-  {% include 'videos/video-element.html' %}
-</span>
-<hr>
-<div id="info_video">
-  <div>
-    <div id="list_chapter">
-      {% include 'chapter/list_chapter.html' %}
-    </div>
-    <div id="form_chapter">
-      {% if form_chapter %}
-      {% include 'chapter/form_chapter.html' with form_chapter=form_chapter %}
+  <span id="chapter_player">
+    {% include 'videos/video-element.html' %}
+  </span>
+  <hr>
+  <div id="info_video">
+    <div>
+      <div id="list_chapter">
+        {% include 'chapter/list_chapter.html' %}
+      </div>
+      <div id="form_chapter">
+        {% if form_chapter %}
+          {% include 'chapter/form_chapter.html' with form_chapter=form_chapter %}
+        {% endif %}
+      </div>
+      <span class="float-end">
+        <a href="{% url 'video:video' slug=video.slug %}" title="{% blocktrans with video_title=video.title %}Back to the video “{{ video_title }}”{% endblocktrans %}" class="btn btn btn-secondary btn-sm">
+          <i class="bi bi-film" aria-hidden="true"></i>&nbsp;{% trans "Back to the video"%}
+        </a>
+      </span>
+      {% if not form_chapter %}
+        <form id="form_new" class="get_form" action="{% url 'video:chapter:video_chapter' slug=video.slug %}" method="POST">
+          {% csrf_token %}
+          <input type="hidden" name="action" value="new">
+          <input type="submit" id="add_new_chapter" value="{% trans 'Add a new chapter' %}" class="btn btn-primary btn-sm">
+        </form>
       {% endif %}
     </div>
-    <span class="float-end">
-      <a href="{% url 'video:video' slug=video.slug %}" title="{% blocktrans with video_title=video.title %}Back to the video “{{ video_title }}”{% endblocktrans %}" class="btn btn btn-secondary btn-sm">
-        <i class="bi bi-film"></i>&nbsp;{% trans "Back to the video"%}
-      </a>
-    </span>
-    {% if not form_chapter %}
-    <form id="form_new" class="get_form" action="{% url 'video:chapter:video_chapter' slug=video.slug %}" method="POST">
-      {% csrf_token %}
-      <input type="hidden" name="action" value="new">
-      <input type="submit" id="add_new_chapter" value="{% trans 'Add a new chapter' %}" class="btn btn-primary btn-sm">
-    </form>
-    {% endif %}
   </div>
-</div>
 {% endblock page_content %}
 {% block page_aside %}
-{% if video.owner == request.user or request.user.is_superuser or perms.chapter.add_chapter or request.user in video.additional_owners.all %}
-<div class="card" id="card-managevideo">
-  <h2 class="card-header card-title pod-card__title h4"><i class="bi bi-gear"></i>&nbsp;{% trans "Manage video"%}</h2>
-  <div class="card-body card-text text-center">
-    {% include "videos/link_video.html" with hide_favorite_link=True %}
+  {% if video.owner == request.user or request.user.is_superuser or perms.chapter.add_chapter or request.user in video.additional_owners.all %}
+    <div class="card" id="card-managevideo">
+      <h2 class="card-header card-title pod-card__title h4"><i class="bi bi-gear"></i>&nbsp;{% trans "Manage video"%}</h2>
+      <div class="card-body card-text text-center">
+        {% include "videos/link_video.html" with hide_favorite_link=True %}
+      </div>
+    </div>
+  {% endif %}
+  <div id="chapter-info" class="card">
+    <h2 class="card-header card-title pod-card__title h4">{% trans "Help"%}</h2>
+    <button class="btn rounded-0 pod-btn" id="heading-0" data-bs-toggle="collapse" data-bs-target="#collapse-0" aria-expanded="false" aria-controls="collapse-0">
+      {% trans 'Chapters' %}
+    </button>
+    <div id="collapse-0" class="card-body collapse card-text small">
+      <p>{% trans '"Add a new chapter" allows you to add a new chapter, "modify" allows you to modify it and "delete" allows you to remove the chapter.' %}</p>
+      <p>{% trans 'Start playback of the video, pause the video and click on "Get time from the player" to fill in the field untitled "Start time".' %}</p>
+      <p>{% trans 'The chapters cannot start at the same time.' %}</p>
+      <p>{% trans 'You must save your chapters to view the result.' %}</p>
+    </div>
   </div>
-</div>
-{% endif %}
-<div id="chapter-info" class="card">
-  <h2 class="card-header card-title pod-card__title h4">{% trans "Help"%}</h2>
-  <button class="btn rounded-0 pod-btn" id="heading-0" data-bs-toggle="collapse" data-bs-target="#collapse-0" aria-expanded="false" aria-controls="collapse-0">
-    {% trans 'Chapters' %}
-  </button>
-  <div id="collapse-0" class="card-body collapse card-text small">
-    <p>{% trans '"Add a new chapter" allows you to add a new chapter, "modify" allows you to modify it and "delete" allows you to remove the chapter.' %}</p>
-    <p>{% trans 'Start playback of the video, pause the video and click on "Get time from the player" to fill in the field untitled "Start time".' %}</p>
-    <p>{% trans 'The chapters cannot start at the same time.' %}</p>
-    <p>{% trans 'You must save your chapters to view the result.' %}</p>
+  <div class="card mt-1" id="card-mandatoryfields">
+    <h2 class="h4 card-header card-title pl-2">{% trans "Mandatory fields" %}</h2>
+    <div class="card-body card-text">
+      <p>
+        <span class="required_star">*</span>
+        {% trans "Fields marked with an asterisk are mandatory." %}
+      </p>
+    </div>
   </div>
-</div>
 {% endblock page_aside %}
 {% block more_script %}
-{% include 'videos/video-script.html'%}
-{% endblock more_script %}
\ No newline at end of file
+  {% include 'videos/video-script.html'%}
+{% endblock more_script %}
diff --git a/pod/chapter/views.py b/pod/chapter/views.py
index 0f5a417834..a67010ab32 100644
--- a/pod/chapter/views.py
+++ b/pod/chapter/views.py
@@ -54,6 +54,7 @@ def video_chapter(request, slug):
 
 
 def video_chapter_new(request, video):
+    """Display a new video chapter form."""
     list_chapter = video.chapter_set.all()
     form_chapter = ChapterForm(initial={"video": video})
     form_import = ChapterImportForm(user=request.user, video=video)
@@ -81,6 +82,7 @@ def video_chapter_new(request, video):
 
 
 def video_chapter_save(request, video):
+    """Save a video chapter form request."""
     list_chapter = video.chapter_set.all()
     form_chapter = None
 
@@ -149,6 +151,7 @@ def video_chapter_save(request, video):
 
 
 def video_chapter_modify(request, video):
+    """Display a video chapter modification form."""
     list_chapter = video.chapter_set.all()
     if request.POST.get("action", "").lower() == "modify":
         chapter = get_object_or_404(Chapter, id=request.POST.get("id"))
diff --git a/pod/enrichment/templates/enrichment/form_enrichment.html b/pod/enrichment/templates/enrichment/form_enrichment.html
index 40f7a36202..eb687b32b3 100644
--- a/pod/enrichment/templates/enrichment/form_enrichment.html
+++ b/pod/enrichment/templates/enrichment/form_enrichment.html
@@ -7,7 +7,7 @@ <h4 class="card-title pod-card__title">{% trans 'Create / Edit enrichment' %}</h
 </div>
 <form id="form_enrich" class="form_save" action="{% url 'enrichment:edit_enrichment' slug=video.slug %}" method="POST">
     {% csrf_token %}
-    <div id="formcontent" class="form-container">
+    <div class="form-container">
         {% if form_enrichment.errors or form_enrichment.non_field_errors %}
             <div class="alert alert-danger">
                 {% trans 'One or more errors have been found in the form:' %}
diff --git a/pod/enrichment/templates/enrichment/video_enrichment-script.html b/pod/enrichment/templates/enrichment/video_enrichment-script.html
index 48916639cb..6b5dd73027 100644
--- a/pod/enrichment/templates/enrichment/video_enrichment-script.html
+++ b/pod/enrichment/templates/enrichment/video_enrichment-script.html
@@ -6,8 +6,10 @@
   const tracks = player.textTracks();
   const trackElts = player.remoteTextTrackEls();
   let metadataTrack, i, track;
+
   for (i = 0; i < tracks.length; i++) {
       track = tracks[i];
+      // console.log("track: ["+track.kind + "] " + track.label);
       if (track.kind === 'metadata' && track.label === 'enrichment') {
           metadataTrack = track;
           metadataTrack.index = i;
@@ -17,6 +19,10 @@
   }
 
   player.on('loadedmetadata', function() {
+      if(!metadataTrack){
+        console.log("No enrichment track found.")
+        return
+      }
       let slide = [];
       if(!metadataTrack.cues) { //Safari do not get cues
           //let tracksrc = player.el().getElementsByTagName('TRACK')[metadataTrack.index].src;
diff --git a/pod/enrichment/templates/enrichment/video_enrichment.html b/pod/enrichment/templates/enrichment/video_enrichment.html
index 82b12fe2e0..2b9d6f84b8 100644
--- a/pod/enrichment/templates/enrichment/video_enrichment.html
+++ b/pod/enrichment/templates/enrichment/video_enrichment.html
@@ -56,21 +56,21 @@
 
 {% block page_title %}{% if channel %}{{channel.title}} - {% endif %}{% if theme %}{{theme.title}} - {% endif %}({% trans 'Enriched' %}) {{video.title}}{% endblock %}
 
-{% block video-element %}
-
-{% if form %}
-  {% include 'videos/video-form.html' %}
-{% else %}
-  {% include 'enrichment/video-element-enrichment.html' %}
-  <div id="info-video" class="pod-info-video">{% include 'videos/video-all-info.html' with third_app=True %}</div>
-{% endif %}
-
-{% endblock video-element %}
+{% block page_content %}
+  {% block video-element %}
+    {% if form %}
+      {% include 'videos/video-form.html' %}
+    {% else %}
+      {% include 'enrichment/video-element-enrichment.html' %}
+    {% endif %}
+    <div id="info-video" class="pod-info-video">{% include 'videos/video-all-info.html' with third_app=True %}</div>
+  {% endblock video-element %}
+{% endblock page_content %}
 
 {% block page_aside %}
   <div class="card" id="card-enrichmentinformations">
     <h2 class="card-header card-title pod-card__title h4">
-      <i class="bi bi-info-circle"></i>&nbsp;{% trans 'Informations' %}
+      <i class="bi bi-info-circle" aria-hidden="true"></i>&nbsp;{% trans 'Informations' %}
     </h2>
     <div class="card-body card-text">
       <p>{% trans 'To help you, the different types of enrichments have specific colors:' %}</p>
diff --git a/pod/package.json b/pod/package.json
index 5a644dc77d..d5e288bdb9 100644
--- a/pod/package.json
+++ b/pod/package.json
@@ -1,7 +1,7 @@
 {
   "license": "LGPL-3.0",
   "dependencies": {
-    "@silvermine/videojs-quality-selector": "^1.2.5",
+    "@silvermine/videojs-quality-selector": "^1.3.0",
     "blueimp-file-upload": "^10.32.0",
     "bootstrap": "^5.3.0",
     "bootstrap-icons": "^1.10.5",
diff --git a/pod/podfile/templates/podfile/customfilewidget.html b/pod/podfile/templates/podfile/customfilewidget.html
index 2f8ec9d760..24108c3dec 100644
--- a/pod/podfile/templates/podfile/customfilewidget.html
+++ b/pod/podfile/templates/podfile/customfilewidget.html
@@ -36,6 +36,11 @@
   {% else %}
     <span id="fileinput_{{id}}"></span>
     <button type="button" class="btn btn-sm btn-outline-primary btn-fileinput_{{id}} mx-1" id="btn-fileinput_{{id}}"
+      {% for name, value in btn_attrs.items %}
+        {% if value is not False %}
+         {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}
+        {% endif %}
+      {% endfor %}
       {% if type == "image" %}
           {% if id == "id_headband" %}
             aria-label="{% trans "Headband - Select an image" %}"
@@ -71,7 +76,7 @@
       <div class="modal-header">
         <h2 class="modal-title" id="fileModalLabel_{{id}}">
             {% if type == "image" %}{% trans 'Select an image' %}{% else %}{% trans 'Select a file' %}{% endif %}</h2>
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
       </div>
       <div class="modal-body row" id="modal-folder_{{id}}"></div>
       <div class="modal-footer">
@@ -153,12 +158,7 @@ <h2 class="modal-title" id="fileModalLabel_{{id}}">
 });
 
 
-
-
-
 //let open_folder = document.querySelector(".open-folder").querySelector("button").style ="pointer-events : none" ;
 
-
-
 </script>
-{% endblock more_script %}
\ No newline at end of file
+{% endblock more_script %}
diff --git a/pod/podfile/widgets.py b/pod/podfile/widgets.py
index 139fa7b04a..df2059dd0a 100644
--- a/pod/podfile/widgets.py
+++ b/pod/podfile/widgets.py
@@ -1,3 +1,4 @@
+"""Esup-Pod podfile widgets."""
 from django.forms import widgets
 from django.utils.safestring import mark_safe
 from django.template.loader import render_to_string
@@ -7,6 +8,7 @@
 
 
 class CustomFileWidget(widgets.TextInput):
+
     class Media:
         js = ("podfile/js/filewidget.js",)
 
@@ -15,6 +17,8 @@ def __init__(self, type=None, *args, **kwargs):
         super(CustomFileWidget, self).__init__(*args, **kwargs)
 
     def render(self, name, value, attrs=None, renderer=None):
+        """Render the CustomFileWidget as HTML."""
+
         document = None
 
         if value:
@@ -36,6 +40,15 @@ def render(self, name, value, attrs=None, renderer=None):
         }
         template_name = "podfile/customfilewidget.html"
         output = super(CustomFileWidget, self).render(name, value, attrs)
+        context = self.get_context(name, value, attrs)
+        attrs = context["widget"]["attrs"]
+
+        # Copy all the aria-xxx attributes on button
+        btn_attrs = {}
+        for att_name, att_value in attrs.items():
+            if "aria" in att_name:
+                btn_attrs[att_name] = att_value
+
         return mark_safe(
             render_to_string(
                 template_name,
@@ -47,6 +60,8 @@ def render(self, name, value, attrs=None, renderer=None):
                     "widget": output,
                     "input": input,
                     "type": self.type,
+                    "attrs": attrs,
+                    "btn_attrs": btn_attrs,
                 },
             )
         )
diff --git a/pod/video/forms.py b/pod/video/forms.py
index e1a7f7ce04..d1eebdf165 100644
--- a/pod/video/forms.py
+++ b/pod/video/forms.py
@@ -1010,6 +1010,7 @@ def __init__(self, *args, **kwargs):
         self.fields["title_%s" % settings.LANGUAGE_CODE].widget = forms.HiddenInput()
 
         self.fields = add_placeholder_and_asterisk(self.fields)
+        self.fields = add_describedby_attr(self.fields)
 
     class Meta(object):
         model = Channel
diff --git a/pod/video/static/js/videojs-logo-controlbar.js b/pod/video/static/js/videojs-logo-controlbar.js
index 4ab63f6f28..ca6fbace7d 100644
--- a/pod/video/static/js/videojs-logo-controlbar.js
+++ b/pod/video/static/js/videojs-logo-controlbar.js
@@ -21,7 +21,7 @@
     class LogoMenuLink extends MenuLink {
       constructor(player, options) {
         var aElement = document.createElement("a");
-        console.log(options.link);
+        // console.log(options.link);
         if (options.link && options.link !== "") {
           aElement.href = options.link;
         } else {
diff --git a/pod/video/templates/channel/channel_edit.html b/pod/video/templates/channel/channel_edit.html
index 8287453d8a..6876dc1b24 100644
--- a/pod/video/templates/channel/channel_edit.html
+++ b/pod/video/templates/channel/channel_edit.html
@@ -37,12 +37,12 @@ <h1 class="page_title">{% trans "Editing the channel" %} "{{form.instance.title}
   </span>
 </h1>
 {% if form.instance.headband %}
-<img src="{{ form.instance.headband.file.url }}" alt="{% trans 'Headband' %} {{ form.instance.title }}" class="rounded mx-auto d-block img-fluid img-responsive img-thumbnail" loading="lazy">
+  <img src="{{ form.instance.headband.file.url }}" alt="{% trans 'Headband' %} {{ form.instance.title }}" class="rounded mx-auto mb-3 d-block img-fluid img-responsive img-thumbnail" loading="lazy">
 {% endif %}
 
 <form id="channel_form" method="post" action="{% url 'channels:channel_edit' slug=form.instance.slug %}" accept-charset="utf-8" enctype="multipart/form-data" class="needs-validation" novalidate>
   {% csrf_token %}
-  <div class="list-group">
+  <div>
     {% if form.errors %}
       <p class="text-danger">{% trans "One or more errors have been found in the form." %}</p>
     {% endif %}
@@ -52,7 +52,7 @@ <h1 class="page_title">{% trans "Editing the channel" %} "{{form.instance.title}
     {% for field in form.visible_fields %}
     {% spaceless %}
     <div class="{% if " description_" in field.name or "title_" in field.name %}collapse{% else %}{% endif %}{% if "description_" in field.name %} description{% endif %}{% if "title_" in field.name %} title{% endif %}">
-      <div class="list-group-item">
+      <div class="mb-3">
         <div class="{% if field.name == "owners" or field.name == "users" %}form-row {% endif %}form-group {% if field.field.required %}form-group-required {% endif %}">
           {{ field.errors }}
           {% if "form-check-input" in field.field.widget.attrs.class %}
@@ -60,7 +60,7 @@ <h1 class="page_title">{% trans "Editing the channel" %} "{{form.instance.title}
               {{ field }} <label for="{{ field.id_for_label }}" class="form-check-label">{{ field.label }}</label>
             </div>
           {% else %}
-            <label for="{{ field.id_for_label }}">{{ field.label }}</label>
+            <label for="{{ field.id_for_label }}" class="form-label">{{ field.label }}</label>
             {{ field }}
           {% endif %}
           {% if field.help_text %}
@@ -120,8 +120,8 @@ <h2 class="h4 card-header card-title pod-card__title">{% trans "Form fields"%}</
 {% endblock page_aside %}
 
 {% block more_script %}
-<script src="/admin/jsi18n/"></script>
-<script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
-<link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}?ver={{VERSION}}">
-{{form.media}}
+  <script src="/admin/jsi18n/"></script>
+  <script src="{% static 'admin/js/core.js' %}?ver={{VERSION}}"></script>
+  <link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}?ver={{VERSION}}">
+  {{form.media}}
 {% endblock more_script %}
diff --git a/pod/video/templates/channel/form_theme.html b/pod/video/templates/channel/form_theme.html
index 6441074b28..bec58d59fb 100644
--- a/pod/video/templates/channel/form_theme.html
+++ b/pod/video/templates/channel/form_theme.html
@@ -4,7 +4,7 @@
 
 <form id="form_theme" action="{% url 'channels:theme_edit' slug=channel.slug %}" method="post">
   {% csrf_token %}
-  <div id="formcontent" class="form-container">
+  <div class="form-container">
     <fieldset class="row">
       <legend class="form-title">
         {% if form_theme.instance.title %}{% trans "Editing the theme" %} {{form_theme.instance.title}}{% else %}{% trans "Add a new theme" %}{% endif %}
diff --git a/pod/video/templates/videos/video-all-info.html b/pod/video/templates/videos/video-all-info.html
index 5dacda32e8..186dbbc771 100644
--- a/pod/video/templates/videos/video-all-info.html
+++ b/pod/video/templates/videos/video-all-info.html
@@ -12,9 +12,8 @@ <h1 class="page_title h2">
   </a>
 </div>
 
-
 {% if video.chapter_set.all %}
-<div class="alert alert-info" role="alert">{% blocktrans %}This video is chaptered. Click the chapter button <span class="vjs-icon-chapters"></span> on the video player to view them.{% endblocktrans %}</div>
+  <div class="alert alert-info" role="alert">{% blocktrans %}This video is chaptered. Click the chapter button <span class="vjs-icon-chapters"></span> on the video player to view them.{% endblocktrans %}</div>
 {% endif %}
 
 <div class="ps-0 pe-0">
diff --git a/pod/video/templates/videos/video-header.html b/pod/video/templates/videos/video-header.html
index 7b7ab6c9a5..c2a329cb5d 100644
--- a/pod/video/templates/videos/video-header.html
+++ b/pod/video/templates/videos/video-header.html
@@ -51,6 +51,7 @@
 
 
 <!-- quality selector -->
+<!-- NOTE: hls-quality-selector doesn't seem to work on Safari. -->
 <link href="{% static 'videojs-hls-quality-selector/dist/videojs-hls-quality-selector.css' %}?ver={{VERSION}}" rel="stylesheet">
 <script src="{% static 'videojs-contrib-quality-levels/dist/videojs-contrib-quality-levels.min.js' %}?ver={{VERSION}}"></script>
 <script src="{% static 'videojs-hls-quality-selector/dist/videojs-hls-quality-selector.min.js' %}?ver={{VERSION}}"></script>
diff --git a/pod/video/templates/videos/video-script.html b/pod/video/templates/videos/video-script.html
index b763ffb6f2..bcb8dd4bbc 100644
--- a/pod/video/templates/videos/video-script.html
+++ b/pod/video/templates/videos/video-script.html
@@ -118,9 +118,8 @@
         type: '{{video.get_playlist_master.encoding_format}}',
       };
       player.on('loadedmetadata', function() {
-        //var qualityLevels = this.qualityLevels();
         {% if request.GET.start and request.GET.start != '0' %}
-        player.currentTime({{request.GET.start}});
+          player.currentTime({{request.GET.start}});
         {% endif %}
       });
       //Add source to player
@@ -205,7 +204,7 @@
   {% endif %}
 
   {% if video.chapter_set.all %}
-    player.videoJsChapters();
+    player.podVideoJsChapters();
     document.querySelector('.vjs-big-play-button').style.zIndex = '2';
     document.querySelector('.vjs-control-bar').style.zIndex = '3';
   {% endif %}
diff --git a/pod/video/templates/videos/video.html b/pod/video/templates/videos/video.html
index b016db76a6..4445cfe689 100644
--- a/pod/video/templates/videos/video.html
+++ b/pod/video/templates/videos/video.html
@@ -41,7 +41,6 @@
   {% include 'videos/video_page_aside.html' %}
 {% endblock page_aside %}
 
-
 {% block more_script %}
   {% include 'videos/video_more_script.html' %}
 {% endblock more_script %}