CSS fixes and cleanup