fixed item sorting
and cancel edit/delete forms