added slim support for layouts
Merge branch 'slim_support'