Changes to Map and ImageViewController

adaw