A few small tweaks of the SecondaryToolbar code