pengyue merge UI code