ui and performance improvements