fixes #36
Merge pull request #65 from johnhagler/ui-fixes

fixes #36