Some more work done on the admin interface