Multiple ui fixes