Changes to mainView