UI: A few performance improvements