WIP CSS fixes