Various fixes in main ViewController.