Admin Panel Fixes