rename SelectorHolder to Collect
title on parent add/remove button
change layout, code cleanup