Fixed closing tags to match opening tags