Decrease dependence of SecondaryToolbar on UI buttons