Address https://gitlab.math.unistra.fr/irma/website/-/issues/97 and https://gitlab.math.unistra.fr/irma/website/-/issues/70