Ui fixes completed.