Added map and feedback activities