Fix UI performance issues