fix & improve immersive mode