Make add/edit item form a lot better