more css refactoring