Refactored the save process to more accuratly populate the widgets fixes
#6