UI Fixes
Merge pull request #20 from NikZar/ui-fixes

UI Fixes