MainViewController changes didn't migrate over. Adding those changes.