Checked if option submitted before trying to save
Minor text and whitespace updates