CMS-2829 Site Template wiz - Adjustments to First step "Site Template"