Minor UI tweaks, cleanup.