Refs #18400; Import skins in upgrade step, updated layout