another CSS refactoring