View changes and maps improvements