Add/Insert Bars - UI and logic improved