Fix Controller.js mixin error. Update logic for layer menu item inclusion.