Use two line top bar the whole time

It has been decided that the two line top bar should be in use all the
time. Not just when on a page that provides some navigation.