diff --git a/src/bobby_webserver.h b/src/bobby_webserver.h
index 6172407..e07e473 100644
--- a/src/bobby_webserver.h
+++ b/src/bobby_webserver.h
@@ -1,8 +1,13 @@
 #pragma once
 
+// 3rdparty lib includes
 #include <ESPAsyncWebServer.h>
 
+// local includes
 #include "screens.h"
+#include "textinterface.h"
+#include "menudisplay.h"
+#include "changevaluedisplay.h"
 
 namespace {
 #ifdef FEATURE_WEBSERVER
@@ -64,7 +69,7 @@ void initWebserver()
                                     "<a href=\"/back\">Back</a>");
                 }
 
-                if (auto constCurrentDisplay = static_cast<const Display *>(currentDisplay))
+                if (auto constCurrentDisplay = static_cast<const Display *>(currentDisplay.get()))
                 {
                     if (const auto *textInterface = constCurrentDisplay->asTextInterface())
                     {
diff --git a/src/containermenudefinition.h b/src/containermenudefinition.h
new file mode 100644
index 0000000..37c6e55
--- /dev/null
+++ b/src/containermenudefinition.h
@@ -0,0 +1,63 @@
+#pragma once
+
+// system includes
+#include <vector>
+#include <memory>
+
+// local includes
+#include "menudefinitioninterface.h"
+
+namespace {
+class ContainerMenuDefinition : public virtual MenuDefinitionInterface
+{
+public:
+    std::size_t size() const override { return m_items.size(); }
+
+    MenuItem& getMenuItem(std::size_t index) override
+    {
+        if (index < m_items.size())
+            return *m_items[index].get();
+
+        throw "aua";
+    }
+
+    const MenuItem& getMenuItem(std::size_t index) const override
+    {
+        if (index < m_items.size())
+            return *m_items[index].get();
+
+        throw "aua";
+    }
+
+    void runForEveryMenuItem(std::function<void(MenuItem&)> &&callback) override
+    {
+        for (const auto &ptr : m_items)
+            callback(*ptr);
+    }
+
+    void runForEveryMenuItem(std::function<void(const MenuItem&)> &&callback) const override
+    {
+        for (const auto &ptr : m_items)
+            callback(*ptr);
+    }
+
+    template<typename T, typename... Args>
+    void constructItem(Args&&... args)
+    {
+        emplaceItem(std::make_unique<T>(std::forward<Args>(args)...));
+    }
+
+    void emplaceItem(std::unique_ptr<MenuItem> &&ptr)
+    {
+        m_items.emplace_back(std::move(ptr));
+    }
+
+    void clearItems()
+    {
+        m_items.clear();
+    }
+
+private:
+    std::vector<std::unique_ptr<MenuItem>> m_items;
+};
+} // namespace
diff --git a/src/displays/menus/mainmenu.h b/src/displays/menus/mainmenu.h
index aee6a1f..765899f 100644
--- a/src/displays/menus/mainmenu.h
+++ b/src/displays/menus/mainmenu.h
@@ -1,7 +1,8 @@
 #pragma once
 
+// local includes
 #include "menudisplay.h"
-#include "staticmenudefinition.h"
+#include "containermenudefinition.h"
 #include "menuitem.h"
 #include "actions/switchscreenaction.h"
 #include "actions/modesettingsaction.h"
@@ -18,6 +19,7 @@
 #include "icons/poweroff.h"
 #include "icons/reboot.h"
 
+// forward declares
 namespace {
 class StatusDisplay;
 class SelectModeMenu;
@@ -31,32 +33,36 @@ class MosfetsMenu;
 class DemosMenu;
 class PoweroffDisplay;
 class DebugMenu;
-}
+} // namespace
 
 namespace {
 class MainMenu :
     public MenuDisplay,
     public StaticText<TEXT_MAINMENU>,
     public BackActionInterface<SwitchScreenAction<StatusDisplay>>,
-    public StaticMenuDefinition<
-        makeComponent<MenuItem, StaticText<TEXT_STATUS>,       SwitchScreenAction<StatusDisplay>, StaticMenuItemIcon<&icons::back>>,
-        makeComponent<MenuItem, StaticText<TEXT_SELECTMODE>,   SwitchScreenAction<SelectModeMenu>, StaticMenuItemIcon<&icons::modes>>,
-        makeComponent<MenuItem, StaticText<TEXT_MODESETTINGS>, ModeSettingsAction>,
-        makeComponent<MenuItem, StaticText<TEXT_PRESETS>,      SwitchScreenAction<PresetsMenu>, StaticMenuItemIcon<&icons::presets>>,
-        makeComponent<MenuItem, StaticText<TEXT_PROFILES>,     SwitchScreenAction<ProfilesMenu>>,
-        makeComponent<MenuItem, StaticText<TEXT_GRAPHS>,       SwitchScreenAction<GraphsMenu>, StaticMenuItemIcon<&icons::graph>>,
+    public ContainerMenuDefinition
+{
+public:
+    MainMenu()
+    {
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_STATUS>,       SwitchScreenAction<StatusDisplay>, StaticMenuItemIcon<&icons::back>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_SELECTMODE>,   SwitchScreenAction<SelectModeMenu>, StaticMenuItemIcon<&icons::modes>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_MODESETTINGS>, ModeSettingsAction>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_PRESETS>,      SwitchScreenAction<PresetsMenu>, StaticMenuItemIcon<&icons::presets>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_PROFILES>,     SwitchScreenAction<ProfilesMenu>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_GRAPHS>,       SwitchScreenAction<GraphsMenu>, StaticMenuItemIcon<&icons::graph>>>();
 #ifdef FEATURE_BMS
-        makeComponent<MenuItem, StaticText<TEXT_BMS>,          SwitchScreenAction<BmsMenu>, StaticMenuItemIcon<&icons::bms>>,
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_BMS>,          SwitchScreenAction<BmsMenu>, StaticMenuItemIcon<&icons::bms>>>();
 #endif
-        makeComponent<MenuItem, StaticText<TEXT_SETTINGS>,     SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&icons::settings>>,
-        makeComponent<MenuItem, StaticText<TEXT_LOCKVEHICLE>,  SwitchScreenAction<Lockscreen>, StaticMenuItemIcon<&icons::lock>>,
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_SETTINGS>,     SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&icons::settings>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_LOCKVEHICLE>,  SwitchScreenAction<Lockscreen>, StaticMenuItemIcon<&icons::lock>>>();
 #ifdef FEATURE_MOSFETS
-        makeComponent<MenuItem, StaticText<TEXT_MOSFETS>,      SwitchScreenAction<MosfetsMenu>>,
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_MOSFETS>,      SwitchScreenAction<MosfetsMenu>>>();
 #endif
-        makeComponent<MenuItem, StaticText<TEXT_DEMOS>,        SwitchScreenAction<DemosMenu>, StaticMenuItemIcon<&icons::demos>>,
-        makeComponent<MenuItem, StaticText<TEXT_POWEROFF>,     SwitchScreenAction<PoweroffDisplay>, StaticMenuItemIcon<&icons::poweroff>>,
-        makeComponent<MenuItem, StaticText<TEXT_REBOOT>,       RebootAction, StaticMenuItemIcon<&icons::reboot>>,
-        makeComponent<MenuItem, StaticText<TEXT_DEBUG>,        SwitchScreenAction<DebugMenu>>
-    >
-{};
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_DEMOS>,        SwitchScreenAction<DemosMenu>, StaticMenuItemIcon<&icons::demos>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_POWEROFF>,     SwitchScreenAction<PoweroffDisplay>, StaticMenuItemIcon<&icons::poweroff>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_REBOOT>,       RebootAction, StaticMenuItemIcon<&icons::reboot>>>();
+        constructItem<makeComponent<MenuItem, StaticText<TEXT_DEBUG>,        SwitchScreenAction<DebugMenu>>>();
+    }
 };
+} // namespace
diff --git a/src/globals.h b/src/globals.h
index 17a97c6..8baa4b0 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,7 +1,10 @@
 #pragma once
 
+// system includes
 #include <array>
+#include <memory>
 
+// Arduino includes
 #ifdef FEATURE_BLUETOOTH
 #include <BluetoothSerial.h>
 #endif
@@ -9,6 +12,7 @@
 #include <TFT_eSPI.h>
 #include <SPI.h>
 
+// local includes
 #include "controller.h"
 #include "display.h"
 #include "modeinterface.h"
@@ -67,7 +71,7 @@ TFT_eSPI tft = TFT_eSPI();
 
 ModeInterface *currentMode{};
 
-Display *currentDisplay{};
+std::unique_ptr<Display> currentDisplay;
 
 int rotated{};
 bool requestFullRedraw{};
diff --git a/src/main.cpp b/src/main.cpp
index 19068ca..4230d55 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,7 +12,55 @@
 #include "globals.h"
 #include "modes/defaultmode.h"
 #include "modes/tempomatmode.h"
+#include "displays/menus/aboutmenu.h"
+#include "displays/menus/accesspointwifisettingsmenu.h"
+#ifdef FEATURE_BLUETOOTH
+#include "displays/menus/bluetoothsettingsmenu.h"
+#endif
+#include "displays/menus/bmsmenu.h"
+#include "displays/menus/buzzermenu.h"
+#include "displays/menus/commanddebugmenu.h"
+#include "displays/menus/debugmenu.h"
+#include "displays/menus/defaultmodesettingsmenu.h"
+#include "displays/menus/demosmenu.h"
+#include "displays/menus/dynamicdebugmenu.h"
+#include "displays/menus/enablemenu.h"
+#include "displays/menus/feedbackdebugmenu.h"
+#include "displays/menus/gametrakmodesettingsmenu.h"
+#include "displays/menus/genericwifisettingsmenu.h"
+#include "displays/menus/graphsmenu.h"
+#include "displays/menus/controllerhardwaresettingsmenu.h"
+#include "displays/menus/invertmenu.h"
+#include "displays/menus/larsmmodesettingsmenu.h"
+#include "displays/menus/limitssettingsmenu.h"
+#include "displays/menus/mainmenu.h"
+#include "displays/menus/tempomatmodesettingsmenu.h"
+#include "displays/menus/modessettingsmenu.h"
+#include "displays/menus/mosfetsmenu.h"
+#include "displays/menus/motorfeedbackdebugmenu.h"
+#include "displays/menus/motorstatedebugmenu.h"
+#include "displays/menus/profilesmenu.h"
+#include "displays/menus/presetsmenu.h"
+#include "displays/menus/boardcomputerhardwaresettingsmenu.h"
+#include "displays/menus/selectmodemenu.h"
+#include "displays/menus/settingsmenu.h"
+#include "displays/menus/stationwifisettingsmenu.h"
+#include "displays/menus/timersmenu.h"
+#include "displays/menus/wifiscanmenu.h"
+#include "displays/menus/wifisettingsmenu.h"
+#include "displays/bmsdisplay.h"
+#include "displays/calibratedisplay.h"
 #include "displays/dpad5wiredebugdisplay.h"
+#include "displays/gameoflifedisplay.h"
+#include "displays/gametrakcalibratedisplay.h"
+#include "displays/lockscreen.h"
+#include "displays/metersdisplay.h"
+#include "displays/pingpongdisplay.h"
+#include "displays/poweroffdisplay.h"
+#include "displays/spirodisplay.h"
+#include "displays/starfielddisplay.h"
+#include "displays/statusdisplay.h"
+#include "displays/updatedisplay.h"
 #include "screens.h"
 #include "dpad.h"
 #include "dpad3wire.h"
diff --git a/src/screens.h b/src/screens.h
index 9dc3e2f..0d5959c 100644
--- a/src/screens.h
+++ b/src/screens.h
@@ -2,56 +2,6 @@
 
 #include <optional>
 
-#include "displays/menus/aboutmenu.h"
-#include "displays/menus/accesspointwifisettingsmenu.h"
-#ifdef FEATURE_BLUETOOTH
-#include "displays/menus/bluetoothsettingsmenu.h"
-#endif
-#include "displays/menus/bmsmenu.h"
-#include "displays/menus/buzzermenu.h"
-#include "displays/menus/commanddebugmenu.h"
-#include "displays/menus/debugmenu.h"
-#include "displays/menus/defaultmodesettingsmenu.h"
-#include "displays/menus/demosmenu.h"
-#include "displays/menus/dynamicdebugmenu.h"
-#include "displays/menus/enablemenu.h"
-#include "displays/menus/feedbackdebugmenu.h"
-#include "displays/menus/gametrakmodesettingsmenu.h"
-#include "displays/menus/genericwifisettingsmenu.h"
-#include "displays/menus/graphsmenu.h"
-#include "displays/menus/controllerhardwaresettingsmenu.h"
-#include "displays/menus/invertmenu.h"
-#include "displays/menus/larsmmodesettingsmenu.h"
-#include "displays/menus/limitssettingsmenu.h"
-#include "displays/menus/mainmenu.h"
-#include "displays/menus/tempomatmodesettingsmenu.h"
-#include "displays/menus/modessettingsmenu.h"
-#include "displays/menus/mosfetsmenu.h"
-#include "displays/menus/motorfeedbackdebugmenu.h"
-#include "displays/menus/motorstatedebugmenu.h"
-#include "displays/menus/profilesmenu.h"
-#include "displays/menus/presetsmenu.h"
-#include "displays/menus/boardcomputerhardwaresettingsmenu.h"
-#include "displays/menus/selectmodemenu.h"
-#include "displays/menus/settingsmenu.h"
-#include "displays/menus/stationwifisettingsmenu.h"
-#include "displays/menus/timersmenu.h"
-#include "displays/menus/wifiscanmenu.h"
-#include "displays/menus/wifisettingsmenu.h"
-#include "displays/bmsdisplay.h"
-#include "displays/calibratedisplay.h"
-#include "displays/dpad5wiredebugdisplay.h"
-#include "displays/gameoflifedisplay.h"
-#include "displays/gametrakcalibratedisplay.h"
-#include "displays/lockscreen.h"
-#include "displays/metersdisplay.h"
-#include "displays/pingpongdisplay.h"
-#include "displays/poweroffdisplay.h"
-#include "displays/spirodisplay.h"
-#include "displays/starfielddisplay.h"
-#include "displays/statusdisplay.h"
-#include "displays/updatedisplay.h"
-
 #include "globals.h"
 #include "utils.h"
 #include "widgets/label.h"
@@ -60,340 +10,12 @@
 namespace {
 Label bootLabel{32, 250};
 
-union X {
-    X() {}
-    ~X() { ((Display&)statusDisplay).~Display(); }
-
-    AboutMenu aboutMenu;
-    AccessPointWifiSettingsMenu accessPointWifiSettingsMenu;
-#ifdef FEATURE_BLUETOOTH
-    BluetoothSettingsMenu bluetoothSettingsMenu;
-#ifdef FEATURE_BMS
-    BmsMenu bmsMenu;
-#endif
-#endif
-    BuzzerMenu buzzerMenu;
-    FrontCommandDebugMenu frontCommandDebugMenu;
-    BackCommandDebugMenu backCommandDebugMenu;
-    ControllerHardwareSettingsMenu controllerHardwareSettingsMenu;
-    DebugMenu debugMenu;
-    DefaultModeSettingsMenu defaultModeSettingsMenu;
-    DemosMenu demosMenu;
-    DynamicDebugMenu dynamicDebugMenu;
-    EnableMenu enableMenu;
-    FrontFeedbackDebugMenu frontFeedbackDebugMenu;
-    BackFeedbackDebugMenu backFeedbackDebugMenu;
-#ifdef FEATURE_GAMETRAK
-    GametrakModeSettingsMenu gametrakModeSettingsMenu;
-#endif
-    GenericWifiSettingsMenu genericWifiSettingsMenu;
-    GraphsMenu graphsMenu;
-    InvertMenu invertMenu;
-    LarsmModeSettingsMenu larsmModeSettingsMenu;
-    LimitsSettingsMenu limitsSettingsMenu;
-    MainMenu mainMenu;
-    TempomatModeSettingsMenu tempomatModeSettingsMenu;
-    ModesSettingsMenu modesSettingsMenu;
-#ifdef FEATURE_MOSFETS
-    MosfetsMenu mosfetsMenu;
-#endif
-    FrontLeftMotorStateDebugMenu frontLeftMotorStateDebugMenu;
-    FrontRightMotorStateDebugMenu frontRightMotorStateDebugMenu;
-    BackLeftMotorStateDebugMenu backLeftMotorStateDebugMenu;
-    BackRightMotorStateDebugMenu backRightMotorStateDebugMenu;
-    FrontLeftMotorFeedbackDebugMenu frontLeftMotorFeedbackDebugMenu;
-    FrontRightMotorFeedbackDebugMenu frontRightMotorFeedbackDebugMenu;
-    BackLeftMotorFeedbackDebugMenu backLeftMotorFeedbackDebugMenu;
-    BackRightMotorFeedbackDebugMenu backRightMotorFeedbackDebugMenu;
-    BoardcomputerHardwareSettingsMenu boardcomputerHardwareSettingsMenu;
-    ProfilesMenu profilesMenu;
-    PresetsMenu presetsMenu;
-    SelectModeMenu selectModeMenu;
-    SettingsMenu settingsMenu;
-    StationWifiSettingsMenu stationWifiSettingsMenu;
-    TimersMenu timersMenu;
-    WifiScanMenu wifiScanMenu;
-    WifiSettingsMenu wifiSettingsMenu;
-
-#ifdef FEATURE_BMS
-    BmsDisplay bmsDisplay;
-#endif
-    CalibrateDisplay calibrateDisplay;
-#if defined(FEATURE_DPAD_5WIRESW) && defined(DPAD_5WIRESW_DEBUG)
-    DPad5WireDebugDisplay dPad5WireDebugDisplay;
-#endif
-    GameOfLifeDisplay gameOfLifeDisplay;
-#ifdef FEATURE_GAMETRAK
-    GametrakCalibrateDisplay gametrakCalibrateDisplay;
-#endif
-    Lockscreen lockScreen;
-    MetersDisplay metersDisplay;
-    PingPongDisplay pingPongDisplay;
-    PoweroffDisplay poweroffDisplay;
-    SpiroDisplay spiroDisplay;
-    StarfieldDisplay starFieldDisplay;
-    StatusDisplay statusDisplay;
-#ifdef FEATURE_OTA
-    UpdateDisplay updateDisplay;
-#endif
-
-    AutoWifiModeChangeDisplay autoWifiModeChangeDisplay;
-
-#ifdef FEATURE_BLUETOOTH
-    AutoBluetoothModeChangeDisplay autoBluetoothModeChangeDisplay;
-#endif
-
-    FrontFreqChangeScreen changeFrontFreq;
-    FrontPatternChangeScreen changeFrontPattern;
-    BackFreqChangeScreen changeBackFreq;
-    BackPatternChangeScreen changeBackPattern;
-    ReverseBeepFreq0ChangeScreen changeReverseBeepFreq0;
-    ReverseBeepFreq1ChangeScreen changeReverseBeepFreq1;
-    ReverseBeepDuration0ChangeScreen changeReverseBeepDuration0;
-    ReverseBeepDuration1ChangeScreen changeReverseBeepDuration1;
-
-    IMotMaxChangeScreen changeIMotMax;
-    IDcMaxChangeScreen changeIDcMax;
-    NMotMaxKmhChangeScreen changeNMotMaxKmh;
-    NMotMaxRpmChangeScreen changeNMotMaxRpm;
-    FieldWeakMaxChangeScreen changeFieldWeakMax;
-    PhaseAdvMaxChangeScreen changePhaseAdvMax;
-
-    WheelDiameterMmChangeScreen wheelDiameterMmChangeScreen;
-    WheelDiameterInchChangeScreen wheelDiameterInchChangeScreen;
-    NumMagnetPolesChangeScreen numMagnetPolesChangeScreen;
-
-    DefaultModeModelModeChangeDisplay changeDefaultModeModelMode;
-    DefaultModeSmoothingChangeDisplay changeDefaultModeSmoothing;
-    DefaultModeFrontPercentageChangeDisplay changeDefaultModeFrontPercentage;
-    DefaultModeBackPercentageChangeDisplay changeDefaultModeBackPercentage;
-    DefaultModeAddSchwelleChangeDisplay changeDefaultModeAddSchwelle;
-    DefaultModeGas1WertChangeDisplay changeDefaultModeGas1Wert;
-    DefaultModeGas2WertChangeDisplay changeDefaultModeGas2Wert;
-    DefaultModeBrems1WertChangeDisplay changeDefaultModeBrems1Wert;
-    DefaultModeBrems2WertChangeDisplay changeDefaultModeBrems2Wert;
-
-    TempomatModeModelModeChangeScreen changeManualModeModelMode;
-
-    LarsmModeModelModeChangeDisplay larsmModeModelModeChangeDisplay;
-    LarsmModeModeChangeDisplay larsmModeModeChangeDisplay;
-    LarsmModeIterationsChangeDisplay larsmModeIterationsChangeDisplay;
-
-    SampleCountChangeScreen sampleCountChangeScreen;
-    GasMinChangeScreen changeGasMin;
-    GasMaxChangeScreen changeGasMax;
-    BremsMinChangeScreen changeBremsMin;
-    BremsMaxChangeScreen changeBremsMax;
-#if defined(FEATURE_DPAD) || defined(FEATURE_DPAD_3WIRESW) || defined(FEATURE_DPAD_5WIRESW)
-    DPadDebounceChangeScreen dPadDebounceChangeScreen;
-#endif
-#ifdef FEATURE_GAMETRAK
-    GametrakXMinChangeScreen changeGametrakXMin;
-    GametrakXMaxChangeScreen changeGametrakXMax;
-    GametrakYMinChangeScreen changeGametrakYMin;
-    GametrakYMaxChangeScreen changeGametrakYMax;
-    GametrakDistMinChangeScreen changeGametrakDistMin;
-    GametrakDistMaxChangeScreen changeGametrakDistMax;
-#endif
-
-    PotiReadRateChangeDisplay potiReadRateChangeDisplay;
-    ModeUpdateRateChangeDisplay modeUpdateRateChangeDisplay;
-    StatsUpdateRateChangeDisplay statsUpdateRateChangeDisplay;
-    DisplayUpdateRateChangeDisplay displayUpdateRateChangeDisplay;
-    DisplayRedrawRateChangeDisplay displayRedrawRateChangeDisplay;
-
-    WifiModeChangeScreen wifiModeChangeScreen;
-    WifiTxPowerChangeScreen wifiTxPowerChangeScreen;
-
-    GasGraphDisplay gasGraphDisplay;
-    BremsGraphDisplay bremsGraphDisplay;
-    PotisGraphDisplay potisGraphDisplay;
-    PotisSplitGraphDisplay potisSplitGraphDisplay;
-    AvgSpeedGraphDisplay avgSpeedGraphDisplay;
-    AvgSpeedKmhGraphDisplay avgSpeedKmhGraphDisplay;
-    SumCurrentGraphDisplay sumCurrentGraphDisplay;
-    FrontVoltageGraphDisplay frontVoltageGraphDisplay;
-    BackVoltageGraphDisplay backVoltageGraphDisplay;
-    VoltagesGraphDisplay voltagesGraphDisplay;
-    VoltagesSplitGraphDisplay voltagesSplitGraphDisplay;
-#ifdef FEATURE_BMS
-    BmsVoltageGraphDisplay bmsVoltageGraphDisplay;
-    BmsCurrentGraphDisplay bmsCurrentGraphDisplay;
-    BmsPowerGraphDisplay bmsPowerGraphDisplay;
-    SumCurrentsComparisonGraphDisplay sumCurrentsComparisonGraphDisplay;
-#endif
-    MotorCurrentsGraphDisplay motorCurrentsGraphDisplay;
-} displays;
-
-template<typename T> T &getRefByType() = delete;
-template<> decltype(displays.aboutMenu)                                        &getRefByType<decltype(displays.aboutMenu)>()                                        { return displays.aboutMenu; }
-template<> decltype(displays.accessPointWifiSettingsMenu)                      &getRefByType<decltype(displays.accessPointWifiSettingsMenu)>()                      { return displays.accessPointWifiSettingsMenu; }
-#ifdef FEATURE_BLUETOOTH
-template<> decltype(displays.bluetoothSettingsMenu)                            &getRefByType<decltype(displays.bluetoothSettingsMenu)>()                            { return displays.bluetoothSettingsMenu; }
-#ifdef FEATURE_BMS
-template<> decltype(displays.bmsMenu)                                          &getRefByType<decltype(displays.bmsMenu)>()                                          { return displays.bmsMenu; }
-#endif
-#endif
-template<> decltype(displays.buzzerMenu)                                       &getRefByType<decltype(displays.buzzerMenu)>()                                       { return displays.buzzerMenu; }
-template<> decltype(displays.boardcomputerHardwareSettingsMenu)                &getRefByType<decltype(displays.boardcomputerHardwareSettingsMenu)>()                { return displays.boardcomputerHardwareSettingsMenu; }
-template<> decltype(displays.controllerHardwareSettingsMenu)                   &getRefByType<decltype(displays.controllerHardwareSettingsMenu)>()                   { return displays.controllerHardwareSettingsMenu; }
-template<> decltype(displays.frontCommandDebugMenu)                            &getRefByType<decltype(displays.frontCommandDebugMenu)>()                            { return displays.frontCommandDebugMenu; }
-template<> decltype(displays.backCommandDebugMenu)                             &getRefByType<decltype(displays.backCommandDebugMenu)>()                             { return displays.backCommandDebugMenu; }
-template<> decltype(displays.debugMenu)                                        &getRefByType<decltype(displays.debugMenu)>()                                        { return displays.debugMenu; }
-template<> decltype(displays.defaultModeSettingsMenu)                          &getRefByType<decltype(displays.defaultModeSettingsMenu)>()                          { return displays.defaultModeSettingsMenu; }
-template<> decltype(displays.demosMenu)                                        &getRefByType<decltype(displays.demosMenu)>()                                        { return displays.demosMenu; }
-template<> decltype(displays.dynamicDebugMenu)                                 &getRefByType<decltype(displays.dynamicDebugMenu)>()                                 { return displays.dynamicDebugMenu; }
-template<> decltype(displays.enableMenu)                                       &getRefByType<decltype(displays.enableMenu)>()                                       { return displays.enableMenu; }
-template<> decltype(displays.frontFeedbackDebugMenu)                           &getRefByType<decltype(displays.frontFeedbackDebugMenu)>()                           { return displays.frontFeedbackDebugMenu; }
-template<> decltype(displays.backFeedbackDebugMenu)                            &getRefByType<decltype(displays.backFeedbackDebugMenu)>()                            { return displays.backFeedbackDebugMenu; }
-#ifdef FEATURE_GAMETRAK
-template<> decltype(displays.gametrakModeSettingsMenu)                         &getRefByType<decltype(displays.gametrakModeSettingsMenu)>()                         { return displays.gametrakModeSettingsMenu; }
-#endif
-template<> decltype(displays.genericWifiSettingsMenu)                          &getRefByType<decltype(displays.genericWifiSettingsMenu)>()                          { return displays.genericWifiSettingsMenu; }
-template<> decltype(displays.graphsMenu)                                       &getRefByType<decltype(displays.graphsMenu)>()                                       { return displays.graphsMenu; }
-template<> decltype(displays.invertMenu)                                       &getRefByType<decltype(displays.invertMenu)>()                                       { return displays.invertMenu; }
-template<> decltype(displays.larsmModeSettingsMenu)                            &getRefByType<decltype(displays.larsmModeSettingsMenu)>()                            { return displays.larsmModeSettingsMenu; }
-template<> decltype(displays.limitsSettingsMenu)                               &getRefByType<decltype(displays.limitsSettingsMenu)>()                               { return displays.limitsSettingsMenu; }
-template<> decltype(displays.mainMenu)                                         &getRefByType<decltype(displays.mainMenu)>()                                         { return displays.mainMenu; }
-template<> decltype(displays.tempomatModeSettingsMenu)                         &getRefByType<decltype(displays.tempomatModeSettingsMenu)>()                         { return displays.tempomatModeSettingsMenu; }
-template<> decltype(displays.modesSettingsMenu)                                &getRefByType<decltype(displays.modesSettingsMenu)>()                                { return displays.modesSettingsMenu; }
-#ifdef FEATURE_MOSFETS
-template<> decltype(displays.mosfetsMenu)                                      &getRefByType<decltype(displays.mosfetsMenu)>()                                      { return displays.mosfetsMenu; }
-#endif
-template<> decltype(displays.frontLeftMotorStateDebugMenu)                     &getRefByType<decltype(displays.frontLeftMotorStateDebugMenu)>()                     { return displays.frontLeftMotorStateDebugMenu; }
-template<> decltype(displays.frontRightMotorStateDebugMenu)                    &getRefByType<decltype(displays.frontRightMotorStateDebugMenu)>()                    { return displays.frontRightMotorStateDebugMenu; }
-template<> decltype(displays.backLeftMotorStateDebugMenu)                      &getRefByType<decltype(displays.backLeftMotorStateDebugMenu)>()                      { return displays.backLeftMotorStateDebugMenu; }
-template<> decltype(displays.backRightMotorStateDebugMenu)                     &getRefByType<decltype(displays.backRightMotorStateDebugMenu)>()                     { return displays.backRightMotorStateDebugMenu; }
-template<> decltype(displays.frontLeftMotorFeedbackDebugMenu)                  &getRefByType<decltype(displays.frontLeftMotorFeedbackDebugMenu)>()                  { return displays.frontLeftMotorFeedbackDebugMenu; }
-template<> decltype(displays.frontRightMotorFeedbackDebugMenu)                 &getRefByType<decltype(displays.frontRightMotorFeedbackDebugMenu)>()                 { return displays.frontRightMotorFeedbackDebugMenu; }
-template<> decltype(displays.backLeftMotorFeedbackDebugMenu)                   &getRefByType<decltype(displays.backLeftMotorFeedbackDebugMenu)>()                   { return displays.backLeftMotorFeedbackDebugMenu; }
-template<> decltype(displays.backRightMotorFeedbackDebugMenu)                  &getRefByType<decltype(displays.backRightMotorFeedbackDebugMenu)>()                  { return displays.backRightMotorFeedbackDebugMenu; }
-template<> decltype(displays.profilesMenu)                                     &getRefByType<decltype(displays.profilesMenu)>()                                     { return displays.profilesMenu; }
-template<> decltype(displays.presetsMenu)                                      &getRefByType<decltype(displays.presetsMenu)>()                                      { return displays.presetsMenu; }
-template<> decltype(displays.selectModeMenu)                                   &getRefByType<decltype(displays.selectModeMenu)>()                                   { return displays.selectModeMenu; }
-template<> decltype(displays.settingsMenu)                                     &getRefByType<decltype(displays.settingsMenu)>()                                     { return displays.settingsMenu; }
-template<> decltype(displays.stationWifiSettingsMenu)                          &getRefByType<decltype(displays.stationWifiSettingsMenu)>()                          { return displays.stationWifiSettingsMenu; }
-
-template<> decltype(displays.timersMenu)                                       &getRefByType<decltype(displays.timersMenu)>()                                       { return displays.timersMenu; }
-template<> decltype(displays.wifiScanMenu)                                     &getRefByType<decltype(displays.wifiScanMenu)>()                                     { return displays.wifiScanMenu; }
-template<> decltype(displays.wifiSettingsMenu)                                 &getRefByType<decltype(displays.wifiSettingsMenu)>()                                 { return displays.wifiSettingsMenu; }
-
-#ifdef FEATURE_BMS
-template<> decltype(displays.bmsDisplay)                                       &getRefByType<decltype(displays.bmsDisplay)>()                                       { return displays.bmsDisplay; }
-#endif
-template<> decltype(displays.calibrateDisplay)                                 &getRefByType<decltype(displays.calibrateDisplay)>()                                 { return displays.calibrateDisplay; }
-#if defined(FEATURE_DPAD_5WIRESW) && defined(DPAD_5WIRESW_DEBUG)
-template<> decltype(displays.dPad5WireDebugDisplay)                            &getRefByType<decltype(displays.dPad5WireDebugDisplay)>()                            { return displays.dPad5WireDebugDisplay; }
-#endif
-template<> decltype(displays.gameOfLifeDisplay)                                &getRefByType<decltype(displays.gameOfLifeDisplay)>()                                { return displays.gameOfLifeDisplay; }
-#ifdef FEATURE_GAMETRAK
-template<> decltype(displays.gametrakCalibrateDisplay)                         &getRefByType<decltype(displays.gametrakCalibrateDisplay)>()                         { return displays.gametrakCalibrateDisplay; }
-#endif
-template<> decltype(displays.lockScreen)                                       &getRefByType<decltype(displays.lockScreen)>()                                       { return displays.lockScreen; }
-template<> decltype(displays.metersDisplay)                                    &getRefByType<decltype(displays.metersDisplay)>()                                    { return displays.metersDisplay; }
-template<> decltype(displays.pingPongDisplay)                                  &getRefByType<decltype(displays.pingPongDisplay)>()                                  { return displays.pingPongDisplay; }
-template<> decltype(displays.poweroffDisplay)                                  &getRefByType<decltype(displays.poweroffDisplay)>()                                  { return displays.poweroffDisplay; }
-template<> decltype(displays.spiroDisplay)                                     &getRefByType<decltype(displays.spiroDisplay)>()                                     { return displays.spiroDisplay; }
-template<> decltype(displays.starFieldDisplay)                                 &getRefByType<decltype(displays.starFieldDisplay)>()                                 { return displays.starFieldDisplay; }
-template<> decltype(displays.statusDisplay)                                    &getRefByType<decltype(displays.statusDisplay)>()                                    { return displays.statusDisplay; }
-#ifdef FEATURE_OTA
-template<> decltype(displays.updateDisplay)                                    &getRefByType<decltype(displays.updateDisplay)>()                                    { return displays.updateDisplay; }
-#endif
-
-template<> decltype(displays.autoWifiModeChangeDisplay)                        &getRefByType<decltype(displays.autoWifiModeChangeDisplay)>()                        { return displays.autoWifiModeChangeDisplay; }
-
-#ifdef FEATURE_BLUETOOTH
-template<> decltype(displays.autoBluetoothModeChangeDisplay)                   &getRefByType<decltype(displays.autoBluetoothModeChangeDisplay)>()                   { return displays.autoBluetoothModeChangeDisplay; }
-#endif
-
-template<> decltype(displays.changeFrontFreq)                                  &getRefByType<decltype(displays.changeFrontFreq)>()                                  { return displays.changeFrontFreq; }
-template<> decltype(displays.changeFrontPattern)                               &getRefByType<decltype(displays.changeFrontPattern)>()                               { return displays.changeFrontPattern; }
-template<> decltype(displays.changeBackFreq)                                   &getRefByType<decltype(displays.changeBackFreq)>()                                   { return displays.changeBackFreq; }
-template<> decltype(displays.changeBackPattern)                                &getRefByType<decltype(displays.changeBackPattern)>()                                { return displays.changeBackPattern; }
-template<> decltype(displays.changeReverseBeepFreq0)                           &getRefByType<decltype(displays.changeReverseBeepFreq0)>()                           { return displays.changeReverseBeepFreq0; }
-template<> decltype(displays.changeReverseBeepFreq1)                           &getRefByType<decltype(displays.changeReverseBeepFreq1)>()                           { return displays.changeReverseBeepFreq1; }
-template<> decltype(displays.changeReverseBeepDuration0)                       &getRefByType<decltype(displays.changeReverseBeepDuration0)>()                       { return displays.changeReverseBeepDuration0; }
-template<> decltype(displays.changeReverseBeepDuration1)                       &getRefByType<decltype(displays.changeReverseBeepDuration1)>()                       { return displays.changeReverseBeepDuration1; }
-
-template<> decltype(displays.changeIMotMax)                                    &getRefByType<decltype(displays.changeIMotMax)>()                                    { return displays.changeIMotMax; }
-template<> decltype(displays.changeIDcMax)                                     &getRefByType<decltype(displays.changeIDcMax)>()                                     { return displays.changeIDcMax; }
-template<> decltype(displays.changeNMotMaxKmh)                                 &getRefByType<decltype(displays.changeNMotMaxKmh)>()                                 { return displays.changeNMotMaxKmh; }
-template<> decltype(displays.changeNMotMaxRpm)                                 &getRefByType<decltype(displays.changeNMotMaxRpm)>()                                 { return displays.changeNMotMaxRpm; }
-template<> decltype(displays.changeFieldWeakMax)                               &getRefByType<decltype(displays.changeFieldWeakMax)>()                               { return displays.changeFieldWeakMax; }
-template<> decltype(displays.changePhaseAdvMax)                                &getRefByType<decltype(displays.changePhaseAdvMax)>()                                { return displays.changePhaseAdvMax; }
-
-template<> decltype(displays.wheelDiameterMmChangeScreen)                      &getRefByType<decltype(displays.wheelDiameterMmChangeScreen)>()                      { return displays.wheelDiameterMmChangeScreen; }
-template<> decltype(displays.wheelDiameterInchChangeScreen)                    &getRefByType<decltype(displays.wheelDiameterInchChangeScreen)>()                    { return displays.wheelDiameterInchChangeScreen; }
-template<> decltype(displays.numMagnetPolesChangeScreen)                       &getRefByType<decltype(displays.numMagnetPolesChangeScreen)>()                       { return displays.numMagnetPolesChangeScreen; }
-
-template<> decltype(displays.changeDefaultModeModelMode)                       &getRefByType<decltype(displays.changeDefaultModeModelMode)>()                       { return displays.changeDefaultModeModelMode; }
-template<> decltype(displays.changeDefaultModeSmoothing)                       &getRefByType<decltype(displays.changeDefaultModeSmoothing)>()                       { return displays.changeDefaultModeSmoothing; }
-template<> decltype(displays.changeDefaultModeFrontPercentage)                 &getRefByType<decltype(displays.changeDefaultModeFrontPercentage)>()                 { return displays.changeDefaultModeFrontPercentage; }
-template<> decltype(displays.changeDefaultModeBackPercentage)                  &getRefByType<decltype(displays.changeDefaultModeBackPercentage)>()                  { return displays.changeDefaultModeBackPercentage; }
-template<> decltype(displays.changeDefaultModeAddSchwelle)                     &getRefByType<decltype(displays.changeDefaultModeAddSchwelle)>()                     { return displays.changeDefaultModeAddSchwelle; }
-template<> decltype(displays.changeDefaultModeGas1Wert)                        &getRefByType<decltype(displays.changeDefaultModeGas1Wert)>()                        { return displays.changeDefaultModeGas1Wert; }
-template<> decltype(displays.changeDefaultModeGas2Wert)                        &getRefByType<decltype(displays.changeDefaultModeGas2Wert)>()                        { return displays.changeDefaultModeGas2Wert; }
-template<> decltype(displays.changeDefaultModeBrems1Wert)                      &getRefByType<decltype(displays.changeDefaultModeBrems1Wert)>()                      { return displays.changeDefaultModeBrems1Wert; }
-template<> decltype(displays.changeDefaultModeBrems2Wert)                      &getRefByType<decltype(displays.changeDefaultModeBrems2Wert)>()                      { return displays.changeDefaultModeBrems2Wert; }
-
-template<> decltype(displays.changeManualModeModelMode)                        &getRefByType<decltype(displays.changeManualModeModelMode)>()                        { return displays.changeManualModeModelMode; }
-
-template<> decltype(displays.larsmModeModelModeChangeDisplay)                  &getRefByType<decltype(displays.larsmModeModelModeChangeDisplay)>()                  { return displays.larsmModeModelModeChangeDisplay; }
-template<> decltype(displays.larsmModeModeChangeDisplay)                       &getRefByType<decltype(displays.larsmModeModeChangeDisplay)>()                       { return displays.larsmModeModeChangeDisplay; }
-template<> decltype(displays.larsmModeIterationsChangeDisplay)                 &getRefByType<decltype(displays.larsmModeIterationsChangeDisplay)>()                 { return displays.larsmModeIterationsChangeDisplay; }
-
-template<> decltype(displays.sampleCountChangeScreen)                          &getRefByType<decltype(displays.sampleCountChangeScreen)>()                          { return displays.sampleCountChangeScreen; }
-template<> decltype(displays.changeGasMin)                                     &getRefByType<decltype(displays.changeGasMin)>()                                     { return displays.changeGasMin; }
-template<> decltype(displays.changeGasMax)                                     &getRefByType<decltype(displays.changeGasMax)>()                                     { return displays.changeGasMax; }
-template<> decltype(displays.changeBremsMin)                                   &getRefByType<decltype(displays.changeBremsMin)>()                                   { return displays.changeBremsMin; }
-template<> decltype(displays.changeBremsMax)                                   &getRefByType<decltype(displays.changeBremsMax)>()                                   { return displays.changeBremsMax; }
-#if defined(FEATURE_DPAD) || defined(FEATURE_DPAD_3WIRESW) || defined(FEATURE_DPAD_5WIRESW)
-template<> decltype(displays.dPadDebounceChangeScreen)                         &getRefByType<decltype(displays.dPadDebounceChangeScreen)>()                         { return displays.dPadDebounceChangeScreen; }
-#endif
-#ifdef FEATURE_GAMETRAK
-template<> decltype(displays.changeGametrakXMin)                               &getRefByType<decltype(displays.changeGametrakXMin)>()                               { return displays.changeGametrakXMin; }
-template<> decltype(displays.changeGametrakXMax)                               &getRefByType<decltype(displays.changeGametrakXMax)>()                               { return displays.changeGametrakXMax; }
-template<> decltype(displays.changeGametrakYMin)                               &getRefByType<decltype(displays.changeGametrakYMin)>()                               { return displays.changeGametrakYMin; }
-template<> decltype(displays.changeGametrakYMax)                               &getRefByType<decltype(displays.changeGametrakYMax)>()                               { return displays.changeGametrakYMax; }
-template<> decltype(displays.changeGametrakDistMin)                            &getRefByType<decltype(displays.changeGametrakDistMin)>()                            { return displays.changeGametrakDistMin; }
-template<> decltype(displays.changeGametrakDistMax)                            &getRefByType<decltype(displays.changeGametrakDistMax)>()                            { return displays.changeGametrakDistMax; }
-#endif
-
-template<> decltype(displays.potiReadRateChangeDisplay)                        &getRefByType<decltype(displays.potiReadRateChangeDisplay)>()                        { return displays.potiReadRateChangeDisplay; }
-template<> decltype(displays.modeUpdateRateChangeDisplay)                      &getRefByType<decltype(displays.modeUpdateRateChangeDisplay)>()                      { return displays.modeUpdateRateChangeDisplay; }
-template<> decltype(displays.statsUpdateRateChangeDisplay)                     &getRefByType<decltype(displays.statsUpdateRateChangeDisplay)>()                     { return displays.statsUpdateRateChangeDisplay; }
-template<> decltype(displays.displayUpdateRateChangeDisplay)                   &getRefByType<decltype(displays.displayUpdateRateChangeDisplay)>()                   { return displays.displayUpdateRateChangeDisplay; }
-template<> decltype(displays.displayRedrawRateChangeDisplay)                   &getRefByType<decltype(displays.displayRedrawRateChangeDisplay)>()                   { return displays.displayRedrawRateChangeDisplay; }
-
-template<> decltype(displays.wifiModeChangeScreen)                             &getRefByType<decltype(displays.wifiModeChangeScreen)>()                             { return displays.wifiModeChangeScreen; }
-template<> decltype(displays.wifiTxPowerChangeScreen)                          &getRefByType<decltype(displays.wifiTxPowerChangeScreen)>()                          { return displays.wifiTxPowerChangeScreen; }
-
-template<> decltype(displays.gasGraphDisplay)                                  &getRefByType<decltype(displays.gasGraphDisplay)>()                                  { return displays.gasGraphDisplay; }
-template<> decltype(displays.bremsGraphDisplay)                                &getRefByType<decltype(displays.bremsGraphDisplay)>()                                { return displays.bremsGraphDisplay; }
-template<> decltype(displays.potisGraphDisplay)                                &getRefByType<decltype(displays.potisGraphDisplay)>()                                { return displays.potisGraphDisplay; }
-template<> decltype(displays.potisSplitGraphDisplay)                           &getRefByType<decltype(displays.potisSplitGraphDisplay)>()                           { return displays.potisSplitGraphDisplay; }
-template<> decltype(displays.avgSpeedGraphDisplay)                             &getRefByType<decltype(displays.avgSpeedGraphDisplay)>()                             { return displays.avgSpeedGraphDisplay; }
-template<> decltype(displays.avgSpeedKmhGraphDisplay)                          &getRefByType<decltype(displays.avgSpeedKmhGraphDisplay)>()                          { return displays.avgSpeedKmhGraphDisplay; }
-template<> decltype(displays.sumCurrentGraphDisplay)                           &getRefByType<decltype(displays.sumCurrentGraphDisplay)>()                           { return displays.sumCurrentGraphDisplay; }
-template<> decltype(displays.frontVoltageGraphDisplay)                         &getRefByType<decltype(displays.frontVoltageGraphDisplay)>()                         { return displays.frontVoltageGraphDisplay; }
-template<> decltype(displays.backVoltageGraphDisplay)                          &getRefByType<decltype(displays.backVoltageGraphDisplay)>()                          { return displays.backVoltageGraphDisplay; }
-template<> decltype(displays.voltagesGraphDisplay)                             &getRefByType<decltype(displays.voltagesGraphDisplay)>()                             { return displays.voltagesGraphDisplay; }
-template<> decltype(displays.voltagesSplitGraphDisplay)                        &getRefByType<decltype(displays.voltagesSplitGraphDisplay)>()                        { return displays.voltagesSplitGraphDisplay; }
-#ifdef FEATURE_BMS
-template<> decltype(displays.bmsVoltageGraphDisplay)                           &getRefByType<decltype(displays.bmsVoltageGraphDisplay)>()                           { return displays.bmsVoltageGraphDisplay; }
-template<> decltype(displays.bmsCurrentGraphDisplay)                           &getRefByType<decltype(displays.bmsCurrentGraphDisplay)>()                           { return displays.bmsCurrentGraphDisplay; }
-template<> decltype(displays.bmsPowerGraphDisplay)                             &getRefByType<decltype(displays.bmsPowerGraphDisplay)>()                             { return displays.bmsPowerGraphDisplay; }
-template<> decltype(displays.sumCurrentsComparisonGraphDisplay)                &getRefByType<decltype(displays.sumCurrentsComparisonGraphDisplay)>()                { return displays.sumCurrentsComparisonGraphDisplay; }
-#endif
-template<> decltype(displays.motorCurrentsGraphDisplay)                        &getRefByType<decltype(displays.motorCurrentsGraphDisplay)>()                        { return displays.motorCurrentsGraphDisplay; }
-
-
 void deconstructScreen()
 {
     if (currentDisplay)
     {
         currentDisplay->stop();
-        currentDisplay->~Display();
+        //currentDisplay->~Display();
         currentDisplay = nullptr;
     }
 }
@@ -403,13 +25,12 @@ void switchScreenImpl(Args&&... args)
 {
     deconstructScreen();
 
-    T &ref = getRefByType<T>();
-    new (&ref) T{std::forward<Args>(args)...};
-    currentDisplay = &ref;
-    ref.start();
-    ref.initScreen();
-    ref.update();
-    ref.redraw();
+    std::unique_ptr<T> ptr = std::make_unique<T>(std::forward<Args>(args)...);
+    currentDisplay = std::move(ptr);
+    currentDisplay->start();
+    currentDisplay->initScreen();
+    currentDisplay->update();
+    currentDisplay->redraw();
 }
 
 std::function<void()> changeScreenCallback;
diff --git a/src/staticmenudefinition.h b/src/staticmenudefinition.h
index 83143ef..587901b 100644
--- a/src/staticmenudefinition.h
+++ b/src/staticmenudefinition.h
@@ -1,5 +1,6 @@
 #pragma once
 
+// local includes
 #include "menudefinitioninterface.h"
 
 namespace {
@@ -81,4 +82,4 @@ public:
 private:
     T item;
 };
-}
+} // namespace