fixed some ux bug