Merged changes for the admin page