UI update by Xincheng