Fix navigation controller