Cancel button and hidden re-assign buttons for matching, fixes #6514