Overall ui fixes