improved data graphs across templates