Mobile map and wp map finished up