CSS refactoring and cut