Changed template html files to tables