modifications based of sheel/matt feedback
Merge branch 'user-status' into staging2