Fixed view menu conflicts

Started a new branch to fix the view menu conflicts