UI version 2
modify UI