improvements to UI perfomance