Additional changes to MapScreen since, the last commit didn't restore everything as it were before the dispose issue.