Add the "save changes" button back

And remove the not-yet-implemented "edit" button