Refactor to comply with changes added in PR #1575
Merge pull request #1717 from carsongee/feature/cg/sysadmin-dashboard-mongook

Refactor to comply with changes added in PR #1575