cruft.
Some UI perf improvements and fixing bug [#51150015]