Removed the multiple html tags that get created. Put in sensible tags where made up ones existed