Dialog improvements, edit/delete/add collection features