Improve ViewController