Minor bug fixes
Merge pull request #102 from domestic/UserViewFix

Minor bug fixes