Code review - added missing end tags for some elements