Rearrange tools layout a bit