Improved UX for controls