Merge branch 'front-end'
Fixes responsivness on arrows
Merge branch 'master' into front-end