#230 added tags around the elements of a template module and added new tags for the graph elements