UI is working, now lunch.
Merge pull request #85 from DIdiHL/zhaoyue

UI is working, now lunch.