Performance and UI improvements.