Changes to map images and bug fixes to duplicate issue