Update some UI and add new features
Merge pull request #34 from zghaobac/develop

Update some UI and add new features