Fix tag closing issue and indentation