Start of fixing the add item form