Ui refactor