Added closing tags for some elements