added item form, removed s from model names, updated models