Fixed view toggle issue