various ui fixes