admin views refactored