Updates for admin screens and bug fixes
Merge pull request #9 from jerv13/master

REF-92 - Updates for admin screens and bug fixes