UI improvements for delegate mode