Additional Ui fixes