[Tak] Combine main.html and row.html
[Tak] To merge