Added save button, and its disabling / enabling