Restructure options in the options page

The options list is very long and some useful features are buried down
in the list and so aren't easy to find. This change creates a main
section called "Featured options" and another section called "Minor
enhancements".

Bug: twpowertools:63
Change-Id: I50a13df08eb127f53052357200d83095da974869
diff --git a/src/options/optionsPage.json5 b/src/options/optionsPage.json5
index 9f6e7fd..e4641b6 100644
--- a/src/options/optionsPage.json5
+++ b/src/options/optionsPage.json5
@@ -4,39 +4,39 @@
 {
   sections: [
     {
-      name: null,
+      name: 'featuredoptions',
       options: [
         {codename: 'list'},
         {codename: 'thread'},
         {codename: 'threadall'},
-      ],
-    },
-    {
-      name: 'enhancements',
-      options: [
-        {codename: 'fixedtoolbar'},
-        {codename: 'redirect'},
-        {codename: 'history'},
-        {codename: 'loaddrafts', experimental: true},
-        {codename: 'increasecontrast'},
-        {codename: 'stickysidebarheaders'},
         {codename: 'ccdarktheme'},
-        {codename: 'ccforcehidedrawer'},
-        {codename: 'ccdragndropfix', customHTML: '<div id="dragndrop-wrapper" class="option" hidden><input type="checkbox" id="ccdragndropfix"> <label for="ccdragndropfix" data-i18n="ccdragndropfix"></label></div>'},
-        {codename: 'batchlock'},
-        {codename: 'enhancedannouncementsdot'},
-        {codename: 'repositionexpandthread', experimental: true},
         {codename: 'threadlistavatars'},
+        {codename: 'history'},
+        {codename: 'batchlock'},
         {codename: 'autorefreshlist'},
       ],
     },
     {
-      name: 'profileindicator_header',
+      name: null,
       options: [
         {codename: 'profileindicator'},
         {codename: 'profileindicatoralt'},
       ],
       footerHTML: '<div class="option"><a id="profileIndicatorMoreInfo" target="_blank" rel="noreferrer noopener" data-i18n="profileindicator_moreinfo"></a></div>',
     },
+    {
+      name: 'minorenhancements',
+      options: [
+        {codename: 'fixedtoolbar'},
+        {codename: 'redirect'},
+        {codename: 'loaddrafts', experimental: true},
+        {codename: 'increasecontrast'},
+        {codename: 'stickysidebarheaders'},
+        {codename: 'ccforcehidedrawer'},
+        {codename: 'ccdragndropfix', customHTML: '<div id="dragndrop-wrapper" class="option" hidden><input type="checkbox" id="ccdragndropfix"> <label for="ccdragndropfix" data-i18n="ccdragndropfix"></label></div>'},
+        {codename: 'enhancedannouncementsdot'},
+        {codename: 'repositionexpandthread', experimental: true},
+      ],
+    },
   ],
 }
diff --git a/src/static/_locales/en/messages.json b/src/static/_locales/en/messages.json
index 466dfb6..02b0bea 100644
--- a/src/static/_locales/en/messages.json
+++ b/src/static/_locales/en/messages.json
@@ -23,6 +23,14 @@
     "message": "The previous option has been force disabled due to an issue.",
     "description": "Warning shown in the options page below an option, when it has been remotely force disabled via the kill switch mechanism."
   },
+  "options_featuredoptions": {
+    "message": "Featured options",
+    "description": "Heading for several options that can be enabled in the options page."
+  },
+  "options_minorenhancements": {
+    "message": "Minor enhancements",
+    "description": "Heading for several options that can be enabled in the options page."
+  },
   "options_list": {
     "message": "Enable infinite scrolling in thread lists.",
     "description": "Feature checkbox in the options page"
@@ -35,10 +43,6 @@
     "message": "Automatically load all messages at once inside threads when scrolling down.",
     "description": "Feature checkbox in the options page"
   },
-  "options_enhancements": {
-    "message": "Additional enhancements",
-    "description": "Heading for several options that can be enabled in the options page"
-  },
   "options_fixedtoolbar": {
     "message": "Fix the toolbar in thread lists in the Community Console.",
     "description": "Feature checkbox in the options page"
@@ -107,10 +111,6 @@
     "message": "Show a notification in the Community Console when a thread list has new updates.",
     "description": "Feature checkbox in the options page"
   },
-  "options_profileindicator_header": {
-    "message": "Indicator dot",
-    "description": "Heading for the profile indicator feature options"
-  },
   "options_profileindicator_moreinfo": {
     "message": "+info about the 2 previous options",
     "description": "Link to learn more about the profile indicator feature"