UX improvements to auto add UI