Admin Panel Bug Fixes