save button fixes