all controls in one dialog, removed some console.log:s