performance and ui optimizations