Updates for admin screens and bug fixes