various ui fixes/removing dead ends