More Work on the Admin Pages