Fixed linkage with save button issue