Improved UI usability