general ui fixes