Modified tag to end appropriately as XHTML