Improve updateNav
Remove baseUrl's trailing slash