diff --git a/src/editor.ts b/src/editor.ts
index ebd52bd7..9eb6fc24 100644
--- a/src/editor.ts
+++ b/src/editor.ts
@@ -1,6 +1,7 @@
 import { fireEvent, HomeAssistant, LovelaceCardEditor } from 'custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
+import { classMap } from 'lit/directives/class-map.js';
 import {
   copyConfig,
   deleteConfigValue,
@@ -598,41 +599,47 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
   }
 
   protected _renderViewScanMenu(): TemplateResult {
+    const submenuClasses = {
+      submenu: true,
+      selected: !!this._expandedMenus[MENU_VIEW_SCAN],
+    };
     return html`
-      <div
-        class="submenu-header"
-        @click=${this._toggleMenu}
-        .domain=${MENU_VIEW_SCAN}
-        .key=${true}
-      >
-        <ha-icon .icon=${'mdi:target-account'}></ha-icon>
-        <span>${localize(`config.${CONF_VIEW_SCAN}.scan_mode`)}</span>
+      <div class="${classMap(submenuClasses)}">
+        <div
+          class="submenu-header"
+          @click=${this._toggleMenu}
+          .domain=${MENU_VIEW_SCAN}
+          .key=${true}
+        >
+          <ha-icon .icon=${'mdi:target-account'}></ha-icon>
+          <span>${localize(`config.${CONF_VIEW_SCAN}.scan_mode`)}</span>
+        </div>
+        ${this._expandedMenus[MENU_VIEW_SCAN]
+          ? html` <div class="values">
+              ${this._renderSwitch(
+                CONF_VIEW_SCAN_ENABLED,
+                frigateCardConfigDefaults.view.scan.enabled,
+                {
+                  label: localize(`config.${CONF_VIEW_SCAN_ENABLED}`),
+                },
+              )}
+              ${this._renderSwitch(
+                CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS,
+                frigateCardConfigDefaults.view.scan.show_trigger_status,
+                {
+                  label: localize(`config.${CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS}`),
+                },
+              )}
+              ${this._renderSwitch(
+                CONF_VIEW_SCAN_UNTRIGGER_RESET,
+                frigateCardConfigDefaults.view.scan.untrigger_reset,
+              )}
+              ${this._renderNumberInput(CONF_VIEW_SCAN_UNTRIGGER_SECONDS, {
+                default: frigateCardConfigDefaults.view.scan.untrigger_seconds,
+              })}
+            </div>`
+          : ''}
       </div>
-      ${this._expandedMenus[MENU_VIEW_SCAN]
-        ? html` <div class="values">
-            ${this._renderSwitch(
-              CONF_VIEW_SCAN_ENABLED,
-              frigateCardConfigDefaults.view.scan.enabled,
-              {
-                label: localize(`config.${CONF_VIEW_SCAN_ENABLED}`),
-              },
-            )}
-            ${this._renderSwitch(
-              CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS,
-              frigateCardConfigDefaults.view.scan.show_trigger_status,
-              {
-                label: localize(`config.${CONF_VIEW_SCAN_SHOW_TRIGGER_STATUS}`),
-              },
-            )}
-            ${this._renderSwitch(
-              CONF_VIEW_SCAN_UNTRIGGER_RESET,
-              frigateCardConfigDefaults.view.scan.untrigger_reset,
-            )}
-            ${this._renderNumberInput(CONF_VIEW_SCAN_UNTRIGGER_SECONDS, {
-              default: frigateCardConfigDefaults.view.scan.untrigger_seconds,
-            })}
-          </div>`
-        : ''}
     `;
   }
 
@@ -647,80 +654,53 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
       { value: 'matching', label: localize('config.menu.buttons.alignments.matching') },
       { value: 'opposing', label: localize('config.menu.buttons.alignments.opposing') },
     ];
+    const submenuClasses = {
+      submenu: true,
+      selected: this._expandedMenus[MENU_BUTTONS] === button,
+    };
 
     return html`
-      <div
-        class="submenu-header"
-        @click=${this._toggleMenu}
-        .domain=${MENU_BUTTONS}
-        .key=${button}
-      >
-        <ha-icon .icon=${'mdi:gesture-tap-button'}></ha-icon>
-        <span
-          >${localize('editor.button') +
-          ': ' +
-          localize(`config.${CONF_MENU_BUTTONS}.${button}`)}</span
+      <div class="${classMap(submenuClasses)}">
+        <div
+          class="submenu-header"
+          @click=${this._toggleMenu}
+          .domain=${MENU_BUTTONS}
+          .key=${button}
         >
-      </div>
+          <ha-icon .icon=${'mdi:gesture-tap-button'}></ha-icon>
+          <span
+            >${localize('editor.button') +
+            ': ' +
+            localize(`config.${CONF_MENU_BUTTONS}.${button}`)}</span
+          >
+        </div>
 
-      ${this._expandedMenus[MENU_BUTTONS] === button
-        ? html` <div class="values">
-            ${this._renderSwitch(
-              `${CONF_MENU_BUTTONS}.${button}.enabled`,
-              frigateCardConfigDefaults.menu.buttons[button]?.enabled ?? true,
-              {
-                label: localize('config.menu.buttons.enabled'),
-              },
-            )}
-            ${this._renderOptionSelector(
-              `${CONF_MENU_BUTTONS}.${button}.alignment`,
-              menuButtonAlignments,
-              {
-                label: localize('config.menu.buttons.alignment'),
-              },
-            )}
-            ${this._renderNumberInput(`${CONF_MENU_BUTTONS}.${button}.priority`, {
-              max: FRIGATE_MENU_PRIORITY_MAX,
-              default: frigateCardConfigDefaults.menu.buttons[button]?.priority,
-              label: localize('config.menu.buttons.priority'),
-            })}
-            ${this._renderIconSelector(`${CONF_MENU_BUTTONS}.${button}.icon`, {
-              label: localize('config.menu.buttons.icon'),
-            })}
-          </div>`
-        : ''}
-    `;
-  }
-
-  /**
-   * Render a camera header.
-   * @param cameraIndex The index of the camera to edit/add.
-   * @param cameraConfig The configuration of the camera in question.
-   * @param addNewCamera Whether or not this is a header to add a new camera.
-   * @returns A rendered template.
-   */
-  protected _renderCameraHeader(
-    cameraIndex: number,
-    cameraConfig?: RawFrigateCardConfig,
-    addNewCamera?: boolean,
-  ): TemplateResult {
-    return html`
-      <div
-        class="submenu-header"
-        @click=${this._toggleMenu}
-        .domain=${MENU_CAMERAS}
-        .key=${cameraIndex}
-      >
-        <ha-icon .icon=${addNewCamera ? 'mdi:video-plus' : 'mdi:video'}></ha-icon>
-        <span>
-          ${addNewCamera
-            ? html` <span class="new-camera">
-                [${localize('editor.add_new_camera')}...]
-              </span>`
-            : html`<span
-                >${this._getEditorCameraTitle(cameraIndex, cameraConfig || {})}</span
-              >`}
-        </span>
+        ${this._expandedMenus[MENU_BUTTONS] === button
+          ? html` <div class="values">
+              ${this._renderSwitch(
+                `${CONF_MENU_BUTTONS}.${button}.enabled`,
+                frigateCardConfigDefaults.menu.buttons[button]?.enabled ?? true,
+                {
+                  label: localize('config.menu.buttons.enabled'),
+                },
+              )}
+              ${this._renderOptionSelector(
+                `${CONF_MENU_BUTTONS}.${button}.alignment`,
+                menuButtonAlignments,
+                {
+                  label: localize('config.menu.buttons.alignment'),
+                },
+              )}
+              ${this._renderNumberInput(`${CONF_MENU_BUTTONS}.${button}.priority`, {
+                max: FRIGATE_MENU_PRIORITY_MAX,
+                default: frigateCardConfigDefaults.menu.buttons[button]?.priority,
+                label: localize('config.menu.buttons.priority'),
+              })}
+              ${this._renderIconSelector(`${CONF_MENU_BUTTONS}.${button}.icon`, {
+                label: localize('config.menu.buttons.icon'),
+              })}
+            </div>`
+          : ''}
       </div>
     `;
   }
@@ -772,135 +752,161 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
       }
     };
 
+    const submenuClasses = {
+      submenu: true,
+      selected: this._expandedMenus[MENU_CAMERAS] === cameraIndex,
+    };
+
     return html`
-      ${this._renderCameraHeader(cameraIndex, cameras[cameraIndex], addNewCamera)}
-      ${this._expandedMenus[MENU_CAMERAS] === cameraIndex
-        ? html` <div class="values">
-            <div class="controls">
-              <ha-icon-button
-                class="button"
-                .label=${localize('editor.move_up')}
-                .disabled=${addNewCamera ||
-                !this._config ||
-                !Array.isArray(this._config.cameras) ||
-                cameraIndex <= 0}
-                @click=${() =>
-                  !addNewCamera &&
-                  modifyConfig((config: RawFrigateCardConfig): boolean => {
-                    if (Array.isArray(config.cameras) && cameraIndex > 0) {
-                      arrayMove(config.cameras, cameraIndex, cameraIndex - 1);
-                      this._openMenu(MENU_CAMERAS, cameraIndex - 1);
-                      return true;
-                    }
-                    return false;
-                  })}
-              >
-                <ha-icon icon="mdi:arrow-up"></ha-icon>
-              </ha-icon-button>
-              <ha-icon-button
-                class="button"
-                .label=${localize('editor.move_down')}
-                .disabled=${addNewCamera ||
-                !this._config ||
-                !Array.isArray(this._config.cameras) ||
-                cameraIndex >= this._config.cameras.length - 1}
-                @click=${() =>
-                  !addNewCamera &&
-                  modifyConfig((config: RawFrigateCardConfig): boolean => {
-                    if (
-                      Array.isArray(config.cameras) &&
-                      cameraIndex < config.cameras.length - 1
-                    ) {
-                      arrayMove(config.cameras, cameraIndex, cameraIndex + 1);
-                      this._openMenu(MENU_CAMERAS, cameraIndex + 1);
-                      return true;
-                    }
-                    return false;
-                  })}
-              >
-                <ha-icon icon="mdi:arrow-down"></ha-icon>
-              </ha-icon-button>
-              <ha-icon-button
-                class="button"
-                .label=${localize('editor.delete')}
-                .disabled=${addNewCamera}
-                @click=${() => {
-                  modifyConfig((config: RawFrigateCardConfig): boolean => {
-                    if (Array.isArray(config.cameras)) {
-                      config.cameras.splice(cameraIndex, 1);
-                      this._closeMenu(MENU_CAMERAS);
-                      return true;
-                    }
-                    return false;
-                  });
-                }}
-              >
-                <ha-icon icon="mdi:delete"></ha-icon>
-              </ha-icon-button>
-            </div>
-            ${this._renderEntitySelector(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_CAMERA_ENTITY, cameraIndex),
-              'camera',
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_CAMERA_NAME, cameraIndex),
-            )}
-            ${this._renderOptionSelector(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_LIVE_PROVIDER, cameraIndex),
-              liveProviders,
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_URL, cameraIndex),
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_LABEL, cameraIndex),
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_ZONE, cameraIndex),
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_CLIENT_ID, cameraIndex),
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_TITLE, cameraIndex),
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_ICON, cameraIndex),
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_ID, cameraIndex),
-            )}
-            ${this._renderEntitySelector(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_WEBRTC_CARD_ENTITY, cameraIndex),
-              'camera',
-            )}
-            ${this._renderStringInput(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_WEBRTC_CARD_URL, cameraIndex),
-            )}
-            ${this._renderOptionSelector(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_DEPENDENT_CAMERAS, cameraIndex),
-              dependentCameras,
-              {
-                multiple: true,
-              },
-            )}
-            ${this._renderSwitch(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_OCCUPANCY, cameraIndex),
-              frigateCardConfigDefaults.cameras.trigger_by_occupancy,
-            )}
-            ${this._renderSwitch(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_MOTION, cameraIndex),
-              frigateCardConfigDefaults.cameras.trigger_by_motion,
-            )}
-            ${this._renderOptionSelector(
-              getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_ENTITIES, cameraIndex),
-              entities,
-              {
-                multiple: true,
-              },
-            )}
-          </div>`
-        : ``}
+      <div class="${classMap(submenuClasses)}">
+        <div
+          class="submenu-header"
+          @click=${this._toggleMenu}
+          .domain=${MENU_CAMERAS}
+          .key=${cameraIndex}
+        >
+          <ha-icon .icon=${addNewCamera ? 'mdi:video-plus' : 'mdi:video'}></ha-icon>
+          <span>
+            ${addNewCamera
+              ? html` <span class="new-camera">
+                  [${localize('editor.add_new_camera')}...]
+                </span>`
+              : html`<span
+                  >${this._getEditorCameraTitle(
+                    cameraIndex,
+                    cameras[cameraIndex] || {},
+                  )}</span
+                >`}
+          </span>
+        </div>
+        ${this._expandedMenus[MENU_CAMERAS] === cameraIndex
+          ? html` <div class="values">
+              <div class="controls">
+                <ha-icon-button
+                  class="button"
+                  .label=${localize('editor.move_up')}
+                  .disabled=${addNewCamera ||
+                  !this._config ||
+                  !Array.isArray(this._config.cameras) ||
+                  cameraIndex <= 0}
+                  @click=${() =>
+                    !addNewCamera &&
+                    modifyConfig((config: RawFrigateCardConfig): boolean => {
+                      if (Array.isArray(config.cameras) && cameraIndex > 0) {
+                        arrayMove(config.cameras, cameraIndex, cameraIndex - 1);
+                        this._openMenu(MENU_CAMERAS, cameraIndex - 1);
+                        return true;
+                      }
+                      return false;
+                    })}
+                >
+                  <ha-icon icon="mdi:arrow-up"></ha-icon>
+                </ha-icon-button>
+                <ha-icon-button
+                  class="button"
+                  .label=${localize('editor.move_down')}
+                  .disabled=${addNewCamera ||
+                  !this._config ||
+                  !Array.isArray(this._config.cameras) ||
+                  cameraIndex >= this._config.cameras.length - 1}
+                  @click=${() =>
+                    !addNewCamera &&
+                    modifyConfig((config: RawFrigateCardConfig): boolean => {
+                      if (
+                        Array.isArray(config.cameras) &&
+                        cameraIndex < config.cameras.length - 1
+                      ) {
+                        arrayMove(config.cameras, cameraIndex, cameraIndex + 1);
+                        this._openMenu(MENU_CAMERAS, cameraIndex + 1);
+                        return true;
+                      }
+                      return false;
+                    })}
+                >
+                  <ha-icon icon="mdi:arrow-down"></ha-icon>
+                </ha-icon-button>
+                <ha-icon-button
+                  class="button"
+                  .label=${localize('editor.delete')}
+                  .disabled=${addNewCamera}
+                  @click=${() => {
+                    modifyConfig((config: RawFrigateCardConfig): boolean => {
+                      if (Array.isArray(config.cameras)) {
+                        config.cameras.splice(cameraIndex, 1);
+                        this._closeMenu(MENU_CAMERAS);
+                        return true;
+                      }
+                      return false;
+                    });
+                  }}
+                >
+                  <ha-icon icon="mdi:delete"></ha-icon>
+                </ha-icon-button>
+              </div>
+              ${this._renderEntitySelector(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_CAMERA_ENTITY, cameraIndex),
+                'camera',
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_CAMERA_NAME, cameraIndex),
+              )}
+              ${this._renderOptionSelector(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_LIVE_PROVIDER, cameraIndex),
+                liveProviders,
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_URL, cameraIndex),
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_LABEL, cameraIndex),
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_ZONE, cameraIndex),
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_CLIENT_ID, cameraIndex),
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_TITLE, cameraIndex),
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_ICON, cameraIndex),
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_ID, cameraIndex),
+              )}
+              ${this._renderEntitySelector(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_WEBRTC_CARD_ENTITY, cameraIndex),
+                'camera',
+              )}
+              ${this._renderStringInput(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_WEBRTC_CARD_URL, cameraIndex),
+              )}
+              ${this._renderOptionSelector(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_DEPENDENT_CAMERAS, cameraIndex),
+                dependentCameras,
+                {
+                  multiple: true,
+                },
+              )}
+              ${this._renderSwitch(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_OCCUPANCY, cameraIndex),
+                frigateCardConfigDefaults.cameras.trigger_by_occupancy,
+              )}
+              ${this._renderSwitch(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_MOTION, cameraIndex),
+                frigateCardConfigDefaults.cameras.trigger_by_motion,
+              )}
+              ${this._renderOptionSelector(
+                getArrayConfigPath(CONF_CAMERAS_ARRAY_TRIGGER_BY_ENTITIES, cameraIndex),
+                entities,
+                {
+                  multiple: true,
+                },
+              )}
+            </div>`
+          : ``}
+      </div>
     `;
   }
 
@@ -1014,10 +1020,10 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
       <div class="card-config">
         ${this._renderOptionSetHeader('cameras')}
         ${this._expandedMenus[MENU_OPTIONS] === 'cameras'
-          ? html` <div class="submenu">
+          ? html`
               ${cameras.map((_, index) => this._renderCamera(cameras, index, entities))}
               ${this._renderCamera(cameras, cameras.length, entities, true)}
-            </div>`
+            `
           : ''}
         ${this._renderOptionSetHeader('view')}
         ${this._expandedMenus[MENU_OPTIONS] === 'view'
@@ -1051,19 +1057,17 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
                   min: BUTTON_SIZE_MIN,
                 })}
               </div>
-              <div class="submenu">
-                ${this._renderMenuButton('frigate') /* */}
-                ${this._renderMenuButton('cameras') /* */}
-                ${this._renderMenuButton('live') /* */}
-                ${this._renderMenuButton('clips') /* */}
-                ${this._renderMenuButton('snapshots')}
-                ${this._renderMenuButton('image') /* */}
-                ${this._renderMenuButton('download')}
-                ${this._renderMenuButton('frigate_ui')}
-                ${this._renderMenuButton('fullscreen')}
-                ${this._renderMenuButton('timeline')}
-                ${this._renderMenuButton('media_player')}
-              </div>
+              ${this._renderMenuButton('frigate') /* */}
+              ${this._renderMenuButton('cameras') /* */}
+              ${this._renderMenuButton('live') /* */}
+              ${this._renderMenuButton('clips') /* */}
+              ${this._renderMenuButton('snapshots')}
+              ${this._renderMenuButton('image') /* */}
+              ${this._renderMenuButton('download')}
+              ${this._renderMenuButton('frigate_ui')}
+              ${this._renderMenuButton('fullscreen')}
+              ${this._renderMenuButton('timeline')}
+              ${this._renderMenuButton('media_player')}
             `
           : ''}
         ${this._renderOptionSetHeader('live')}
@@ -1305,7 +1309,7 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor
       const domain = ev.target.domain;
       const key = ev.target.key;
 
-      if (this._expandedMenus[domain] == key) {
+      if (this._expandedMenus[domain] === key) {
         this._closeMenu(domain);
       } else {
         this._openMenu(domain, key);
diff --git a/src/scss/editor.scss b/src/scss/editor.scss
index 5ddfa307..590a6d79 100644
--- a/src/scss/editor.scss
+++ b/src/scss/editor.scss
@@ -23,10 +23,8 @@
   pointer-events: none;
 }
 .values {
-  padding: 10px;
   background: var(--secondary-background-color);
   display: grid;
-  margin-bottom: 10px;
 }
 div.upgrade {
   width: auto;
@@ -42,26 +40,39 @@ div.upgrade span {
 
 .submenu-header {
   display: flex;
-  margin-top: 10px;
+  padding: 10px;
 
   cursor: pointer;
 }
+.submenu.selected .submenu-header {
+  background-color: var(--primary-color);
+  color: var(--primary-text-color);
+}
+
 .submenu-header * {
   flex-basis: auto;
 
   // Only allow clicks on the header.
   pointer-events: none;
 }
-.submenu-header ha-icon {
-  padding-right: 10px;
-}
 .submenu-header .new-camera {
   font-style: italic;
+}
+.submenu:not(.selected) .submenu-header .new-camera {
   color: var(--secondary-text-color, 'black');
 }
-.submenu {
-  margin: 5px 5px 10px 20px;
+
+.submenu-header ha-icon {
+  padding-right: 15px;
 }
+
+.submenu {
+  border: 1px solid var(--divider-color);
+}
+.submenu.selected {
+  border: 1px solid var(--primary-color);
+}
+
 .submenu .controls {
   display: inline-block;
   margin-left: auto;