fix ui issues
Merge pull request #45 from kived/ui-issues

fix ui issues