refine ui
Merge pull request #4 from xduo/staging

Refine UI