improve create machine wizard