Added refinements to data processing on add page and bug fixes