Consolidate two save buttons into one on configuration page

Also just remove