Delegate improvements and other UI tweaks.
