Fixed the issue with the data not being saved and also with the buggy image uploader