Added map screen and navigator to\/fro