Layout.js cleanup

Layout.js cleanup