Bug fixes. Added remove buttons