Move settings around again

disable immersive mode changed to switchbox
more rearrangement