Clean up the admin interface a bit for now