Fix some small UI.
Address #24.
Merge pull request #25 from akbargumbira/develop

[HOTFIX] Fix some small issue and UIs