amended item model and modified some views