Modify templates files to better match HTML structure