lang and ux fixes