Updated and fixed saving modal