WIP: work on Remove button