Add close-all page control button
Merge remote-tracking branch 'upstream/master'