Further CSS fixes