rearranged toolbar controls