Improved the tag layout