Saving works, auto-fill form added