Bug 1023730 - Move modifyLayout() to layout_manager.js +shepherd