Add back $layout attribute
Add layout option plus some scrutinizer improvements