fixed category/item view, model; added edit