Improve Command+S mapping