Some more CSS fixes