Merge "fix: correct loop scope intend and add missing tags (</div>)"