UI performance improvments