Refactor new widget upload process. Fix edit button label to be more
descriptive.