Fix view switcher