[Zhenghan] UI, and logic improvement
[Zhenghan] UI, and logic improvement