Tweaks of View Modes Switcher #271