Minor edits

Added Save-And-Close button to save set dialog, changed Save Set button color to green