Got the map displaying again, did some tidying