fixes #38
Merge pull request #60 from johnhagler/ui-fixes

fixes #38