Fix toolbar uiorder overrides