Update UI
Merge pull request #23 from thinhhung/develop

Update UI