Update from conversion, fix nav-link error