more ui fixes
more ui fixes