Add rest of form stuff (edit, delete)