some ui/ux fixes