Branched from #72: On smaller screens, the toolbar gets rather squashed and text starts to overlap: 