More progress on the wizard, namely building individual pages from the spa wizard.