diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs b/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs
index 7dab95a9b..9758fd8fb 100644
--- a/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs
+++ b/SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs
@@ -240,21 +240,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 
 		private void PopulateLayoutDictionary()
 		{
-			string UserLevel = "Advanced"; //Show all settings
-			for (int categoryIndex = 0; categoryIndex < SliceSettingsOrganizer.Instance.UserLevels[UserLevel].CategoriesList.Count; categoryIndex++)
+			// Show all settings
+			var advancedSettings = SliceSettingsOrganizer.Instance.UserLevels["Advanced"];
+
+			foreach (OrganizerCategory category in advancedSettings.CategoriesList)
 			{
-				OrganizerCategory category = SliceSettingsOrganizer.Instance.UserLevels[UserLevel].CategoriesList[categoryIndex];
-
-				for (int groupIndex = 0; groupIndex < category.GroupsList.Count; groupIndex++)
+				foreach (OrganizerGroup group in category.GroupsList)
 				{
-					OrganizerGroup group = category.GroupsList[groupIndex];
-
-					for (int subGroupIndex = 0; subGroupIndex < group.SubGroupsList.Count; subGroupIndex++)
+					foreach (OrganizerSubGroup subgroup in group.SubGroupsList)
 					{
-						OrganizerSubGroup subgroup = group.SubGroupsList[subGroupIndex];
-						for (int settingIndex = 0; settingIndex < subgroup.SettingDataList.Count; settingIndex++)
+						foreach (OrganizerSettingsData setting in subgroup.SettingDataList)
 						{
-							OrganizerSettingsData setting = subgroup.SettingDataList[settingIndex];
 							string settingDisplayName = "{0} > {1} > {2}".FormatWith(category.Name, group.Name, setting.PresentationName).Replace("\\n", "").Replace(":", "");
 							settingLayoutData[setting.SlicerConfigName] = settingDisplayName;
 						}
diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index 85be0d2a4..ba3e432d7 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 				this.AddChild(showHelpBox);
 			}
 
-			settingsDetailSelector = new StyledDropDownList("Simple", maxHeight: 200);
+			settingsDetailSelector = new StyledDropDownList("Basic", maxHeight: 200);
 			settingsDetailSelector.AddItem(LocalizedString.Get("Basic"), "Simple");
 			settingsDetailSelector.AddItem(LocalizedString.Get("Standard"), "Intermediate");
 			settingsDetailSelector.AddItem(LocalizedString.Get("Advanced"), "Advanced");
diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json
index ee2dc76c0..9b6a57b56 100644
--- a/StaticData/SliceSettings/Properties.json
+++ b/StaticData/SliceSettings/Properties.json
@@ -346,7 +346,7 @@
   {
     "SlicerConfigName": "first_layer_speed",
     "PresentationName": "First Layer Speed",
-    "HelpText": "The speed to move while printing the first layer. If expressed as a percentage it will modify the corresponding speed set above.",
+    "HelpText": "The speed to move while printing the first layer. If expressed as a percentage the above Infill speed is modified.",
     "DataEditType": "DOUBLE_OR_PERCENT",
     "ExtraSettings": "mm/s or %"
   },