more CSS refactoring