Minor updates from site-nav branch