Fixed Add/Remove functionality

Add/Remove functionality was broken in new UI layout