Updates to AdminPortal and App