CSS refactoring fixes.