Revert "Revert "Data portal changes & mobile app code""

This reverts commit 4fb5d5b29aa15d4c6d73f649f250f5d260e58e05.