css refactoring and simplification