Slight performance and UI improvements.