more ux fixes