Fix naming, refactor, add check for fullscreen before hiding