Tidy up admin_module_page, revert a rollback that lost some changes.