Cleaning up issues in admin views