Site bar redesign

Here's another PR for the site bar, incorporating some response to comments on the previous stale PR.