Update form - Working progress 80%