Ui minor fixes