Fixed Map page, need to investigate delay