Rearranged toolbar