Tweak UI for create machine workflow