WIP: Various CSS fixes