Fix removal bug
Fix Trashbutton bug