fixes #21
fixes #22
Merge pull request #64 from johnhagler/ui-fixes

Ui fixes