Merge pull request #8 from tohyongcheng/uichanges

Merged uichanges
Merge pull request #9 from tohyongcheng/uichanges

Uichanges