Fix some issue

Fix the save and exit button not saving.