Small fixes/refactor
css