FullScreen Module and refactoring