Pages are now working and mapping is correct