Added edit function
Enabled save
Merge branch 'edit'