Adding some misc things to support the admin page
Merge pull request #318 from ahinz/topic/admin-page-suppport

Adding some misc things to support the admin page