Update top bar to 4.1, allowing multiple top bar navigation elements on the same page.
Merge branch 'topbar2'