Re-arranged controls.