TDI-30488:improve some GUI here.