Refactoring the ui
ui changes