Improved UI controls