CSS & frontend JS
Merged conflicts