FORGE-1242: Improve default layout of components on wizard pages