Code and UI improvements.