Final tweaks to ViewController