Wiring up fullscreen controls in refactored version fixes #1