Improved UI performance