Scaffolding Tweaks
More templating