Changes to make the admin page easier to use