UI tweaks.
Additional diagnostics.