Updates to fix toolbar with multiple actions