Refactor/multi hotfixes

Css changes here and there...