HTML + CSS DONE
JS DONE
Review applied
Merge branch 'DDBNEXT-1386-EMA' into develop