More fixes. Fixed remove buttons.