Changes for immersive mode

Thanks to CM