fixed the editing issue, officially done with using the data context, not sure what is going on with all the rerenderings