more ui/ux fixes