Bug fixes for admin portal. Issue: #370