match "added close button" commit from Slauayama