Updates to AdminPortal and Android App