Bug fixes and UI tweaks.