diff --git a/src/default_panels/StyleLayoutPanel.js b/src/default_panels/StyleLayoutPanel.js
index aead3b98d..7803afb36 100644
--- a/src/default_panels/StyleLayoutPanel.js
+++ b/src/default_panels/StyleLayoutPanel.js
@@ -61,36 +61,30 @@ const StyleLayoutPanel = (props, {localize: _}) => (
       <Numeric label={_('Padding')} attr="margin.pad" units="px" />
     </PlotlyFold>
     <PlotlyFold name={_('Geo Style')}>
-      <PlotlySection name={_('Land')} attr="geo.showland">
-        <Radio
-          attr="geo.showland"
-          options={[
-            {label: _('Show'), value: true},
-            {label: _('Hide'), value: false},
-          ]}
-        />
-        <ColorPicker label={_('Color')} attr="geo.landcolor" />
-      </PlotlySection>
-      <PlotlySection name={_('Lakes')} attr="geo.showlakes">
+      <PlotlySection name={_('Country Borders')} attr="geo.showcountries">
         <Radio
-          attr="geo.showlakes"
+          attr="geo.showcountries"
           options={[
             {label: _('Show'), value: true},
             {label: _('Hide'), value: false},
           ]}
         />
-        <ColorPicker label={_('Color')} attr="geo.lakecolor" />
+        <Numeric label={_('Border Width')} attr="geo.countrywidth" units="px" />
+        <ColorPicker label={_('Border Color')} attr="geo.countrycolor" />
       </PlotlySection>
-      <PlotlySection name={_('Rivers')} attr="geo.showrivers">
+      <PlotlySection
+        name={_('Sub-Country Unit Borders')}
+        attr="geo.showsubunits"
+      >
         <Radio
-          attr="geo.showrivers"
+          attr="geo.showsubunits"
           options={[
             {label: _('Show'), value: true},
             {label: _('Hide'), value: false},
           ]}
         />
-        <Numeric label={_('Width')} attr="geo.riverwidth" units="px" />
-        <ColorPicker label={_('Color')} attr="geo.rivercolor" />
+        <Numeric label={_('Border Width')} attr="geo.subunitwidth" units="px" />
+        <ColorPicker label={_('Border Color')} attr="geo.subunitcolor" />
       </PlotlySection>
       <PlotlySection name={_('Coastlines')} attr="geo.showcoastlines">
         <Radio
@@ -113,18 +107,38 @@ const StyleLayoutPanel = (props, {localize: _}) => (
         />
         <ColorPicker label={_('Color')} attr="geo.oceancolor" />
       </PlotlySection>
-      <PlotlySection name={_('Countries')} attr="geo.showcountries">
+      <PlotlySection name={_('Land')} attr="geo.showland">
         <Radio
-          attr="geo.showcountries"
+          attr="geo.showland"
           options={[
             {label: _('Show'), value: true},
             {label: _('Hide'), value: false},
           ]}
         />
-        <Numeric label={_('Border Width')} attr="geo.countrywidth" units="px" />
-        <ColorPicker label={_('Border Color')} attr="geo.countrycolor" />
+        <ColorPicker label={_('Color')} attr="geo.landcolor" />
+      </PlotlySection>
+      <PlotlySection name={_('Lakes')} attr="geo.showlakes">
+        <Radio
+          attr="geo.showlakes"
+          options={[
+            {label: _('Show'), value: true},
+            {label: _('Hide'), value: false},
+          ]}
+        />
+        <ColorPicker label={_('Color')} attr="geo.lakecolor" />
+      </PlotlySection>
+      <PlotlySection name={_('Rivers')} attr="geo.showrivers">
+        <Radio
+          attr="geo.showrivers"
+          options={[
+            {label: _('Show'), value: true},
+            {label: _('Hide'), value: false},
+          ]}
+        />
+        <Numeric label={_('Width')} attr="geo.riverwidth" units="px" />
+        <ColorPicker label={_('Color')} attr="geo.rivercolor" />
       </PlotlySection>
-      <PlotlySection name={_('Frame')} attr="geo.showframe">
+      <PlotlySection name={_('Map Frame')} attr="geo.showframe">
         <Radio
           attr="geo.showframe"
           options={[