Feature/css tweaks