Also, the empty Add/Remove actions look strange