More Context Menu work

Started Add / Remove item functionality