Added immersive mode support