Wizard layout: use variables
Keep "portlet" so this works with previous versions