Improve tags positioning