UI tweaks and cleanups.