match "added close button" commit part 2