Fixed up the settings section