Hook up Remove button too