Final CSS fixes