Added comments
removed a use of Layout.js
removed a use of Layout.js
finished removing Layout.js