CSS fixes and cleanups