Rearrange tools again