fixes #49
fixes #24
fixes #26
Merge pull request #59 from johnhagler/ui-fixes

Ui fixes