Make Space creation screens more consistent