Fix Validation Errors

Fixed open elements, changed tags to be more appropriate