Added remove button, but not functional yet