Refactor css + styles a bit