Fixed conflicts in controls.js