More CSS refactoring