Refactor Presentation Mode code
Merge pull request #3763 from Snuffleupagus/refactor-PresentationMode

Refactor Presentation Mode code
Enabling clicking to close the context menu in Presentation Mode, without going to the next page