Ui updates
Merging