Change in template which has ti contain row now as well as cells
Minor bug fixes