Adding some fixes to AdminPanel