more css and refactoring