Ui changes and improvments