Fix highlights in navigation
Update site-in links in default layout