Some Ui updates