Update UI
Merge pull request #18 from antonytse/master

Update UI