continue CSS refactoring