Refactoring
minor
Added fullscreen