more css refactoring and design simplification