Mapping screen updated
Changes & bug fixes in V1.0.0.5