fixed multiple add  of tags and some layout