Bug fixes in admin panel