Simplify the save and close logic
Add ctrl+shift+s to save and close