refactoring the UI of hub