Rearranged tags in html template to have uniform parsing