More CSS fixes and cleanups