More css refactoring