diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp
index b387952e9c..c30b490318 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp
@@ -27,9 +27,10 @@ OptionsPanelDescriptor::OptionsPanelDescriptor(
         std::move(category), std::move(display_name),
         std::move(doc_link),
         std::move(description),
-        deprecation
+        deprecation,
+        restore_defaults_button,
+        {}
     )
-    , m_restore_defaults_button(restore_defaults_button)
 {}
 std::unique_ptr<PanelSession> OptionsPanelDescriptor::make_panel() const{
     return std::make_unique<OptionsPanelSession>(*this);
diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.h b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.h
index 68daa5df18..115918f1ca 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.h
@@ -35,14 +35,8 @@ class OptionsPanelDescriptor : public PanelDescriptor{
         bool restore_defaults_button = true
     );
 
-    bool restore_defaults_button() const{ return m_restore_defaults_button; }
-
     virtual std::unique_ptr<PanelSession> make_panel() const override;
     virtual std::unique_ptr<OptionsPanelInstance> make_instance() const = 0;
-
-
-private:
-    const bool m_restore_defaults_button;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.h b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.h
index bf683037ec..0b9550d6d2 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.h
@@ -26,7 +26,7 @@ class OptionsPanelSession final : public UiState<OptionsPanelSession, PanelSessi
 
 
 public:
-    void restore_defaults();
+    virtual void restore_defaults() override;
     virtual JsonValue to_json() const override;
     virtual void load_json(const JsonValue& json) override;
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp
index 71c3698a43..ce758536c2 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp
@@ -17,6 +17,7 @@ PanelDescriptor::PanelDescriptor(
     std::string doc_link,
     std::string description,
     PanelDeprecation deprecation,
+    bool restore_defaults_button,
     std::vector<std::string> required_resources
 )
     : m_color(color)
@@ -26,6 +27,7 @@ PanelDescriptor::PanelDescriptor(
     , m_doc_link(std::move(doc_link))
     , m_description(std::move(description))
     , m_deprecation(deprecation)
+    , m_restore_defaults_button(restore_defaults_button)
     , m_required_resources(std::move(required_resources))
 {}
 std::unique_ptr<PanelSession> PanelDescriptor::make_panel() const{
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h
index 6e7603bf51..47a55f66d2 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h
@@ -34,8 +34,9 @@ class PanelDescriptor{
         std::string category, std::string display_name,
         std::string doc_link,
         std::string description,
-        PanelDeprecation deprecation = PanelDeprecation::NOT_DEPRECATED,
-        std::vector<std::string> required_resources = {}
+        PanelDeprecation deprecation,
+        bool restore_defaults_button,
+        std::vector<std::string> required_resources
     );
     virtual ~PanelDescriptor() = default;
 
@@ -46,6 +47,7 @@ class PanelDescriptor{
     const std::string& doc_link() const{ return m_doc_link; }
     const std::string& description() const{ return m_description; }
     PanelDeprecation deprecation() const{ return m_deprecation; }
+    bool restore_defaults_button() const{ return m_restore_defaults_button; }
     const std::vector<std::string>& required_resources() const{ return m_required_resources; }
 
     virtual std::unique_ptr<PanelSession> make_panel() const = 0;
@@ -58,6 +60,7 @@ class PanelDescriptor{
     const std::string m_doc_link;
     const std::string m_description;
     const PanelDeprecation m_deprecation;
+    const bool m_restore_defaults_button;
     const std::vector<std::string> m_required_resources;
 };
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelSession.h b/SerialPrograms/Source/CommonFramework/Panels/PanelSession.h
index 2a56d30a71..9ece35b32c 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelSession.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelSession.h
@@ -32,7 +32,8 @@ class PanelSession : public UiState<PanelSession>{
 
 
 public:
-    //  Serialization
+    virtual void restore_defaults(){}
+
     void load_json();
     virtual JsonValue to_json() const;
     virtual void load_json(const JsonValue& json);
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp
index 58a4ff623d..5d59db8893 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp
@@ -4,11 +4,6 @@
  *
  */
 
-#include <QPushButton>
-#include <QScrollArea>
-#include <QMessageBox>
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "Common/Qt/Options/ConfigWidget.h"
 #include "CommonFramework/Panels/UI/PanelElements.h"
 #include "OptionsPanelWidget.h"
 
@@ -24,66 +19,14 @@ OptionsPanelWidget::OptionsPanelWidget(
     OptionsPanelSession& session
 )
     : QWidget(&parent)
-    , m_session(session)
 {
-    m_layout = new QVBoxLayout(this);
-    m_layout->setContentsMargins(0, 0, 0, 0);
-
-    const OptionsPanelDescriptor& descriptor = session.descriptor();
-
-    CollapsibleGroupBox* header = make_panel_header(
+    populate_panel_widget(
         *this,
-        descriptor.display_name(),
-        descriptor.doc_link(),
-        descriptor.description()
+        session.descriptor(),
+        nullptr,
+        session.options(),
+        make_actions_bar(*this, session)
     );
-    m_layout->addWidget(header);
-
-    {
-        QScrollArea* scroll_outer = new QScrollArea(this);
-        m_layout->addWidget(scroll_outer);
-        scroll_outer->setWidgetResizable(true);
-
-        QWidget* scroll_inner = new QWidget(scroll_outer);
-        scroll_outer->setWidget(scroll_inner);
-        QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-        scroll_layout->setAlignment(Qt::AlignTop);
-
-        m_options = ConfigWidget::make_from_option(session.options(), this);
-        scroll_layout->addWidget(&m_options->widget());
-
-        scroll_layout->addStretch(1);
-    }
-
-    if (session.descriptor().restore_defaults_button()){
-        QGroupBox* actions_widget = new QGroupBox("Actions", &parent);
-
-        QHBoxLayout* action_layout = new QHBoxLayout(actions_widget);
-//        action_layout->setContentsMargins(0, 0, 0, 0);
-        QPushButton* default_button = new QPushButton("Restore Defaults", actions_widget);
-        {
-            action_layout->addWidget(default_button, 1);
-            QFont font = default_button->font();
-            font.setPointSize(16);
-            default_button->setFont(font);
-        }
-
-        connect(
-            default_button, &QPushButton::clicked,
-            this, [this](bool){
-                QMessageBox::StandardButton button = QMessageBox::question(
-                    nullptr,
-                    "Restore Defaults",
-                    "Are you sure you wish to restore settings back to defaults? This will wipe the current settings.",
-                    QMessageBox::Ok | QMessageBox::Cancel
-                );
-                if (button == QMessageBox::Ok){
-                    m_session.restore_defaults();
-                }
-            }
-        );
-        m_layout->addWidget(actions_widget);
-    }
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.h b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.h
index a83ca2f6cc..375a83b05a 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.h
@@ -30,11 +30,6 @@ class OptionsPanelWidget final : public QWidget, public UiComponentQtWidget{
     virtual QWidget& widget() override{
         return *this;
     }
-
-private:
-    OptionsPanelSession& m_session;
-    QVBoxLayout* m_layout;
-    ConfigWidget* m_options;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp
index 64b16dbf45..c6003db797 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp
@@ -6,10 +6,13 @@
 
 #include <QMessageBox>
 #include <QVBoxLayout>
+#include <QScrollArea>
 #include <QLabel>
 #include <QPushButton>
-#include "CommonFramework/Globals.h"
 #include "Common/Cpp/ColoredText.h"
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/Panels/PanelSession.h"
 #include "PanelElements.h"
 
 namespace PokemonAutomation{
@@ -213,6 +216,89 @@ void RunnablePanelActionBar::set_state(ProgramState state){
 
 
 
+QWidget* make_actions_bar(
+    QWidget& panel,
+    PanelSession& session
+){
+    if (!session.descriptor().restore_defaults_button()){
+        return nullptr;
+    }
+
+    QWidget* actions_widget = new QGroupBox("Actions", &panel);
+
+    QHBoxLayout* action_layout = new QHBoxLayout(actions_widget);
+//    action_layout->setContentsMargins(0, 0, 0, 0);
+    QPushButton* default_button = new QPushButton("Restore Defaults", actions_widget);
+    {
+        action_layout->addWidget(default_button, 1);
+        QFont font = default_button->font();
+        font.setPointSize(16);
+        default_button->setFont(font);
+    }
+
+    panel.connect(
+        default_button, &QPushButton::clicked,
+        &panel, [&session](bool){
+            QMessageBox::StandardButton button = QMessageBox::question(
+                nullptr,
+                "Restore Defaults",
+                "Are you sure you wish to restore settings back to defaults? This will wipe the current settings.",
+                QMessageBox::Ok | QMessageBox::Cancel
+            );
+            if (button == QMessageBox::Ok){
+                session.restore_defaults();
+            }
+        }
+    );
+
+    return actions_widget;
+}
+
+
+
+void populate_panel_widget(
+    QWidget& panel,
+    const PanelDescriptor& descriptor,
+    QWidget* console_system,
+    ConfigOption& options,
+    QWidget* footer
+){
+    QVBoxLayout* layout = new QVBoxLayout(&panel);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    CollapsibleGroupBox* header = make_panel_header(
+        panel,
+        descriptor.display_name(),
+        descriptor.doc_link(),
+        descriptor.description()
+    );
+    layout->addWidget(header);
+
+    QScrollArea* scroll_outer = new QScrollArea(&panel);
+    layout->addWidget(scroll_outer);
+    scroll_outer->setWidgetResizable(true);
+
+    QWidget* scroll_inner = new QWidget(scroll_outer);
+    scroll_outer->setWidget(scroll_inner);
+    QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
+    scroll_layout->setAlignment(Qt::AlignTop);
+
+    if (console_system){
+        scroll_layout->addWidget(console_system);
+    }
+
+    ConfigWidget* options_widget = ConfigWidget::make_from_option(options, &panel);
+    scroll_layout->addWidget(&options_widget->widget());
+
+    scroll_layout->addStretch(1);
+
+    if (footer){
+        layout->addWidget(footer);
+    }
+}
+
+
+
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h
index f02b524198..58d002fe06 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h
@@ -19,6 +19,7 @@ class QPushButton;
 namespace PokemonAutomation{
 
 
+class ConfigOption;
 
 
 CollapsibleGroupBox* make_panel_header(
@@ -69,6 +70,19 @@ public slots:
 
 
 
+QWidget* make_actions_bar(
+    QWidget& panel,
+    PanelSession& session
+);
+
+void populate_panel_widget(
+    QWidget& panel,
+    const PanelDescriptor& descriptor,
+    QWidget* console_system,
+    ConfigOption& options,
+    QWidget* footer
+);
+
 
 
 
diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp
index 5ba9690210..b19aac302c 100644
--- a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp
+++ b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp
@@ -24,7 +24,9 @@ ComputerProgramDescriptor::ComputerProgramDescriptor(
         std::move(category), std::move(display_name),
         std::move(doc_link),
         std::move(description),
-        deprecation
+        deprecation,
+        true,
+        {}
     )
 {}
 std::unique_ptr<PanelSession> ComputerProgramDescriptor::make_panel() const{
diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h
index 3d9a8daf5f..c567361276 100644
--- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h
+++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h
@@ -42,7 +42,7 @@ class ComputerProgramSession final
 
 
 public:
-    void restore_defaults();
+    virtual void restore_defaults() override;
     virtual JsonValue to_json() const override;
     virtual void load_json(const JsonValue& json) override;
 
diff --git a/SerialPrograms/Source/GameConsole/ConsolePanel.cpp b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp
index c369918707..d79d57d864 100644
--- a/SerialPrograms/Source/GameConsole/ConsolePanel.cpp
+++ b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp
@@ -29,9 +29,10 @@ ConsolePanelDescriptor::ConsolePanelDescriptor(
         std::move(category), std::move(display_name),
         std::move(doc_link),
         std::move(description),
-        deprecation
+        deprecation,
+        restore_defaults_button,
+        {}
     )
-    , m_restore_defaults_button(restore_defaults_button)
     , m_num_controllers(num_controllers)
 {}
 std::unique_ptr<PanelSession> ConsolePanelDescriptor::make_panel() const{
diff --git a/SerialPrograms/Source/GameConsole/ConsolePanel.h b/SerialPrograms/Source/GameConsole/ConsolePanel.h
index b2d222f27f..e52bfeb6db 100644
--- a/SerialPrograms/Source/GameConsole/ConsolePanel.h
+++ b/SerialPrograms/Source/GameConsole/ConsolePanel.h
@@ -37,7 +37,6 @@ class ConsolePanelDescriptor : public PanelDescriptor{
         size_t num_controllers = 1
     );
 
-    bool restore_defaults_button() const{ return m_restore_defaults_button; }
     size_t num_controllers() const{ return m_num_controllers; }
 
     virtual std::unique_ptr<PanelSession> make_panel() const override;
@@ -45,7 +44,6 @@ class ConsolePanelDescriptor : public PanelDescriptor{
 
 
 private:
-    const bool m_restore_defaults_button;
     const size_t m_num_controllers;
 };
 
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.h b/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.h
index a03b6dcaa6..7063d69f19 100644
--- a/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.h
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.h
@@ -32,9 +32,7 @@ class ConsolePanelSession final : public UiState<ConsolePanelSession, PanelSessi
 
 
 public:
-    //  Serialization
-
-    void restore_defaults();
+    virtual void restore_defaults() override;
     virtual JsonValue to_json() const override;
     virtual void load_json(const JsonValue& json) override;
 
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.h b/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.h
index c0824b3e5d..22e1c32fa3 100644
--- a/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.h
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.h
@@ -34,7 +34,7 @@ class MultiConsolePanelSession final : public UiState<MultiConsolePanelSession,
 public:
     //  Serialization
 
-    void restore_defaults();
+    virtual void restore_defaults() override;
     virtual JsonValue to_json() const override;
     virtual void load_json(const JsonValue& json) override;
 
diff --git a/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp
index 20f2816a74..57947c5fd1 100644
--- a/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp
+++ b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp
@@ -70,9 +70,10 @@ MultiConsolePanelDescriptor::MultiConsolePanelDescriptor(
         std::move(category), std::move(display_name),
         std::move(doc_link),
         std::move(description),
-        deprecation
+        deprecation,
+        restore_defaults_button,
+        {}
     )
-    , m_restore_defaults_button(restore_defaults_button)
     , m_min_consoles(min_consoles)
     , m_max_consoles(max_consoles)
     , m_default_consoles(default_consoles)
diff --git a/SerialPrograms/Source/GameConsole/MultiConsolePanel.h b/SerialPrograms/Source/GameConsole/MultiConsolePanel.h
index f5d18758e0..5a5eedbce9 100644
--- a/SerialPrograms/Source/GameConsole/MultiConsolePanel.h
+++ b/SerialPrograms/Source/GameConsole/MultiConsolePanel.h
@@ -67,7 +67,6 @@ class MultiConsolePanelDescriptor : public PanelDescriptor{
         SessionFactory session_factory
     );
 
-    bool restore_defaults_button() const{ return m_restore_defaults_button; }
     size_t min_consoles() const{ return m_min_consoles; }
     size_t max_consoles() const{ return m_max_consoles; }
     size_t default_consoles() const{ return m_default_consoles; }
@@ -82,7 +81,6 @@ class MultiConsolePanelDescriptor : public PanelDescriptor{
 
 
 private:
-    const bool m_restore_defaults_button;
     size_t m_min_consoles;
     size_t m_max_consoles;
     size_t m_default_consoles;
diff --git a/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.cpp b/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.cpp
index 3fc4d222c1..c2b8a1098b 100644
--- a/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.cpp
+++ b/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.cpp
@@ -4,12 +4,7 @@
  *
  */
 
-#include <QVBoxLayout>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QScrollArea>
 #include "Common/Qt/ShutdownWithEvents.h"
-#include "Common/Qt/Options/ConfigWidget.h"
 #include "CommonFramework/Panels/UI/PanelElements.h"
 #include "ConsolePanelWidget.h"
 
@@ -35,68 +30,16 @@ ConsolePanelWidget::ConsolePanelWidget(
     : QWidget(&parent)
     , m_session(session)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
+    UiWrapper wrapper = m_session.system().make_ui_component(this);
+    QWidget* system = dynamic_cast<QWidget*>(wrapper.release());
 
-    const ConsolePanelDescriptor& descriptor = session.descriptor();
-
-    CollapsibleGroupBox* header = make_panel_header(
+    populate_panel_widget(
         *this,
-        descriptor.display_name(),
-        descriptor.doc_link(),
-        descriptor.description()
+        session.descriptor(),
+        system,
+        session.options(),
+        make_actions_bar(*this, session)
     );
-    layout->addWidget(header);
-
-    {
-        QScrollArea* scroll_outer = new QScrollArea(this);
-        layout->addWidget(scroll_outer);
-        scroll_outer->setWidgetResizable(true);
-
-        QWidget* scroll_inner = new QWidget(scroll_outer);
-        scroll_outer->setWidget(scroll_inner);
-        QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-        scroll_layout->setAlignment(Qt::AlignTop);
-
-        UiWrapper wrapper = m_session.system().make_ui_component(this);
-        QWidget* system = dynamic_cast<QWidget*>(wrapper.release());
-        scroll_layout->addWidget(system);
-
-        ConfigWidget* options = ConfigWidget::make_from_option(session.options(), this);
-        scroll_layout->addWidget(&options->widget());
-
-        scroll_layout->addStretch(1);
-    }
-
-    if (session.descriptor().restore_defaults_button()){
-        QGroupBox* actions_widget = new QGroupBox("Actions", &parent);
-
-        QHBoxLayout* action_layout = new QHBoxLayout(actions_widget);
-//        action_layout->setContentsMargins(0, 0, 0, 0);
-        QPushButton* default_button = new QPushButton("Restore Defaults", actions_widget);
-        {
-            action_layout->addWidget(default_button, 1);
-            QFont font = default_button->font();
-            font.setPointSize(16);
-            default_button->setFont(font);
-        }
-
-        connect(
-            default_button, &QPushButton::clicked,
-            this, [this](bool){
-                QMessageBox::StandardButton button = QMessageBox::question(
-                    nullptr,
-                    "Restore Defaults",
-                    "Are you sure you wish to restore settings back to defaults? This will wipe the current settings.",
-                    QMessageBox::Ok | QMessageBox::Cancel
-                );
-                if (button == QMessageBox::Ok){
-                    m_session.restore_defaults();
-                }
-            }
-        );
-        layout->addWidget(actions_widget);
-    }
 }
 
 
diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.cpp b/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.cpp
index 1ad4adfd10..69833f8593 100644
--- a/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.cpp
+++ b/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.cpp
@@ -4,12 +4,7 @@
  *
  */
 
-#include <QVBoxLayout>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QScrollArea>
 #include "Common/Qt/ShutdownWithEvents.h"
-#include "Common/Qt/Options/ConfigWidget.h"
 #include "CommonFramework/Panels/UI/PanelElements.h"
 #include "MultiConsolePanelWidget.h"
 
@@ -35,68 +30,16 @@ MultiConsolePanelWidget::MultiConsolePanelWidget(
     : QWidget(&parent)
     , m_session(session)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
+    UiWrapper wrapper = m_session.system().make_ui_component(this);
+    QWidget* system = dynamic_cast<QWidget*>(wrapper.release());
 
-    const MultiConsolePanelDescriptor& descriptor = session.descriptor();
-
-    CollapsibleGroupBox* header = make_panel_header(
+    populate_panel_widget(
         *this,
-        descriptor.display_name(),
-        descriptor.doc_link(),
-        descriptor.description()
+        session.descriptor(),
+        system,
+        session.options(),
+        make_actions_bar(*this, session)
     );
-    layout->addWidget(header);
-
-    {
-        QScrollArea* scroll_outer = new QScrollArea(this);
-        layout->addWidget(scroll_outer);
-        scroll_outer->setWidgetResizable(true);
-
-        QWidget* scroll_inner = new QWidget(scroll_outer);
-        scroll_outer->setWidget(scroll_inner);
-        QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-        scroll_layout->setAlignment(Qt::AlignTop);
-
-        UiWrapper wrapper = m_session.system().make_ui_component(this);
-        QWidget* system = dynamic_cast<QWidget*>(wrapper.release());
-        scroll_layout->addWidget(system);
-
-        ConfigWidget* options = ConfigWidget::make_from_option(session.options(), this);
-        scroll_layout->addWidget(&options->widget());
-
-        scroll_layout->addStretch(1);
-    }
-
-    if (session.descriptor().restore_defaults_button()){
-        QGroupBox* actions_widget = new QGroupBox("Actions", &parent);
-
-        QHBoxLayout* action_layout = new QHBoxLayout(actions_widget);
-//        action_layout->setContentsMargins(0, 0, 0, 0);
-        QPushButton* default_button = new QPushButton("Restore Defaults", actions_widget);
-        {
-            action_layout->addWidget(default_button, 1);
-            QFont font = default_button->font();
-            font.setPointSize(16);
-            default_button->setFont(font);
-        }
-
-        connect(
-            default_button, &QPushButton::clicked,
-            this, [this](bool){
-                QMessageBox::StandardButton button = QMessageBox::question(
-                    nullptr,
-                    "Restore Defaults",
-                    "Are you sure you wish to restore settings back to defaults? This will wipe the current settings.",
-                    QMessageBox::Ok | QMessageBox::Cancel
-                );
-                if (button == QMessageBox::Ok){
-                    m_session.restore_defaults();
-                }
-            }
-        );
-        layout->addWidget(actions_widget);
-    }
 }
 
 
diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp
index 9e8ad03a3d..64a4d8a458 100644
--- a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp
+++ b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp
@@ -16,7 +16,6 @@
 #include "Common/Cpp/Json/JsonObject.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "CommonFramework/GlobalAutoPaths.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Options/Environment/PerformanceOptions.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "ML/DataLabeling/ML_SegmentAnythingModel.h"
@@ -39,7 +38,10 @@ LabelImages_Descriptor::LabelImages_Descriptor()
         "ML:LabelImages",
         "ML", "Label Images",
         "Programs/ML/LabelImages.html",
-        "Label " + Pokemon::STRING_POKEMON + " on images" 
+        "Label " + Pokemon::STRING_POKEMON + " on images",
+        PanelDeprecation::NOT_DEPRECATED,
+        true,
+        {}
     )
 {}
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
index af847b89ce..058bd39c24 100644
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
+++ b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
@@ -62,7 +62,7 @@ class MultiSwitchProgramSession final
 
 
 public:
-    void restore_defaults();
+    virtual void restore_defaults() override;
     virtual std::string check_validity() const override;
     virtual JsonValue to_json() const override;
     virtual void load_json(const JsonValue& json) override;
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
index e327f18981..5e6f7ff8bf 100644
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
+++ b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
@@ -43,7 +43,7 @@ class SingleSwitchProgramSession final
 
 public:
     virtual std::string check_validity() const override;
-    void restore_defaults();
+    virtual void restore_defaults() override;
     virtual JsonValue to_json() const override;
     virtual void load_json(const JsonValue& json) override;
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
index a18206a750..fcd8052ae6 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
@@ -125,6 +125,7 @@ MultiSwitchProgramDescriptor::MultiSwitchProgramDescriptor(
         std::move(doc_link),
         std::move(description),
         deprecation,
+        true,
         std::move(required_resources)
     )
     , m_color_class(color_class)
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
index 9c8b0eb61f..53a33f47c3 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
@@ -43,6 +43,7 @@ SingleSwitchProgramDescriptor::SingleSwitchProgramDescriptor(
         std::move(doc_link),
         std::move(description),
         deprecation,
+        true,
         std::move(required_resources)
     )
     , m_color_class(color_class)
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
index 7174bb99d9..a52ebab6b2 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
+++ b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
@@ -62,9 +62,9 @@ void BlackOutDetector::make_overlays(VideoOverlaySet& items) const{
 bool BlackOutDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
 
     auto save_image = [&](){
-        static int count = 0;
-        frame.save("BlackOut-" + std::to_string(count) + ".png");
-        count++;
+//        static int count = 0;
+//        frame.save("BlackOut-" + std::to_string(count) + ".png");
+//        count++;
     };
 
     // check whether it is the black out screen