CSS refactoring and class name change