The remove and add buttons should now be enabled and disabled properly