Bug fixes and style updates on draft builder scaffolding.