WIP
Further CSS fixes