fix list and edit templates