MOB-2139 edit text fixes