diff --git a/frontend/constants.ts b/frontend/constants.ts
index 44c97ab0d1..747697abba 100644
--- a/frontend/constants.ts
+++ b/frontend/constants.ts
@@ -1870,16 +1870,13 @@ export enum DeviceSetting {
   osAutoUpdate = `auto update`,
   farmbotOS = `Farmbot OS`,
   bootSequence = `Boot Sequence`,
-
-  // Firmware
-  firmwareSection = `Firmware`,
   firmware = `Firmware`,
   firmwarePath = `Firmware path`,
-  restartFirmware = `Restart Firmware`,
   flashFirmware = `Flash firmware`,
 
   // Power and Reset
   powerAndReset = `Power and Reset`,
+  restartFirmware = `Restart Firmware`,
   restartFarmbot = `Restart Farmbot`,
   shutdownFarmbot = `Shutdown Farmbot`,
   softReset = `Soft Reset`,
diff --git a/frontend/settings/fbos_settings/__tests__/farmbot_os_settings_test.tsx b/frontend/settings/fbos_settings/__tests__/farmbot_os_settings_test.tsx
index 16da81f110..52d7cebadc 100644
--- a/frontend/settings/fbos_settings/__tests__/farmbot_os_settings_test.tsx
+++ b/frontend/settings/fbos_settings/__tests__/farmbot_os_settings_test.tsx
@@ -2,19 +2,34 @@ jest.mock("../boot_sequence_selector", () => ({
   BootSequenceSelector: () => <div />
 }));
 
+const mockDevice = {
+  flashFirmware: jest.fn((_) => Promise.resolve()),
+};
+jest.mock("../../../device", () => ({ getDevice: () => mockDevice }));
+
 import React from "react";
 import { FarmBotSettings } from "../farmbot_os_settings";
-import { shallow } from "enzyme";
+import { mount, shallow } from "enzyme";
 import { bot } from "../../../__test_support__/fake_state/bot";
 import { FarmbotSettingsProps } from "../interfaces";
 import { fakeTimeSettings } from "../../../__test_support__/fake_time_settings";
-import { fakeDevice } from "../../../__test_support__/resource_index_builder";
+import {
+  buildResourceIndex, fakeDevice,
+} from "../../../__test_support__/resource_index_builder";
 import { settingsPanelState } from "../../../__test_support__/panel_state";
+import { clickButton } from "../../../__test_support__/helpers";
+import { fakeFbosConfig } from "../../../__test_support__/fake_state/resources";
+import { fakeState } from "../../../__test_support__/fake_state";
+import { isFunction } from "lodash";
 
 describe("<FarmBotSettings />", () => {
+  const fakeConfig = fakeFbosConfig();
+  const state = fakeState();
+  state.resources = buildResourceIndex([fakeConfig, fakeDevice()]);
+
   const fakeProps = (): FarmbotSettingsProps => ({
     device: fakeDevice(),
-    dispatch: jest.fn(),
+    dispatch: jest.fn(x => isFunction(x) && x(jest.fn(), () => state)),
     bot,
     alerts: [],
     botOnline: true,
@@ -22,6 +37,7 @@ describe("<FarmBotSettings />", () => {
       ({ value: bot.hardware.configuration[x], consistent: true }),
     timeSettings: fakeTimeSettings(),
     settingsPanelState: settingsPanelState(),
+    showAdvanced: true,
   });
 
   it("displays boot sequence selector", () => {
@@ -30,4 +46,14 @@ describe("<FarmBotSettings />", () => {
     const osSettings = shallow(<FarmBotSettings {...p} />);
     expect(osSettings.find("BootSequenceSelector").length).toEqual(1);
   });
+
+  it("flashes firmware", () => {
+    const p = fakeProps();
+    p.settingsPanelState.farmbot_settings = true;
+    p.sourceFbosConfig = () => ({ value: "arduino", consistent: true });
+    const wrapper = mount(<FarmBotSettings {...p} />);
+    expect(wrapper.text().toLowerCase()).toContain("flash");
+    clickButton(wrapper, 5, "flash");
+    expect(mockDevice.flashFirmware).toHaveBeenCalledWith("arduino");
+  });
 });
diff --git a/frontend/settings/fbos_settings/__tests__/power_and_reset_test.tsx b/frontend/settings/fbos_settings/__tests__/power_and_reset_test.tsx
index 57f98a1823..9440c32d5d 100644
--- a/frontend/settings/fbos_settings/__tests__/power_and_reset_test.tsx
+++ b/frontend/settings/fbos_settings/__tests__/power_and_reset_test.tsx
@@ -11,6 +11,7 @@ import { fakeFbosConfig } from "../../../__test_support__/fake_state/resources";
 import {
   buildResourceIndex,
 } from "../../../__test_support__/resource_index_builder";
+import { clickButton } from "../../../__test_support__/helpers";
 
 describe("<PowerAndReset/>", () => {
   const fakeConfig = fakeFbosConfig();
@@ -21,6 +22,7 @@ describe("<PowerAndReset/>", () => {
     settingsPanelState: settingsPanelState(),
     dispatch: jest.fn(x => x(jest.fn(), () => state)),
     botOnline: true,
+    showAdvanced: true,
   });
 
   it("renders in open state", () => {
@@ -41,4 +43,14 @@ describe("<PowerAndReset/>", () => {
     expect(wrapper.text().toLowerCase())
       .not.toContain("Soft Reset".toLowerCase());
   });
+
+  it("restarts firmware", () => {
+    const p = fakeProps();
+    p.settingsPanelState.power_and_reset = true;
+    const wrapper = mount(<PowerAndReset {...p} />);
+    expect(wrapper.text().toLowerCase())
+      .toContain("Restart Firmware".toLowerCase());
+    clickButton(wrapper, 0, "restart");
+    expect(mockDevice.rebootFirmware).toHaveBeenCalled();
+  });
 });
diff --git a/frontend/settings/fbos_settings/boot_sequence_selector.tsx b/frontend/settings/fbos_settings/boot_sequence_selector.tsx
index 4ff2723a6c..7c9af7284b 100644
--- a/frontend/settings/fbos_settings/boot_sequence_selector.tsx
+++ b/frontend/settings/fbos_settings/boot_sequence_selector.tsx
@@ -72,14 +72,12 @@ export class RawBootSequenceSelector
   render() {
     return <Highlight settingName={DeviceSetting.bootSequence}>
       <Row>
-        <Col xs={12}>
+        <Col xs={5}>
           <label>
             {t("BOOT SEQUENCE")}
           </label>
         </Col>
-      </Row>
-      <Row>
-        <Col xs={12} className="no-pad">
+        <Col xs={7} className="no-pad">
           <this.SelectionInput />
         </Col>
       </Row>
diff --git a/frontend/settings/fbos_settings/farmbot_os_settings.tsx b/frontend/settings/fbos_settings/farmbot_os_settings.tsx
index 2907e89bd1..55520424d9 100644
--- a/frontend/settings/fbos_settings/farmbot_os_settings.tsx
+++ b/frontend/settings/fbos_settings/farmbot_os_settings.tsx
@@ -12,6 +12,9 @@ import { DeviceSetting } from "../../constants";
 import { Collapse } from "@blueprintjs/core";
 import { OrderNumberRow } from "./order_number_row";
 import { GardenLocationRow } from "./garden_location_row";
+import { BoardType } from "../firmware/board_type";
+import { FirmwarePathRow } from "../firmware/firmware_path";
+import { validFirmwareHardware } from "../firmware/firmware_hardware_support";
 
 export enum ColWidth {
   label = 3,
@@ -23,6 +26,8 @@ export const FarmBotSettings = (props: FarmbotSettingsProps) => {
   const {
     dispatch, device, timeSettings, sourceFbosConfig, botOnline,
   } = props;
+  const { value } = props.sourceFbosConfig("firmware_hardware");
+  const firmwareHardware = validFirmwareHardware(value);
   const commonProps = { dispatch, device };
   return <Highlight className={"section"}
     settingName={DeviceSetting.farmbotSettings}>
@@ -47,6 +52,18 @@ export const FarmBotSettings = (props: FarmbotSettingsProps) => {
         botOnline={botOnline}
         timeSettings={timeSettings} />
       <BootSequenceSelector />
+      <BoardType
+        botOnline={botOnline}
+        bot={props.bot}
+        alerts={props.alerts}
+        dispatch={props.dispatch}
+        timeSettings={props.timeSettings}
+        firmwareHardware={firmwareHardware}
+        sourceFbosConfig={sourceFbosConfig} />
+      <FirmwarePathRow
+        dispatch={props.dispatch}
+        firmwarePath={"" + sourceFbosConfig("firmware_path").value}
+        showAdvanced={props.showAdvanced} />
     </Collapse>
   </Highlight>;
 };
diff --git a/frontend/settings/fbos_settings/fbos_button_row.tsx b/frontend/settings/fbos_settings/fbos_button_row.tsx
index 61dfd1c5dd..8c1d016e51 100644
--- a/frontend/settings/fbos_settings/fbos_button_row.tsx
+++ b/frontend/settings/fbos_settings/fbos_button_row.tsx
@@ -10,11 +10,15 @@ export interface FbosButtonRowProps {
   description: string;
   buttonText: string;
   color: string;
+  advanced?: boolean;
+  showAdvanced?: boolean;
   action: () => void;
 }
 
 export const FbosButtonRow = (props: FbosButtonRowProps) => {
-  return <Highlight settingName={props.label}>
+  return <Highlight settingName={props.label}
+    hidden={props.advanced && !props.showAdvanced}
+    className={props.advanced ? "advanced" : ""}>
     <Row>
       <Col xs={7}>
         <label>
diff --git a/frontend/settings/fbos_settings/interfaces.ts b/frontend/settings/fbos_settings/interfaces.ts
index 28b36df61d..39d6d69d9e 100644
--- a/frontend/settings/fbos_settings/interfaces.ts
+++ b/frontend/settings/fbos_settings/interfaces.ts
@@ -11,6 +11,7 @@ export interface FarmbotSettingsProps {
   timeSettings: TimeSettings;
   botOnline: boolean;
   settingsPanelState: SettingsPanelState;
+  showAdvanced: boolean;
 }
 
 export interface NameRowProps {
@@ -57,6 +58,7 @@ export interface PowerAndResetProps {
   settingsPanelState: SettingsPanelState;
   dispatch: Function;
   botOnline: boolean;
+  showAdvanced: boolean;
 }
 
 export interface FactoryResetRowsProps {
diff --git a/frontend/settings/fbos_settings/ota_time_selector.tsx b/frontend/settings/fbos_settings/ota_time_selector.tsx
index cd91b9e5dd..3694b30214 100644
--- a/frontend/settings/fbos_settings/ota_time_selector.tsx
+++ b/frontend/settings/fbos_settings/ota_time_selector.tsx
@@ -3,7 +3,6 @@ import moment from "moment";
 import { t } from "../../i18next_wrapper";
 import { FBSelect, Row, Col, DropDownItem, Help } from "../../ui";
 import { edit, save } from "../../api/crud";
-import { ColWidth } from "./farmbot_os_settings";
 import { Content, DeviceSetting } from "../../constants";
 import { Highlight } from "../maybe_highlight";
 import { OtaTimeSelectorProps, OtaTimeSelectorRowProps } from "./interfaces";
@@ -75,7 +74,7 @@ export function OtaTimeSelectorRow(props: OtaTimeSelectorRowProps) {
         </label>
         <Help text={Content.OS_AUTO_UPDATE} />
       </Col>
-      <Col xs={ColWidth.description}>
+      <Col xs={7}>
         <OtaTimeSelector
           sourceFbosConfig={props.sourceFbosConfig}
           timeSettings={props.timeSettings}
diff --git a/frontend/settings/fbos_settings/power_and_reset.tsx b/frontend/settings/fbos_settings/power_and_reset.tsx
index 7a1659cd32..b397c45a5c 100644
--- a/frontend/settings/fbos_settings/power_and_reset.tsx
+++ b/frontend/settings/fbos_settings/power_and_reset.tsx
@@ -5,7 +5,7 @@ import { FactoryResetRows } from "./factory_reset_row";
 import { PowerAndResetProps } from "./interfaces";
 import { FbosButtonRow } from "./fbos_button_row";
 import { Content, DeviceSetting } from "../../constants";
-import { reboot, powerOff } from "../../devices/actions";
+import { reboot, powerOff, restartFirmware } from "../../devices/actions";
 import { t } from "../../i18next_wrapper";
 import { Highlight } from "../maybe_highlight";
 
@@ -20,6 +20,15 @@ export function PowerAndReset(props: PowerAndResetProps) {
       panel={"power_and_reset"}
       dispatch={dispatch} />
     <Collapse isOpen={!!power_and_reset}>
+      <FbosButtonRow
+        botOnline={botOnline}
+        label={DeviceSetting.restartFirmware}
+        description={Content.RESTART_FIRMWARE}
+        buttonText={t("RESTART")}
+        color={"yellow"}
+        advanced={true}
+        showAdvanced={props.showAdvanced}
+        action={() => { restartFirmware(); }} />
       <FbosButtonRow
         botOnline={botOnline}
         label={DeviceSetting.restartFarmbot}
diff --git a/frontend/settings/firmware/__tests__/firmware_test.tsx b/frontend/settings/firmware/__tests__/firmware_test.tsx
deleted file mode 100644
index 32a7da6dfd..0000000000
--- a/frontend/settings/firmware/__tests__/firmware_test.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-const mockDevice = {
-  rebootFirmware: jest.fn(() => Promise.resolve()),
-  flashFirmware: jest.fn((_) => Promise.resolve()),
-};
-jest.mock("../../../device", () => ({ getDevice: () => mockDevice }));
-
-import React from "react";
-import { mount } from "enzyme";
-import { Firmware } from "../firmware";
-import { FirmwareProps } from "../interfaces";
-import { fakeState } from "../../../__test_support__/fake_state";
-import { clickButton } from "../../../__test_support__/helpers";
-import { fakeFbosConfig } from "../../../__test_support__/fake_state/resources";
-import {
-  buildResourceIndex,
-} from "../../../__test_support__/resource_index_builder";
-import {
-  fakeTimeSettings,
-} from "../../../__test_support__/fake_time_settings";
-import { bot } from "../../../__test_support__/fake_state/bot";
-import { settingsPanelState } from "../../../__test_support__/panel_state";
-
-describe("<Firmware />", () => {
-  const fakeConfig = fakeFbosConfig();
-  const state = fakeState();
-  state.resources = buildResourceIndex([fakeConfig]);
-
-  const fakeProps = (): FirmwareProps => ({
-    dispatch: jest.fn(x => x(jest.fn(), () => state)),
-    sourceFbosConfig: () => ({ value: true, consistent: true }),
-    botOnline: true,
-    bot: bot,
-    alerts: [],
-    timeSettings: fakeTimeSettings(),
-    settingsPanelState: settingsPanelState(),
-    showAdvanced: true,
-  });
-
-  it("restarts firmware", () => {
-    const p = fakeProps();
-    p.settingsPanelState.firmware = true;
-    const wrapper = mount(<Firmware {...p} />);
-    expect(wrapper.text().toLowerCase())
-      .toContain("Restart Firmware".toLowerCase());
-    clickButton(wrapper, 3, "restart");
-    expect(mockDevice.rebootFirmware).toHaveBeenCalled();
-  });
-
-  it("flashes firmware", () => {
-    const p = fakeProps();
-    p.settingsPanelState.firmware = true;
-    p.sourceFbosConfig = () => ({ value: "arduino", consistent: true });
-    const wrapper = mount(<Firmware {...p} />);
-    expect(wrapper.text().toLowerCase())
-      .toContain("Flash Firmware".toLowerCase());
-    clickButton(wrapper, 0, "flash firmware");
-    expect(mockDevice.flashFirmware).toHaveBeenCalledWith("arduino");
-  });
-});
diff --git a/frontend/settings/firmware/board_type.tsx b/frontend/settings/firmware/board_type.tsx
index 423f6fce99..591c9429fc 100644
--- a/frontend/settings/firmware/board_type.tsx
+++ b/frontend/settings/firmware/board_type.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { Row, Col, DropDownItem, FBSelect } from "../../ui";
 import { info } from "../../toast/toast";
-import { ColWidth } from "../fbos_settings/farmbot_os_settings";
 import { updateConfig } from "../../devices/actions";
 import { BoardTypeProps } from "./interfaces";
 import { t } from "../../i18next_wrapper";
@@ -50,12 +49,12 @@ export class BoardType extends React.Component<BoardTypeProps, {}> {
   render() {
     return <Highlight settingName={DeviceSetting.firmware}>
       <Row>
-        <Col xs={ColWidth.label}>
+        <Col xs={2}>
           <label>
             {t("FIRMWARE")}
           </label>
         </Col>
-        <Col xs={ColWidth.button}>
+        <Col xs={1}>
           <FirmwareHardwareStatus
             botOnline={this.props.botOnline}
             apiFirmwareValue={this.props.firmwareHardware}
@@ -64,14 +63,13 @@ export class BoardType extends React.Component<BoardTypeProps, {}> {
             dispatch={this.props.dispatch}
             timeSettings={this.props.timeSettings} />
         </Col>
-        <Col xs={ColWidth.description}>
+        <Col xs={2}>
           <FlashFirmwareBtn
+            short={true}
             apiFirmwareValue={this.props.firmwareHardware}
             botOnline={this.props.botOnline} />
         </Col>
-      </Row>
-      <Row>
-        <Col xs={12} className="no-pad">
+        <Col xs={7} className="no-pad">
           <this.FirmwareSelection />
         </Col>
       </Row>
diff --git a/frontend/settings/firmware/firmware.tsx b/frontend/settings/firmware/firmware.tsx
deleted file mode 100644
index deaed45fa2..0000000000
--- a/frontend/settings/firmware/firmware.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from "react";
-import { Header } from "../hardware_settings/header";
-import { Collapse } from "@blueprintjs/core";
-import { FirmwareProps } from "./interfaces";
-import { FbosButtonRow } from "../fbos_settings/fbos_button_row";
-import { Content, DeviceSetting } from "../../constants";
-import { restartFirmware } from "../../devices/actions";
-import { t } from "../../i18next_wrapper";
-import { Highlight } from "../maybe_highlight";
-import { BoardType } from "./board_type";
-import { validFirmwareHardware } from "./firmware_hardware_support";
-import { FirmwarePathRow } from "./firmware_path";
-
-export function Firmware(props: FirmwareProps) {
-  const { dispatch, sourceFbosConfig, botOnline } = props;
-  const { firmware } = props.settingsPanelState;
-
-  const { value } = props.sourceFbosConfig("firmware_hardware");
-  const firmwareHardware = validFirmwareHardware(value);
-  return <Highlight className={"section"}
-    settingName={DeviceSetting.firmwareSection}>
-    <Header
-      title={DeviceSetting.firmwareSection}
-      panel={"firmware"}
-      dispatch={dispatch}
-      expanded={firmware} />
-    <Collapse isOpen={!!firmware}>
-      <BoardType
-        botOnline={botOnline}
-        bot={props.bot}
-        alerts={props.alerts}
-        dispatch={props.dispatch}
-        timeSettings={props.timeSettings}
-        firmwareHardware={firmwareHardware}
-        sourceFbosConfig={sourceFbosConfig} />
-      <FirmwarePathRow
-        dispatch={props.dispatch}
-        firmwarePath={"" + sourceFbosConfig("firmware_path").value}
-        showAdvanced={props.showAdvanced} />
-      <FbosButtonRow
-        botOnline={botOnline}
-        label={DeviceSetting.restartFirmware}
-        description={Content.RESTART_FIRMWARE}
-        buttonText={t("RESTART")}
-        color={"yellow"}
-        action={() => { restartFirmware(); }} />
-    </Collapse>
-  </Highlight>;
-}
diff --git a/frontend/settings/firmware/firmware_hardware_status.tsx b/frontend/settings/firmware/firmware_hardware_status.tsx
index c656ab0824..3b0b26f6ff 100644
--- a/frontend/settings/firmware/firmware_hardware_status.tsx
+++ b/frontend/settings/firmware/firmware_hardware_status.tsx
@@ -46,6 +46,7 @@ export interface FirmwareHardwareStatusDetailsProps {
 export interface FlashFirmwareBtnProps {
   apiFirmwareValue: string | undefined;
   botOnline: boolean;
+  short?: boolean;
 }
 
 export const FlashFirmwareBtn = (props: FlashFirmwareBtnProps) => {
@@ -55,7 +56,7 @@ export const FlashFirmwareBtn = (props: FlashFirmwareBtnProps) => {
     title={t("flash firmware")}
     onClick={() => isFwHardwareValue(apiFirmwareValue) &&
       flashFirmware(apiFirmwareValue)}>
-    {t("flash firmware")}
+    {props.short ? t("flash") : t("flash firmware")}
   </button>;
 };
 
diff --git a/frontend/settings/firmware/firmware_path.tsx b/frontend/settings/firmware/firmware_path.tsx
index c496ac4932..cb6feca676 100644
--- a/frontend/settings/firmware/firmware_path.tsx
+++ b/frontend/settings/firmware/firmware_path.tsx
@@ -66,17 +66,15 @@ export const FirmwarePathRow = (props: FirmwarePathRowProps) =>
     hidden={!props.showAdvanced}
     className={"advanced"}>
     <Row>
-      <Col xs={6}>
+      <Col xs={4}>
         <label>
           {t("Firmware path")}
         </label>
       </Col>
-      <Col xs={6}>
+      <Col xs={3}>
         <code>{props.firmwarePath || t("not set")}</code>
       </Col>
-    </Row>
-    <Row>
-      <Col xs={12} className={"no-pad"}>
+      <Col xs={5} className={"no-pad"}>
         <ChangeFirmwarePath
           dispatch={props.dispatch}
           firmwarePath={props.firmwarePath} />
diff --git a/frontend/settings/hardware_settings/__tests__/parameter_management_test.tsx b/frontend/settings/hardware_settings/__tests__/parameter_management_test.tsx
index c17982872f..acadf94188 100644
--- a/frontend/settings/hardware_settings/__tests__/parameter_management_test.tsx
+++ b/frontend/settings/hardware_settings/__tests__/parameter_management_test.tsx
@@ -75,6 +75,7 @@ describe("<ParameterImport />", () => {
   const fakeProps = (): ParameterImportProps => ({
     dispatch: jest.fn(),
     arduinoBusy: false,
+    showAdvanced: true,
   });
 
   it("updates", () => {
diff --git a/frontend/settings/hardware_settings/parameter_management.tsx b/frontend/settings/hardware_settings/parameter_management.tsx
index bb47099885..3cf32dce89 100644
--- a/frontend/settings/hardware_settings/parameter_management.tsx
+++ b/frontend/settings/hardware_settings/parameter_management.tsx
@@ -67,7 +67,9 @@ export function ParameterManagement(props: ParameterManagementProps) {
           </Col>
         </Row>
       </Highlight>
-      <Highlight settingName={DeviceSetting.exportParameters}>
+      <Highlight settingName={DeviceSetting.exportParameters}
+        hidden={!showAdvanced}
+        className={"advanced"}>
         <Row>
           <Col xs={8}>
             <label style={{ lineHeight: "1.5rem" }}>
@@ -82,7 +84,8 @@ export function ParameterManagement(props: ParameterManagementProps) {
           </Col>
         </Row>
       </Highlight>
-      <ParameterImport dispatch={dispatch} arduinoBusy={arduinoBusy} />
+      <ParameterImport dispatch={dispatch} arduinoBusy={arduinoBusy}
+        showAdvanced={showAdvanced} />
       <Highlight settingName={DeviceSetting.highlightModifiedSettings}
         hidden={!(showAdvanced
           || modifiedFromDefault(BooleanSetting.highlight_modified_settings))}
@@ -94,7 +97,9 @@ export function ParameterManagement(props: ParameterManagementProps) {
       <Highlight settingName={DeviceSetting.showAdvancedSettings}>
         <ShowAdvancedToggle dispatch={dispatch} getConfigValue={getConfigValue} />
       </Highlight>
-      <Highlight settingName={DeviceSetting.resetHardwareParams}>
+      <Highlight settingName={DeviceSetting.resetHardwareParams}
+        hidden={!showAdvanced}
+        className={"advanced"}>
         <Row>
           <Col xs={8}>
             <label style={{ lineHeight: "1.5rem" }}>
@@ -120,6 +125,7 @@ export function ParameterManagement(props: ParameterManagementProps) {
 export interface ParameterImportProps {
   dispatch: Function;
   arduinoBusy: boolean;
+  showAdvanced: boolean;
 }
 
 interface ParameterImportState {
@@ -130,7 +136,9 @@ export class ParameterImport
   extends React.Component<ParameterImportProps, ParameterImportState> {
   state: ParameterImportState = { input: "" };
   render() {
-    return <Highlight settingName={DeviceSetting.importParameters}>
+    return <Highlight settingName={DeviceSetting.importParameters}
+      hidden={!this.props.showAdvanced}
+      className={"advanced"}>
       <Row>
         <Col xs={12}>
           <label>
diff --git a/frontend/settings/index.tsx b/frontend/settings/index.tsx
index ffefc4d55a..5cceaadd08 100644
--- a/frontend/settings/index.tsx
+++ b/frontend/settings/index.tsx
@@ -7,7 +7,6 @@ import { t } from "../i18next_wrapper";
 import { DesignerNavTabs, Panel } from "../farm_designer/panel_header";
 import { MCUFactoryReset } from "../devices/actions";
 import { FarmBotSettings } from "./fbos_settings/farmbot_os_settings";
-import { Firmware } from "./firmware/firmware";
 import { PowerAndReset } from "./fbos_settings/power_and_reset";
 import { PinBindings } from "./pin_bindings/pin_bindings";
 import { validFirmwareHardware } from "./firmware/firmware_hardware_support";
@@ -98,13 +97,8 @@ export class RawDesignerSettings
           sourceFbosConfig={sourceFbosConfig}
           botOnline={botOnline}
           timeSettings={this.props.timeSettings}
+          showAdvanced={showAdvanced}
           device={this.props.deviceAccount} />
-        <Firmware {...commonProps}
-          bot={this.props.bot}
-          alerts={this.props.alerts}
-          sourceFbosConfig={sourceFbosConfig}
-          botOnline={botOnline}
-          timeSettings={this.props.timeSettings} />
         <PowerAndReset {...commonProps}
           botOnline={botOnline} />
         {botOnline && showAdvanced && <ChangeOwnershipForm />}
diff --git a/frontend/settings/maybe_highlight.tsx b/frontend/settings/maybe_highlight.tsx
index 4a7e2827da..7cf0fbfa4e 100644
--- a/frontend/settings/maybe_highlight.tsx
+++ b/frontend/settings/maybe_highlight.tsx
@@ -21,16 +21,13 @@ const FARMBOT_PANEL = [
   DeviceSetting.osAutoUpdate,
   DeviceSetting.farmbotOS,
   DeviceSetting.bootSequence,
-];
-const FIRMWARE_PANEL = [
-  DeviceSetting.firmwareSection,
   DeviceSetting.firmware,
   DeviceSetting.flashFirmware,
   DeviceSetting.firmwarePath,
-  DeviceSetting.restartFirmware,
 ];
 const POWER_AND_RESET_PANEL = [
   DeviceSetting.powerAndReset,
+  DeviceSetting.restartFirmware,
   DeviceSetting.restartFarmbot,
   DeviceSetting.shutdownFarmbot,
   DeviceSetting.softReset,
@@ -213,7 +210,6 @@ const APP_SETTINGS = [
 /** Look up parent panels for settings. */
 const SETTING_PANEL_LOOKUP = {} as Record<DeviceSetting, keyof SettingsPanelState>;
 FARMBOT_PANEL.map(s => SETTING_PANEL_LOOKUP[s] = "farmbot_settings");
-FIRMWARE_PANEL.map(s => SETTING_PANEL_LOOKUP[s] = "firmware");
 POWER_AND_RESET_PANEL.map(s => SETTING_PANEL_LOOKUP[s] = "power_and_reset");
 AXES_PANEL.map(s => SETTING_PANEL_LOOKUP[s] = "axis_settings");
 MOTORS_PANEL.map(s => SETTING_PANEL_LOOKUP[s] = "motors");
@@ -235,7 +231,6 @@ LOG_SETTINGS.map(s => SETTING_PANEL_LOOKUP[s] = "other_settings");
 
 const CONTENT_LOOKUP = {} as Record<DeviceSetting, DeviceSetting[]>;
 CONTENT_LOOKUP[DeviceSetting.farmbotSettings] = FARMBOT_PANEL;
-CONTENT_LOOKUP[DeviceSetting.firmwareSection] = FIRMWARE_PANEL;
 CONTENT_LOOKUP[DeviceSetting.powerAndReset] = POWER_AND_RESET_PANEL;
 CONTENT_LOOKUP[DeviceSetting.axisSettings] = AXES_PANEL;
 CONTENT_LOOKUP[DeviceSetting.motors] = MOTORS_PANEL;