diff --git a/src/frontend/components/feedbackBoardMetadataForm.tsx b/src/frontend/components/feedbackBoardMetadataForm.tsx
index 10c529a40..af8a29223 100644
--- a/src/frontend/components/feedbackBoardMetadataForm.tsx
+++ b/src/frontend/components/feedbackBoardMetadataForm.tsx
@@ -231,16 +231,16 @@ class FeedbackBoardMetadataForm extends React.Component<IFeedbackBoardMetadataFo
       iconClass: 'far fa-angry',
     },
     {
-      friendlyName: 'chalkboard',
-      iconClass: 'fas fa-chalkboard',
+      friendlyName: 'question',
+      iconClass: 'fas fa-question',
     },
     {
       friendlyName: 'comments',
       iconClass: 'far fa-comments',
     },
     {
-      friendlyName: 'book',
-      iconClass: 'fas fa-book',
+      friendlyName: 'exclamation',
+      iconClass: 'fas fa-exclamation',
     },
     {
       friendlyName: 'compass',
@@ -251,33 +251,33 @@ class FeedbackBoardMetadataForm extends React.Component<IFeedbackBoardMetadataFo
       iconClass: 'far fa-eye',
     },
     {
-      friendlyName: 'question',
-      iconClass: 'fas fa-question',
+      friendlyName: 'life-ring',
+      iconClass: 'fas fa-life-ring',
     },
     {
-      friendlyName: 'exclamation',
-      iconClass: 'fas fa-exclamation',
+      friendlyName: 'anchor',
+      iconClass: 'fas fa-anchor',
+    },
+    {
+      friendlyName: 'balance',
+      iconClass: 'fas fa-scale-unbalanced-flip',
     },
     {
       friendlyName: 'rocket',
       iconClass: 'fas fa-rocket',
     },
     {
-      friendlyName: 'life-ring',
-      iconClass: 'fas fa-life-ring',
+      friendlyName: 'chalkboard',
+      iconClass: 'fas fa-chalkboard',
     },
     {
-      friendlyName: 'anchor',
-      iconClass: 'fas fa-anchor',
+      friendlyName: 'book',
+      iconClass: 'fas fa-book',
     },
     {
       friendlyName: 'celebrate',
       iconClass: 'fas fa-birthday-cake',
     },
-    {
-      friendlyName: 'balance',
-      iconClass: 'fas fa-balance-scale-right',
-    }
   ];
 
   private allAccentColors: { friendlyName: string, colorCode: string }[] = [
@@ -432,20 +432,23 @@ class FeedbackBoardMetadataForm extends React.Component<IFeedbackBoardMetadataFo
                     className="title-input-container column-template-dropdown"
                   >
                     <option value="">Select a template</option>
-                    <option value="speedboat">Speedboat</option>
+                    <option disabled>─────────────</option>
+                    <option value="start-stop-continue">Start-Stop-Continue</option>
+                    <option value="good-improve-ideas-thanks">Good-Improve-Ideas-Thanks</option>
+                    <option value="mad-sad-glad">Mad-Sad-Glad</option>
                     <option value="4ls">4Ls</option>
-                    <option value="1to1">1-to-1</option>
                     <option value="daki">Drop-Add-Keep-Improve</option>
-                    <option value="mad-sad-glad">Mad-Sad-Glad</option>
-                    <option value="good-bad-ideas">Good-Bad-Ideas</option>
                     <option value="kalm">Keep-Add-Less-More</option>
-                    <option value="start-stop-continue">Start-Stop-Continue</option>
-                    <option value="psy-safety">Psychological Safety</option>
                     <option value="wlai">Went Well-Learned-Accelerators-Impediments</option>
+                    <option value="1to1">Good-to-Done</option>
+                    <option value="speedboat">Speedboat</option>
+                    <option disabled>─────────────</option>
                     <option value="clarity">Clarity</option>
                     <option value="energy">Energy</option>
+                    <option value="psy-safety">Psychological Safety</option>
                     <option value="wlb">Work-life Balance</option>
-                    <option value="team-confidence">Team Confidence</option>
+                    <option value="confidence">Confidence</option>
+                    <option value="efficiency">Efficiency</option>
                   </select>
                 </div>
                 <List
diff --git a/src/frontend/utilities/boardColumnsHelper.tsx b/src/frontend/utilities/boardColumnsHelper.tsx
index 477e8ad53..1f60ff346 100644
--- a/src/frontend/utilities/boardColumnsHelper.tsx
+++ b/src/frontend/utilities/boardColumnsHelper.tsx
@@ -2,245 +2,260 @@ import { IFeedbackColumn } from '../interfaces/feedback';
 import { generateUUID } from './random';
 
 export const getColumnsByTemplateId = (templateId: string): IFeedbackColumn[] => {
+  const NEXT_ACTION = 'One action to try next.';
+
   switch (templateId) {
-    case 'speedboat': // Speedboat retrospective - Propellors, Life Preserver, Anchors, Rocks
-    return [
-      {
-        accentColor: '#008000',
-        iconClass: 'fas fa-rocket',
-        id: generateUUID(),
-        title: 'Propellors'
-      },
-      {
-        accentColor: '#f6af03',
-        iconClass: 'fas fa-life-ring',
-        id: generateUUID(),
-        title: 'Life preserver',
-      },
-      {
-        accentColor: '#F78A53',
-        iconClass: 'fas fa-anchor',
-        id: generateUUID(),
-        title: 'Anchors',
-      },
-      {
-        accentColor: '#cc293d',
-        iconClass: 'far fa-exclamation',
-        id: generateUUID(),
-        title: 'Rocks',
-      },
-    ];
-    case '4ls': // The 4 Ls - Like, Learned, Lacked, Longed For
+    case 'start-stop-continue':
       return [
         {
-          accentColor: '#008000',
-          iconClass: 'far fa-smile',
+          accentColor: '#008000', //green
+          iconClass: 'far fa-circle-play',
           id: generateUUID(),
-          title: 'Liked'
+          title: 'Start',
         },
         {
-          accentColor: '#f6af08',
-          iconClass: 'fas fa-book',
+          accentColor: '#cc293d', //red
+          iconClass: 'far fa-circle-stop',
           id: generateUUID(),
-          title: 'Learned',
-        },
-        {
-          accentColor: '#0078d4',
-          iconClass: 'far fa-compass',
-          id: generateUUID(),
-          title: 'Lacked',
+          title: 'Stop',
         },
         {
-          accentColor: '#8063bf',
-          iconClass: 'far fa-eye',
+          accentColor: '#f6af08', //yellow
+          iconClass: 'far fa-circle-dot',
           id: generateUUID(),
-          title: 'Longed for',
+          title: 'Continue',
         },
       ];
-    case '1to1': // 1-to-1 - Good, So-so, Improve, Done
+    case 'good-improve-ideas-thanks':
       return [
         {
-          accentColor: '#008000',
+          accentColor: '#008000', //green
           iconClass: 'far fa-smile',
           id: generateUUID(),
           title: 'Good',
         },
         {
-          accentColor: '#f6af08',
-          iconClass: 'fas fa-exclamation',
+          accentColor: '#cc293d', //red
+          iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'So-so',
+          title: 'Improve',
         },
         {
-          accentColor: '#0078d4',
-          iconClass: 'fas fa-balance-scale-right',
+          accentColor: '#f6af08', //yellow
+          iconClass: 'far fa-question',
           id: generateUUID(),
-          title: 'Improve',
+          title: 'Ideas',
         },
         {
-          accentColor: '#8063bf',
-          iconClass: 'fas fa-birthday-cake',
+          accentColor: '#0078d4', //blue
+          iconClass: 'far fa-exclamation',
           id: generateUUID(),
-          title: 'Done',
-        },
+          title: 'Thanks',
+        }
       ];
-    case 'daki': // Drop, Add, Keep, Improve
+    case 'mad-sad-glad':
       return [
         {
-          accentColor: '#cc293d',
-          iconClass: 'fas fa-exclamation',
+          accentColor: '#cc293d', //red
+          iconClass: 'far fa-angry',
           id: generateUUID(),
-          title: 'Drop',
+          title: 'Mad',
         },
         {
-          accentColor: '#008000',
-          iconClass: 'fas fa-smile',
+          accentColor: '#f6af08', //yellow
+          iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'Add',
+          title: 'Sad',
         },
         {
-          accentColor: '#0078d4',
-          iconClass: 'fas fa-book',
+          accentColor: '#008000', //green
+          iconClass: 'far fa-smile',
           id: generateUUID(),
-          title: 'Keep',
+          title: 'Glad',
         },
+      ];
+    case '4ls': // The 4 Ls - Like, Learned, Lacked, Longed For
+      return [
         {
-          accentColor: '#8063bf',
-          iconClass: 'far fa-compass',
+          accentColor: '#008000', //green
+          iconClass: 'far fa-thumbs-up',
           id: generateUUID(),
-          title: 'Improve',
+          title: 'Liked'
         },
-      ];
-    case 'mad-sad-glad':
-      return [
         {
-          accentColor: '#cc293d',
-          iconClass: 'far fa-angry',
+          accentColor: '#0078d4', //blue
+          iconClass: 'far fa-lightbulb',
           id: generateUUID(),
-          title: 'Mad',
+          title: 'Learned',
         },
         {
-          accentColor: '#f6af08',
-          iconClass: 'far fa-frown',
+          accentColor: '#cc293d', //red
+          iconClass: 'far fa-thumbs-down',
           id: generateUUID(),
-          title: 'Sad',
+          title: 'Lacked',
         },
         {
-          accentColor: '#008000',
-          iconClass: 'far fa-smile',
+          accentColor: '#f6af08', //yellow
+          iconClass: 'far fa-star',
           id: generateUUID(),
-          title: 'Glad',
+          title: 'Longed for',
         },
       ];
-    case 'good-bad-ideas':
+    case 'daki': // Drop, Add, Keep, Improve
       return [
         {
-          accentColor: '#008000',
-          iconClass: 'far fa-smile',
+          accentColor: '#cc293d', //red
+          iconClass: 'fas fa-trash',
           id: generateUUID(),
-          title: 'Good',
+          title: 'Drop',
         },
         {
-          accentColor: '#cc293d',
-          iconClass: 'far fa-angry',
+          accentColor: '#008000', //green
+          iconClass: 'fas fa-cart-plus',
           id: generateUUID(),
-          title: 'Bad',
+          title: 'Add',
         },
         {
-          accentColor: '#0078d4',
-          iconClass: 'fas fa-exclamation',
+          accentColor: '#0078d4', //blue
+          iconClass: 'fas fa-lock',
           id: generateUUID(),
-          title: 'Ideas',
+          title: 'Keep',
+        },
+        {
+          accentColor: '#f6af08', //yellow
+          iconClass: 'fas fa-wrench',
+          id: generateUUID(),
+          title: 'Improve',
         },
       ];
     case 'kalm': // Keep, Add, Less, More
       return [
         {
-          accentColor: '#008000',
-          iconClass: 'far fa-smile',
+          accentColor: '#0078d4', //blue
+          iconClass: 'far fa-square-check',
           id: generateUUID(),
           title: 'Keep',
         },
         {
-          accentColor: '#0078d4',
-          iconClass: 'fas fa-book',
+          accentColor: '#008000', //green
+          iconClass: 'far fa-square-plus',
           id: generateUUID(),
           title: 'Add',
         },
         {
-          accentColor: '#f6af08',
-          iconClass: 'fas fa-exclamation',
+          accentColor: '#f6af08', //yellow
+          iconClass: 'far fa-circle-down',
           id: generateUUID(),
           title: 'Less',
         },
         {
-          accentColor: '#8063bf',
-          iconClass: 'far fa-comments',
+          accentColor: '#8063bf', //purple
+          iconClass: 'far fa-circle-up',
           id: generateUUID(),
           title: 'More',
         },
       ];
-    case 'start-stop-continue':
+    case 'wlai': // Went Well, Learned, Accelerators, Impediments
       return [
         {
-          accentColor: '#008000',
-          iconClass: 'far fa-smile',
+          accentColor: '#008000', //green
+          iconClass: 'fas fa-star',
           id: generateUUID(),
-          title: 'Start',
+          title: 'Went Well',
         },
         {
-          accentColor: '#cc293d',
-          iconClass: 'far fa-frown',
+          accentColor: '#8063bf', //purple
+          iconClass: 'fas fa-book',
           id: generateUUID(),
-          title: 'Stop',
+          title: 'Learned',
         },
         {
-          accentColor: '#f6af08',
-          iconClass: 'far fa-eye',
+          accentColor: '#0078d4', //blue
+          iconClass: 'fas fa-rocket',
           id: generateUUID(),
-          title: 'Continue',
+          title: 'Accelerators',
+        },
+        {
+          accentColor: '#cc293d', //red
+          iconClass: 'fas fa-exclamation-triangle',
+          id: generateUUID(),
+          title: 'Impediments',
         },
       ];
-    case 'psy-safety':
+    case '1to1': // 1-to-1 - Good, So-so, Not-so-good, Done
       return [
         {
-          accentColor: '#008000',
-          iconClass: 'far fa-smile',
+          accentColor: '#008000', //green
+          iconClass: 'fas fa-scale-unbalanced',
           id: generateUUID(),
-          title: 'What makes it safe',
+          title: 'Good',
         },
         {
-          accentColor: '#cc293d',
-          iconClass: 'far fa-frown',
+          accentColor: '#f6af08', //yellow
+          iconClass: 'fas fa-scale-balanced',
           id: generateUUID(),
-          title: 'What hinders safety',
+          title: 'So-so',
         },
         {
-          accentColor: '#0078d4',
-          iconClass: 'fas fa-exclamation',
+          accentColor: '#cc293d', //red
+          iconClass: 'fas fa-scale-unbalanced-flip',
+          id: generateUUID(),
+          title: 'Not-so-good',
+        },
+        {
+          accentColor: '#8063bf', //purple
+          iconClass: 'fas fa-birthday-cake',
+          id: generateUUID(),
+          title: 'Done',
+        },
+      ];
+    case 'speedboat': // Speedboat retrospective - Propellors, Life Preserver, Anchors, Rocks
+      return [
+        {
+          accentColor: '#008000', //green
+          iconClass: 'fas fa-fan',
+          id: generateUUID(),
+          title: 'Propellors'
+        },
+        {
+          accentColor: '#0078d4', //blue
+          iconClass: 'fas fa-life-ring',
+          id: generateUUID(),
+          title: 'Lifesavers',
+        },
+        {
+          accentColor: '#cc293d', //red
+          iconClass: 'fas fa-anchor',
           id: generateUUID(),
-          title: 'One action in next sprint',
+          title: 'Anchors',
+        },
+        {
+          accentColor: '#f6af08', //yellow
+          iconClass: 'fas fa-skull-crossbones',
+          id: generateUUID(),
+          title: 'Rocks',
         },
       ];
+    // Team Assessment Templates
     case 'clarity':
       return [
         {
           accentColor: '#008000',
           iconClass: 'far fa-smile',
           id: generateUUID(),
-          title: 'What provides clarity',
+          title: 'What provides clarity?',
         },
         {
           accentColor: '#cc293d',
           iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'What hinders clarity',
+          title: 'What obstructs clarity?',
         },
         {
           accentColor: '#0078d4',
-          iconClass: 'fas fa-exclamation',
+          iconClass: 'far fa-circle-check',
           id: generateUUID(),
-          title: 'One action in next sprint',
+          title: NEXT_ACTION,
         },
       ];
     case 'energy':
@@ -249,109 +264,103 @@ export const getColumnsByTemplateId = (templateId: string): IFeedbackColumn[] =>
           accentColor: '#008000',
           iconClass: 'far fa-smile',
           id: generateUUID(),
-          title: 'What provides energy',
+          title: 'What boosts energy?',
         },
         {
           accentColor: '#cc293d',
           iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'What drains energy',
+          title: 'What drains energy?',
         },
         {
           accentColor: '#0078d4',
-          iconClass: 'fas fa-exclamation',
+          iconClass: 'far fa-circle-check',
           id: generateUUID(),
-          title: 'One action in next sprint',
+          title: NEXT_ACTION,
         },
       ];
-    case 'wlb':
+    case 'psy-safety':
       return [
         {
           accentColor: '#008000',
           iconClass: 'far fa-smile',
           id: generateUUID(),
-          title: 'What helps work-life balance',
+          title: 'What fosters psychological safety?',
         },
         {
           accentColor: '#cc293d',
           iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'What hinders work-life balance',
+          title: 'What undermines pyschological safety?',
         },
         {
           accentColor: '#0078d4',
-          iconClass: 'fas fa-exclamation',
+          iconClass: 'far fa-circle-check',
           id: generateUUID(),
-          title: 'One action in next sprint',
+          title: NEXT_ACTION,
         },
       ];
-    case 'team-confidence':
+    case 'wlb':
       return [
         {
           accentColor: '#008000',
           iconClass: 'far fa-smile',
           id: generateUUID(),
-          title: 'What increases confidence in team',
+          title: 'What helps work-life balance?',
         },
         {
           accentColor: '#cc293d',
           iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'What decreases confidence in team',
+          title: 'What hinders work-life balance?',
         },
         {
           accentColor: '#0078d4',
-          iconClass: 'fas fa-exclamation',
+          iconClass: 'far fa-circle-check',
           id: generateUUID(),
-          title: 'One action in next sprint',
+          title: NEXT_ACTION,
         },
       ];
-    case 'team-efficiency':
+    case 'confidence':
       return [
         {
           accentColor: '#008000',
           iconClass: 'far fa-smile',
           id: generateUUID(),
-          title: 'What helps efficiency',
+          title: 'What enhances confidence in team?',
         },
         {
           accentColor: '#cc293d',
           iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'What hinders efficiency',
+          title: 'What reduces confidence in team?',
         },
         {
           accentColor: '#0078d4',
-          iconClass: 'fas fa-exclamation',
+          iconClass: 'far fa-circle-check',
           id: generateUUID(),
-          title: 'One action in next sprint',
+          title: NEXT_ACTION,
         },
       ];
-    case 'wlai': // Went Well, Learned, Impediments, Accelerators
+    case 'efficiency':
       return [
         {
           accentColor: '#008000',
           iconClass: 'far fa-smile',
           id: generateUUID(),
-          title: 'Went Well',
+          title: 'What increases efficiency?',
         },
         {
-          accentColor: '#8063bf',
-          iconClass: 'fas fa-book',
+          accentColor: '#cc293d',
+          iconClass: 'far fa-frown',
           id: generateUUID(),
-          title: 'Learned',
+          title: 'What decreases efficiency?',
         },
         {
           accentColor: '#0078d4',
-          iconClass: 'far fa-compass',
+          iconClass: 'far fa-circle-check',
           id: generateUUID(),
-          title: 'Accelerators',
-        },
-        {
-          accentColor: '#cc293d',
-          iconClass: 'fas fa-question',
-          id: generateUUID(),
-          title: 'Impediments',
+          title: NEXT_ACTION,
         },
       ];
     default: {
@@ -359,12 +368,12 @@ export const getColumnsByTemplateId = (templateId: string): IFeedbackColumn[] =>
         accentColor: '#008000',
         iconClass: 'far fa-smile',
         id: generateUUID(),
-        title: 'What went well',
+        title: 'What went well?',
       }, {
         accentColor: '#cc293d',
         iconClass: 'far fa-frown',
         id: generateUUID(),
-        title: "What didn't go well",
+        title: "What didn't go well?",
       }]
     }
   }
diff --git a/src/frontend/utilities/effectivenessMeasurementQuestionHelper.tsx b/src/frontend/utilities/effectivenessMeasurementQuestionHelper.tsx
index d9a0cdb83..7ee705ac4 100644
--- a/src/frontend/utilities/effectivenessMeasurementQuestionHelper.tsx
+++ b/src/frontend/utilities/effectivenessMeasurementQuestionHelper.tsx
@@ -34,7 +34,7 @@ export const questions = [
   {
     id: 5,
     shortTitle: "Confidence",
-    discussActTemplate: "team-confidence",
+    discussActTemplate: "confidence",
     title: "I'm confident our team will be successful",
     fontAwesomeClass: "fa-solid fa-square-poll-vertical",
     tooltip: "<a target=\"_blank\" rel=\"noreferrer\" href=\"https://content.apa.org/record/2009-06703-020\">Research</a> shows the strongest predictor of team efficacy is the collective confidence of the team to be successful.",
@@ -42,7 +42,7 @@ export const questions = [
   {
     id: 6,
     shortTitle: "Efficiency",
-    discussActTemplate: "team-efficiency",
+    discussActTemplate: "efficiency",
     title: "Tools, resources, processes, procedures allow me to effectively meet my customers' needs",
     fontAwesomeClass: "fa-solid fa-gears",
     tooltip: "Case studies, such as those in <a target=\"_blank\" rel=\"noreferrer\" href=\"https://www.amazon.com/Accelerate-Software-Performing-Technology-Organizations/dp/1942788339/\">Accelerate</a> by Forsgren, Humble, and Kim, show that organizations that optimize their processes and tools see improvements in customer responsiveness, lead time, and developer satisfaction.",