UI performance improvements: work in progress