Changed SetupAssistant to be more minimalist