changed layout.js to namespace pattern
Small fix for the _Layout.js
Merge ui-enhancements -> master