i'd prefer a proper toolbar for this, to match theming changes (if we make any), but that can wait I suppose