Refactor
Refactoring of fullscreen mode