Rearrange general-top toolbar #175