More improvements to fullscreen toggling, not perfect, but good enough for now