fixes
more ui fixes