fix toolbar ordering