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

Refactor Presentation Mode code