Bug fixes
Merge pull request #8 from AKWEXV/update-ui

Bug fixes