Several ui fixes