UI improvements and performance updates