Ui dev - Merging ui-refactor with dev