Fix ViewController navigation