In Progress of changing mapActivity and Settings.