Updated graph view with the new template system