more css refactoring #34