FIXED: Update admin views for better compatibility
FIXED: Added new layouts