Move view logic to ViewController