Update forms and index pages to have correct associations and do not display deleted_at