Cleaned up admin view