Fix the save button. Start to reconfigure some menu items after the big rewrite