New ui fixes