DAR-1152: move all header h1 logic to the same place.
DAR-1152: restyle toolbar items so they have some top margin when they drop down to the next line.