MDM Setup redesign