[FYR] #N/A fix ui defects