fix wrong function call on remove button
change function names for ex-buttons, now context items