for UI refactor
Merge pull request #40 from xduo/staging

for UI refactor