Fix Edit form, List template, API