Add autosave option and remove placeholders