Misc admin site support
Merge pull request #466 from RickMohr/misc-admin-support

Misc admin site support