More fixes for admin dashboard
Merge pull request #7 from ejhon1/test

More fixes for admin dashboard