Improved scaffolding for webapps and pages
Minor fix