Update the navbar viewlet template
Update the theme templates with correct links as well