diff --git a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
index b878ce3c1..47c232582 100644
--- a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
+++ b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
@@ -41,12 +41,10 @@ namespace app
 
         auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
         if (msg != nullptr) {
-            // window-specific actions
-            if (msg->interface == db::Interface::Name::AlarmEvents) {
-                for (auto &[name, window] : windowsStack.windows) {
-                    window->onDatabaseMessage(msg);
-                }
-            }
+            userInterfaceDBNotification(msg, [](sys::Message *m, [[maybe_unused]] const std::string &) {
+                auto msg = dynamic_cast<db::NotificationMessage *>(m);
+                return (msg != nullptr) && msg->interface == db::Interface::Name::AlarmEvents;
+            });
             return std::make_shared<sys::ResponseMessage>();
         }
 
diff --git a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp
index 2e0b0ca65..abe32b9dc 100644
--- a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp
+++ b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp
@@ -6,6 +6,7 @@
 #include <application-alarm-clock/widgets/AlarmClockStyle.hpp>
 #include <ListView.hpp>
 #include <time/time_locale.hpp>
+#include <AppWindow.hpp>
 
 namespace app::alarmClock
 {
diff --git a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
index f64f04cd7..6bd28cdb8 100644
--- a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
+++ b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
@@ -9,6 +9,7 @@
 #include <application-alarm-clock/widgets/AlarmRRuleOptionsItem.hpp>
 #include <application-alarm-clock/presenter/AlarmRRulePresenter.hpp>
 #include <application-alarm-clock/widgets/AlarmClockStyle.hpp>
+#include <AppWindow.hpp>
 
 #include <ListView.hpp>
 
diff --git a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp
index 52e3461b9..5b030a314 100644
--- a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp
+++ b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp
@@ -7,6 +7,7 @@
 #include "Option.hpp"
 #include "windows/DialogMetadata.hpp"
 #include "messages/DialogMetadataMessage.hpp"
+#include <AppWindowConstants.hpp>
 
 namespace app::alarmClock
 {
diff --git a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp
index a67e990f0..2d8ef821f 100644
--- a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp
+++ b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp
@@ -7,6 +7,7 @@
 
 #include <Application.hpp>
 #include <ListView.hpp>
+#include <AppWindow.hpp>
 
 namespace app::alarmClock
 {
diff --git a/module-apps/application-calendar/widgets/DayLabel.cpp b/module-apps/application-calendar/widgets/DayLabel.cpp
index ea51695e1..5432a7a92 100644
--- a/module-apps/application-calendar/widgets/DayLabel.cpp
+++ b/module-apps/application-calendar/widgets/DayLabel.cpp
@@ -9,6 +9,7 @@
 
 #include <gui/widgets/Image.hpp>
 #include <time/time_conversion.hpp>
+#include <gui/widgets/Label.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp
index 0612e2329..5ae31e6ec 100644
--- a/module-apps/application-call/ApplicationCall.cpp
+++ b/module-apps/application-call/ApplicationCall.cpp
@@ -19,12 +19,14 @@
 #include <service-audio/AudioServiceAPI.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 #include <time/time_conversion.hpp>
+#include <WindowsPopupFilter.hpp>
 
 #include <cassert>
 #include <memory>
 
 namespace app
 {
+
     ApplicationCall::ApplicationCall(std::string name,
                                      std::string parent,
                                      StatusIndicators statusIndicators,
@@ -32,6 +34,12 @@ namespace app
         : Application(name, parent, statusIndicators, startInBackground, app::call_stack_size)
     {
         using namespace gui::status_bar;
+        getPopupFilter().addAppDependentFilter([&](const gui::PopupRequestParams &popupParams) {
+            if (popupParams.getPopupId() == gui::popup::ID::Volume) {
+                return true;
+            }
+            return this->getCallState() == call::State::IDLE;
+        });
         statusBarManager->enableIndicators(
             {Indicator::Signal, Indicator::Time, Indicator::Battery, Indicator::SimCard});
         addActionReceiver(manager::actions::Call, [this](auto &&data) {
@@ -118,14 +126,6 @@ namespace app
         return true;
     }
 
-    bool ApplicationCall::isPopupPermitted(gui::popup::ID popupId) const
-    {
-        if (popupId == gui::popup::ID::Volume) {
-            return true;
-        }
-        return getCallState() == call::State::IDLE;
-    }
-
     // Invoked upon receiving data message
     sys::MessagePointer ApplicationCall::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
     {
diff --git a/module-apps/application-call/include/application-call/ApplicationCall.hpp b/module-apps/application-call/include/application-call/ApplicationCall.hpp
index 1418b3438..b6efd0f12 100644
--- a/module-apps/application-call/include/application-call/ApplicationCall.hpp
+++ b/module-apps/application-call/include/application-call/ApplicationCall.hpp
@@ -12,6 +12,7 @@
 #include <service-evtmgr/EVMessages.hpp>
 #include <Service/Message.hpp>
 #include <SystemManager/SystemManagerCommon.hpp>
+#include <AppWindowConstants.hpp>
 
 namespace app
 {
@@ -77,7 +78,6 @@ namespace app
                                  StartInBackground startInBackground = {false});
         sys::MessagePointer DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
         sys::ReturnCodes InitHandler() override;
-        bool isPopupPermitted(gui::popup::ID popupId) const override;
 
         sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final
         {
diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp
index 0d7ef52a1..598a9d094 100644
--- a/module-apps/application-calllog/ApplicationCallLog.cpp
+++ b/module-apps/application-calllog/ApplicationCallLog.cpp
@@ -51,10 +51,10 @@ namespace app
             return retMsg;
         }
 
-        if (msgl->messageType == MessageType::DBServiceNotification) {
-            for (auto &[name, window] : windowsStack.windows) {
-                window->onDatabaseMessage(msgl);
-            }
+        if (userInterfaceDBNotification(msgl,
+                                        [&]([[maybe_unused]] sys::Message *, [[maybe_unused]] const std::string &) {
+                                            return msgl->messageType == MessageType::DBServiceNotification;
+                                        })) {
             return sys::msgHandled();
         }
 
@@ -70,9 +70,6 @@ namespace app
         }
 
         createUserInterface();
-
-        setActiveWindow(calllog::settings::MainWindowStr);
-
         return ret;
     }
 
diff --git a/module-apps/application-clock/ApplicationClock.cpp b/module-apps/application-clock/ApplicationClock.cpp
deleted file mode 100644
index 6556ea3ff..000000000
--- a/module-apps/application-clock/ApplicationClock.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-// module-gui
-#include "AppWindow.hpp"
-#include "gui/widgets/Window.hpp"
-
-// module-utils
-#include <log/log.hpp>
-#include <service-evtmgr/EVMessages.hpp>
-#include <service-evtmgr/EventManagerCommon.hpp>
-#include <Timers/TimerFactory.hpp>
-// MessageType
-#include "MessageType.hpp"
-// this module
-#include "windows/ClockMainWindow.hpp"
-#include "ApplicationClock.hpp"
-
-namespace app
-{
-    ApplicationClock::ApplicationClock(std::string name,
-                                       std::string parent,
-                                       sys::phone_modes::PhoneMode phoneMode,
-                                       sys::bluetooth::BluetoothMode bluetoothMode,
-                                       StartInBackground startInBackground,
-                                       uint32_t stackDepth,
-                                       sys::ServicePriority priority)
-        : Application(name, parent, phoneMode, bluetoothMode, startInBackground, stackDepth, priority)
-    {
-        timerClock = sys::TimerFactory::createPeriodicTimer(
-            this, "Clock", std::chrono::milliseconds{1000}, [&](sys::Timer &) { timerClockCallback(); });
-        timerClock.start();
-    }
-
-    void ApplicationClock::timerClockCallback()
-    {
-        auto win = reinterpret_cast<gui::ClockMainWindow *>(windowsStack.get(gui::name::window::main_window));
-        win->incrementSecond();
-        win->updateLabels();
-        render(gui::RefreshModes::GUI_REFRESH_FAST);
-    }
-
-    // Invoked upon receiving data message
-    sys::MessagePointer ApplicationClock::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
-    {
-
-        auto retMsg = Application::DataReceivedHandler(msgl);
-        // if message was handled by application's template there is no need to process further.
-        if (reinterpret_cast<sys::ResponseMessage *>(retMsg.get())->retCode == sys::ReturnCodes::Success) {
-            return retMsg;
-        }
-
-        // this variable defines whether message was processed.
-        bool handled = false;
-        // if keyboard message received
-
-        if (handled)
-            return std::make_shared<sys::ResponseMessage>();
-        else
-            return std::make_shared<sys::ResponseMessage>(sys::ReturnCodes::Unresolved);
-    }
-
-    // Invoked during initialization
-    sys::ReturnCodes ApplicationClock::InitHandler()
-    {
-
-        auto ret = Application::InitHandler();
-        if (ret != sys::ReturnCodes::Success)
-            return ret;
-
-        createUserInterface();
-
-        setActiveWindow("MainWindow");
-
-        return ret;
-    }
-
-    sys::ReturnCodes ApplicationClock::DeinitHandler()
-    {
-        timerClock.stop();
-        return Application::DeinitHandler();
-    }
-
-    void ApplicationClock::createUserInterface()
-    {
-        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
-            return std::make_unique<gui::ClockMainWindow>(app, name);
-        });
-
-        attachPopups({gui::popup::ID::Volume,
-                      gui::popup::ID::Tethering,
-                      gui::popup::ID::PhoneModes,
-                      gui::popup::ID::PhoneLock,
-                      gui::popup::ID::Alarm});
-    }
-
-    void ApplicationClock::destroyUserInterface()
-    {}
-
-} /* namespace app */
diff --git a/module-apps/application-clock/ApplicationClock.hpp b/module-apps/application-clock/ApplicationClock.hpp
deleted file mode 100644
index 09724eed7..000000000
--- a/module-apps/application-clock/ApplicationClock.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#pragma once
-#include "Application.hpp"
-#include "Service/Message.hpp"
-#include "gui/widgets/Label.hpp"
-#include "gui/widgets/Image.hpp"
-#include "gui/widgets/ProgressBar.hpp"
-#include "Timers/TimerHandle.hpp"
-
-namespace app
-{
-    const inline std::string name_clock = "ApplicationClock";
-
-    class ApplicationClock : public Application
-    {
-        sys::TimerHandle timerClock;
-        void timerClockCallback();
-
-      public:
-        explicit ApplicationClock(std::string name                            = name_clock,
-                                  std::string parent                          = {},
-                                  sys::phone_modes::PhoneMode phoneMode       = sys::phone_modes::PhoneMode::Connected,
-                                  sys::bluetooth::BluetoothMode bluetoothMode = sys::bluetooth::BluetoothMode::Disabled,
-                                  StartInBackground startInBackground         = {false},
-                                  uint32_t stackDepth                         = 4096,
-                                  sys::ServicePriority priority               = sys::ServicePriority::Idle);
-
-        sys::MessagePointer DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
-        sys::ReturnCodes InitHandler() override;
-        sys::ReturnCodes DeinitHandler() override;
-
-        sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final
-        {
-            return sys::ReturnCodes::Success;
-        }
-
-        void createUserInterface() override;
-        void destroyUserInterface() override;
-    };
-
-    template <> struct ManifestTraits<ApplicationClock>
-    {
-        static auto GetManifest() -> manager::ApplicationManifest
-        {
-            return {
-                {manager::actions::Launch, manager::actions::PhoneModeChanged, manager::actions::BluetoothModeChanged}};
-        }
-    };
-} /* namespace app */
diff --git a/module-apps/application-desktop/ApplicationDesktop.cpp b/module-apps/application-desktop/ApplicationDesktop.cpp
index 55b28a2b0..0d0425d22 100644
--- a/module-apps/application-desktop/ApplicationDesktop.cpp
+++ b/module-apps/application-desktop/ApplicationDesktop.cpp
@@ -12,6 +12,7 @@
 #include "MmiPullWindow.hpp"
 #include "MmiPushWindow.hpp"
 #include "Reboot.hpp"
+#include "WindowsPopupFilter.hpp"
 
 #include <apps-common/messages/AppMessage.hpp>
 #include <AppWindow.hpp>
@@ -47,6 +48,9 @@ namespace app
                               std::make_shared<SIMConfiguration>(SIMConfiguration::DisplayMode::OnlyInactiveState));
         bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);
 
+        getPopupFilter().addAppDependentFilter(
+            [&](const gui::PopupRequestParams & /*popupParams*/) { return !blockAllPopups; });
+
         addActionReceiver(app::manager::actions::ShowMMIResponse, [this](auto &&data) {
             switchWindow(app::window::name::desktop_mmi_pull, std::move(data));
             return actionHandled();
@@ -197,14 +201,6 @@ namespace app
         return false;
     }
 
-    bool ApplicationDesktop::isPopupPermitted([[maybe_unused]] gui::popup::ID popupId) const
-    {
-        if (blockAllPopups) {
-            return false;
-        }
-        return true;
-    }
-
     void ApplicationDesktop::handleLowBatteryNotification(manager::actions::ActionParamsPtr &&data)
     {
         auto lowBatteryState = static_cast<manager::actions::LowBatteryNotificationParams *>(data.get());
diff --git a/module-apps/application-desktop/include/application-desktop/ApplicationDesktop.hpp b/module-apps/application-desktop/include/application-desktop/ApplicationDesktop.hpp
index dedabf440..6f48480ab 100644
--- a/module-apps/application-desktop/include/application-desktop/ApplicationDesktop.hpp
+++ b/module-apps/application-desktop/include/application-desktop/ApplicationDesktop.hpp
@@ -39,8 +39,6 @@ namespace app
         // done
         void handleNotificationsChanged(std::unique_ptr<gui::SwitchData> notificationsParams) override;
 
-        bool isPopupPermitted(gui::popup::ID popupId) const override;
-
         void setOsUpdateVersion(const std::string &value);
 
       private:
diff --git a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
index 83df86f0f..dfbe513cf 100644
--- a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
+++ b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
@@ -18,7 +18,7 @@ namespace gui
     } // namespace
 
     ChargingBatteryWindow::ChargingBatteryWindow(app::ApplicationCommon *app)
-        : AppWindow(app, app::window::name::dead_battery)
+        : AppWindow(app, app::window::name::charging_battery)
     {
         buildInterface();
         preventsAutoLock = true;
diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index ecbaaeec6..1c1e62635 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -88,14 +88,11 @@ namespace app
         if (msgl->messageType == MessageType::DBServiceNotification) {
             auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
             if (msg != nullptr) {
-                // window-specific actions
-                if (msg->interface == db::Interface::Name::SMSThread || msg->interface == db::Interface::Name::SMS) {
-                    for (auto &[name, window] : windowsStack.windows) {
-                        window->onDatabaseMessage(msg);
-                    }
-                }
-                // app-wide actions
-                // <none>
+                userInterfaceDBNotification(msgl,
+                                            [&]([[maybe_unused]] sys::Message *, [[maybe_unused]] const std::string &) {
+                                                return msg->interface == db::Interface::Name::SMSThread ||
+                                                       msg->interface == db::Interface::Name::SMS;
+                                            });
                 return std::make_shared<sys::ResponseMessage>();
             }
         }
diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp
index 2aace363a..3ef13c4d0 100644
--- a/module-apps/application-notes/ApplicationNotes.cpp
+++ b/module-apps/application-notes/ApplicationNotes.cpp
@@ -47,12 +47,10 @@ namespace app
 
         if (msgl->messageType == MessageType::DBServiceNotification) {
             if (auto msg = dynamic_cast<db::NotificationMessage *>(msgl); msg != nullptr) {
-                // window-specific actions
-                if (msg->interface == db::Interface::Name::Notes) {
-                    for (auto &[name, window] : windowsStack) {
-                        window->onDatabaseMessage(msg);
-                    }
-                }
+                userInterfaceDBNotification(msgl,
+                                            [&]([[maybe_unused]] sys::Message *, [[maybe_unused]] const std::string &) {
+                                                return msg->interface == db::Interface::Name::Notes;
+                                            });
                 return std::make_shared<sys::ResponseMessage>();
             }
         }
diff --git a/module-apps/application-notes/windows/NotesOptions.cpp b/module-apps/application-notes/windows/NotesOptions.cpp
index 9f202abe5..fc67c5ccf 100644
--- a/module-apps/application-notes/windows/NotesOptions.cpp
+++ b/module-apps/application-notes/windows/NotesOptions.cpp
@@ -12,6 +12,7 @@
 #include <i18n/i18n.hpp>
 
 #include <module-gui/gui/widgets/text/Text.hpp>
+#include <AppWindowConstants.hpp>
 
 namespace app::notes
 {
diff --git a/module-apps/application-phonebook/ApplicationPhonebook.cpp b/module-apps/application-phonebook/ApplicationPhonebook.cpp
index c73c974b5..0404d32b4 100644
--- a/module-apps/application-phonebook/ApplicationPhonebook.cpp
+++ b/module-apps/application-phonebook/ApplicationPhonebook.cpp
@@ -65,14 +65,10 @@ namespace app
             auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
             LOG_DEBUG("Received notification");
             if (msg != nullptr) {
-                // window-specific actions
-                if (msg->interface == db::Interface::Name::Contact) {
-                    for (auto &[name, window] : windowsStack) {
-                        window->onDatabaseMessage(msg);
-                    }
-                }
-                // app-wide actions
-                // <none>
+                userInterfaceDBNotification(msgl,
+                                            [&]([[maybe_unused]] sys::Message *, [[maybe_unused]] const std::string &) {
+                                                return msg->interface == db::Interface::Name::Contact;
+                                            });
                 return std::make_shared<sys::ResponseMessage>();
             }
         }
@@ -96,8 +92,9 @@ namespace app
 
     void ApplicationPhonebook::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
-            return std::make_unique<gui::PhonebookMainWindow>(app);
+        windowsFactory.attach(gui::name::window::main_window, [&](ApplicationCommon *app, const std::string &name) {
+            searchRequestModel = std::make_shared<SearchRequestModel>();
+            return std::make_unique<gui::PhonebookMainWindow>(app, searchRequestModel);
         });
         windowsFactory.attach(gui::window::name::contact, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookContactDetails>(app);
@@ -149,19 +146,16 @@ namespace app
 
     void ApplicationPhonebook::onSearchRequest(const std::string &searchFilter)
     {
-        auto searchModel = std::make_unique<PhonebookModel>(this, searchFilter);
+        auto phonebookModel = std::make_unique<PhonebookModel>(this, searchFilter);
 
-        LOG_DEBUG("Search results count: %d", searchModel->requestRecordsCount());
-        if (searchModel->requestRecordsCount() > 0) {
-            auto main_window =
-                dynamic_cast<gui::PhonebookMainWindow *>(windowsStack.get(gui::name::window::main_window));
-            if (main_window == nullptr) {
-                LOG_ERROR("Failed to get main window.");
-                return;
-            }
-
-            if (main_window->isSearchRequested()) {
-                searchModel->messagesSelectCallback = [=](gui::PhonebookItem *item) {
+        LOG_DEBUG("Search results count: %d", phonebookModel->requestRecordsCount());
+        if (not searchRequestModel) {
+            LOG_ERROR("application not build, model not available");
+            assert(0);
+        }
+        if (phonebookModel->requestRecordsCount() > 0) {
+            if (searchRequestModel->requestedSearch()) {
+                phonebookModel->messagesSelectCallback = [=](gui::PhonebookItem *item) {
                     std::unique_ptr<PhonebookSearchRequest> data = std::make_unique<PhonebookSearchRequest>();
                     data->result                                 = item->contact;
                     data->setDescription("PhonebookSearchRequest");
@@ -170,7 +164,7 @@ namespace app
                 };
             }
             LOG_DEBUG("Switching to search results window.");
-            auto data = std::make_unique<PhonebookSearchResultsData>(std::move(searchModel));
+            auto data = std::make_unique<PhonebookSearchResultsData>(std::move(phonebookModel));
             switchWindow("SearchResults", gui::ShowMode::GUI_SHOW_INIT, std::move(data));
         }
         else {
diff --git a/module-apps/application-phonebook/include/application-phonebook/ApplicationPhonebook.hpp b/module-apps/application-phonebook/include/application-phonebook/ApplicationPhonebook.hpp
index b58dbd90f..fbd4f3676 100644
--- a/module-apps/application-phonebook/include/application-phonebook/ApplicationPhonebook.hpp
+++ b/module-apps/application-phonebook/include/application-phonebook/ApplicationPhonebook.hpp
@@ -6,6 +6,7 @@
 #include "Application.hpp"
 
 #include <string>
+#include <application-phonebook/models/SearchRequestModel.hpp>
 
 namespace gui::window::name
 {
@@ -30,6 +31,8 @@ namespace app
 
     class ApplicationPhonebook : public app::Application
     {
+        std::shared_ptr<SearchRequestModel> searchRequestModel;
+
       public:
         explicit ApplicationPhonebook(std::string name                    = name_phonebook,
                                       std::string parent                  = {},
diff --git a/module-apps/application-phonebook/models/NewContactModel.cpp b/module-apps/application-phonebook/models/NewContactModel.cpp
index efdb97670..73d843c8d 100644
--- a/module-apps/application-phonebook/models/NewContactModel.cpp
+++ b/module-apps/application-phonebook/models/NewContactModel.cpp
@@ -3,6 +3,7 @@
 
 #include "NewContactModel.hpp"
 
+#include "apps-common/windows/AppWindow.hpp"
 #include "application-phonebook/widgets/ContactListItem.hpp"
 #include "application-phonebook/widgets/InputBoxWithLabelAndIconWidget.hpp"
 #include "application-phonebook/widgets/InputLinesWithLabelWidget.hpp"
diff --git a/module-apps/application-phonebook/models/SearchRequestModel.hpp b/module-apps/application-phonebook/models/SearchRequestModel.hpp
new file mode 100644
index 000000000..22501e04a
--- /dev/null
+++ b/module-apps/application-phonebook/models/SearchRequestModel.hpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+class SearchRequestModel
+{
+    bool searchRequested = false;
+
+  public:
+    bool requestedSearch() const noexcept
+    {
+        return searchRequested;
+    }
+    void setRequested(bool val) noexcept
+    {
+        searchRequested = val;
+    }
+};
diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
index 68fd4e103..3b397f4ce 100644
--- a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
@@ -16,9 +16,9 @@
 
 namespace gui
 {
-    PhonebookMainWindow::PhonebookMainWindow(app::ApplicationCommon *app)
-        : AppWindow(app, gui::name::window::main_window), phonebookModel{
-                                                              std::make_shared<PhonebookModel>(this->application)}
+    PhonebookMainWindow::PhonebookMainWindow(app::ApplicationCommon *app, std::shared_ptr<SearchRequestModel> model)
+        : AppWindow(app, gui::name::window::main_window),
+          model(std::move(model)), phonebookModel{std::make_shared<PhonebookModel>(this->application)}
     {
         buildInterface();
     }
@@ -87,8 +87,8 @@ namespace gui
         LOG_INFO("onBeforeShow");
 
         auto contactRequest = dynamic_cast<PhonebookSearchRequest *>(data);
-        requestedSearch     = contactRequest != nullptr;
-        if (requestedSearch) {
+        model->setRequested(contactRequest != nullptr);
+        if (model->requestedSearch()) {
             enableNewContact                       = false;
             phonebookModel->messagesSelectCallback = [=](gui::PhonebookItem *item) {
                 std::unique_ptr<PhonebookSearchRequest> data = std::make_unique<PhonebookSearchRequest>();
@@ -168,11 +168,6 @@ namespace gui
         return false;
     }
 
-    bool PhonebookMainWindow::isSearchRequested() const
-    {
-        return requestedSearch;
-    }
-
     void PhonebookMainWindow::onEmptyList()
     {
         navBar->setActive(gui::nav_bar::Side::Left, false);
@@ -184,7 +179,7 @@ namespace gui
 
     void PhonebookMainWindow::onListFilled()
     {
-        if (!isSearchRequested()) {
+        if (not model->requestedSearch()) {
             navBar->setActive(gui::nav_bar::Side::Left, true);
             navBar->setActive(gui::nav_bar::Side::Center, true);
             header->navigationIndicatorAdd(new gui::header::SearchAction(), gui::header::BoxSelection::Right);
diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
index 36a14aed5..2eaa584fa 100644
--- a/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
@@ -6,6 +6,7 @@
 #include "application-phonebook/data/PhonebookStyle.hpp"
 #include "application-phonebook/models/PhonebookModel.hpp"
 #include "application-phonebook/widgets/PhonebookListView.hpp"
+#include "application-phonebook/models/SearchRequestModel.hpp"
 
 #include <AppWindow.hpp>
 #include <ListView.hpp>
@@ -18,6 +19,9 @@ namespace gui
 
     class PhonebookMainWindow : public AppWindow
     {
+      private:
+        std::shared_ptr<SearchRequestModel> model = nullptr;
+
       protected:
         std::shared_ptr<PhonebookModel> phonebookModel = nullptr;
         ListView *contactsList                         = nullptr;
@@ -32,7 +36,7 @@ namespace gui
         void onListFilled();
 
       public:
-        PhonebookMainWindow(app::ApplicationCommon *app);
+        PhonebookMainWindow(app::ApplicationCommon *app, std::shared_ptr<SearchRequestModel> model);
         virtual ~PhonebookMainWindow();
 
         // virtual methods
@@ -45,7 +49,6 @@ namespace gui
         void buildInterface() override;
         void destroyInterface() override;
 
-        bool isSearchRequested() const;
         void HandleFilteringByLetter(const InputEvent &inputEvent);
     };
 
diff --git a/module-apps/application-settings/models/apps/SoundsModel.cpp b/module-apps/application-settings/models/apps/SoundsModel.cpp
index 6a2dd2de5..b3e7da9ba 100644
--- a/module-apps/application-settings/models/apps/SoundsModel.cpp
+++ b/module-apps/application-settings/models/apps/SoundsModel.cpp
@@ -2,6 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SoundsModel.hpp"
+#include "AppWindow.hpp"
 
 #include <application-settings/widgets/apps/SettingsSoundItem.hpp>
 #include <module-gui/gui/input/InputEvent.hpp>
diff --git a/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp b/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp
index af55ba6c5..853c56480 100644
--- a/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp
+++ b/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp
@@ -6,6 +6,7 @@
 #include <application-settings/widgets/display-keypad/CategoryWidget.hpp>
 
 #include <ListView.hpp>
+#include <AppWindow.hpp>
 
 namespace style::quotes::list
 {
diff --git a/module-apps/application-settings/models/display-keypad/QuotesModel.cpp b/module-apps/application-settings/models/display-keypad/QuotesModel.cpp
index f2e0cb31f..7cbad1748 100644
--- a/module-apps/application-settings/models/display-keypad/QuotesModel.cpp
+++ b/module-apps/application-settings/models/display-keypad/QuotesModel.cpp
@@ -8,6 +8,7 @@
 
 #include <InputEvent.hpp>
 #include <ListView.hpp>
+#include <AppWindow.hpp>
 
 namespace style::quotes::list
 {
diff --git a/module-apps/application-settings/models/network/NewApnModel.cpp b/module-apps/application-settings/models/network/NewApnModel.cpp
index 0f3d8c9ac..02b895f7c 100644
--- a/module-apps/application-settings/models/network/NewApnModel.cpp
+++ b/module-apps/application-settings/models/network/NewApnModel.cpp
@@ -8,6 +8,7 @@
 #include <application-settings/widgets/network/ApnInputWidget.hpp>
 
 #include <ListView.hpp>
+#include <AppWindow.hpp>
 
 NewApnModel::NewApnModel(app::ApplicationCommon *app) : application(app)
 {}
diff --git a/module-apps/application-settings/models/network/SimContactsImportModel.cpp b/module-apps/application-settings/models/network/SimContactsImportModel.cpp
index 00b1358bd..220023686 100644
--- a/module-apps/application-settings/models/network/SimContactsImportModel.cpp
+++ b/module-apps/application-settings/models/network/SimContactsImportModel.cpp
@@ -5,6 +5,7 @@
 
 #include <application-settings/widgets/network/SimContactImportSelectWidget.hpp>
 #include <ListView.hpp>
+#include <AppWindow.hpp>
 
 SimContactsImportModel::SimContactsImportModel(app::ApplicationCommon *app,
                                                std::unique_ptr<AbstractSimContactsRepository> contactsRepository)
diff --git a/module-apps/application-settings/models/system/DateAndTimeModel.cpp b/module-apps/application-settings/models/system/DateAndTimeModel.cpp
index b381bd4c6..3563f6344 100644
--- a/module-apps/application-settings/models/system/DateAndTimeModel.cpp
+++ b/module-apps/application-settings/models/system/DateAndTimeModel.cpp
@@ -8,6 +8,7 @@
 
 #include <ListView.hpp>
 #include <widgets/DateAndTimeStyle.hpp>
+#include <AppWindow.hpp>
 
 DateAndTimeModel::DateAndTimeModel(app::ApplicationCommon *application) : app(application)
 {}
diff --git a/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp b/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp
index 34450e3c7..70ec1bf81 100644
--- a/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp
+++ b/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp
@@ -3,6 +3,7 @@
 
 #include "ColorTestListItem.hpp"
 #include "ColorTestListStyle.hpp"
+#include <Label.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp b/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp
index fd075b4e4..ea0238bce 100644
--- a/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp
+++ b/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp
@@ -5,6 +5,7 @@
 
 #include <application-settings/models/advanced/ColorTestModel.hpp>
 #include <application-settings/widgets/advanced/ColorTestListView.hpp>
+#include <AppWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp
index 0c7979377..afb3b785a 100644
--- a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp
+++ b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <application-settings/models/bluetooth/BluetoothSettingsModel.hpp>
+#include <AppWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp b/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp
index fdd5c0718..5e9006e3e 100644
--- a/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp
+++ b/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp
@@ -4,6 +4,7 @@
 
 #include <application-settings/models/bluetooth/BluetoothSettingsModel.hpp>
 #include <Text.hpp>
+#include <AppWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp
index a72de5bcb..572668cd0 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp
@@ -158,11 +158,10 @@ namespace gui
                 quoteModel->edit(quoteData);
             }
 
-            auto backToOptionWindow = 1;
-            auto backToMainWindow   = 2;
-
-            auto windowToBack = quoteAction == QuoteAction::Add ? backToOptionWindow : backToMainWindow;
-            application->returnToPreviousWindow(windowToBack);
+            if (quoteAction != QuoteAction::Add) {
+                application->switchWindow(gui::name::window::main_window);
+            }
+            application->returnToPreviousWindow();
         }
 
         return AppWindow::onInput(inputEvent);
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp
index 3bb324feb..b8e08a066 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp
@@ -47,9 +47,8 @@ namespace gui
                                         utils::translate("app_settings_display_wallpaper_quotes_delete_confirmation"),
                                         "",
                                         [this]() {
-                                            auto backToQuotesMainWindow = 2;
                                             quotesModel->remove(quote);
-                                            application->returnToPreviousWindow(backToQuotesMainWindow);
+                                            application->switchWindow(gui::name::window::main_window);
                                             return true;
                                         }});
                 application->switchWindow(
diff --git a/module-apps/application-settings/windows/network/NewApnWindow.hpp b/module-apps/application-settings/windows/network/NewApnWindow.hpp
index 06b915782..83644d52e 100644
--- a/module-apps/application-settings/windows/network/NewApnWindow.hpp
+++ b/module-apps/application-settings/windows/network/NewApnWindow.hpp
@@ -8,6 +8,7 @@
 
 #include <ListView.hpp>
 #include <Text.hpp>
+#include <AppWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp b/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp
index 390ce0805..665388de5 100644
--- a/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp
+++ b/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp
@@ -5,6 +5,7 @@
 
 #include <application-settings/models/system/DateAndTimeModel.hpp>
 #include <application-settings/windows/WindowNames.hpp>
+#include <AppWindow.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-special-input/ApplicationSpecialInput.cpp b/module-apps/application-special-input/ApplicationSpecialInput.cpp
index 71449f1e6..192cd10c3 100644
--- a/module-apps/application-special-input/ApplicationSpecialInput.cpp
+++ b/module-apps/application-special-input/ApplicationSpecialInput.cpp
@@ -9,7 +9,7 @@ using namespace app;
 
 namespace
 {
-    constexpr auto SpecialInputAppStackDepth = 2048U;
+    constexpr auto SpecialInputAppStackDepth = 2200;
 } // namespace
 
 ApplicationSpecialInput::ApplicationSpecialInput(std::string name,
@@ -26,8 +26,6 @@ ApplicationSpecialInput::ApplicationSpecialInput(std::string name,
     windowsFactory.attach(app::char_select, [](ApplicationCommon *app, const std::string &name) {
         return std::make_unique<gui::SpecialInputMainWindow>(app);
     });
-
-    setActiveWindow(app::char_select);
 }
 
 sys::MessagePointer ApplicationSpecialInput::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
diff --git a/module-apps/apps-common/AppStartupReason.hpp b/module-apps/apps-common/AppStartupReason.hpp
new file mode 100644
index 000000000..39b67228c
--- /dev/null
+++ b/module-apps/apps-common/AppStartupReason.hpp
@@ -0,0 +1,14 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+namespace app
+{
+    enum class StartupReason
+    {
+        Launch,   // Default startup causing application MainWindow to be added to stack.
+        OnAction, // Switch to application  was caused by action. Enum is used to prevent called applications to
+        // switch to main window on application switch and allow declared handler to switch to desired window.
+    };
+}
diff --git a/module-apps/apps-common/AppSwitchReason.hpp b/module-apps/apps-common/AppSwitchReason.hpp
new file mode 100644
index 000000000..ea72b4565
--- /dev/null
+++ b/module-apps/apps-common/AppSwitchReason.hpp
@@ -0,0 +1,13 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+namespace app
+{
+    enum class SwitchReason
+    {
+        SwitchRequest,
+        PhoneLock,
+        Popup
+    };
+}
diff --git a/module-apps/apps-common/ApplicationCommon.cpp b/module-apps/apps-common/ApplicationCommon.cpp
index bfd1f86f9..f9ddb8c0b 100644
--- a/module-apps/apps-common/ApplicationCommon.cpp
+++ b/module-apps/apps-common/ApplicationCommon.cpp
@@ -6,8 +6,10 @@
 #include "GuiTimer.hpp"            // for GuiTimer
 #include "Item.hpp"                // for Item
 #include "MessageType.hpp"         // for MessageType
+#include "Service/Message.hpp"
 #include "Timers/TimerFactory.hpp" // for Timer
 #include "StatusBar.hpp"
+#include "service-db/DBNotificationMessage.hpp"
 #include "status-bar/Time.hpp"
 #include "Translator.hpp" // for KeyInputSim...
 #include <EventStore.hpp> // for Battery
@@ -16,6 +18,7 @@
 #include <log/debug.hpp>                 // for DEBUG_APPLI...
 #include <log/log.hpp>                   // for LOG_INFO
 #include "messages/AppMessage.hpp"       // for AppSwitchMe...
+#include "messages/AppSwitchWindowPopupMessage.hpp"
 #include "service-appmgr/Controller.hpp" // for Controller
 #include "actions/AlarmClockStatusChangeParams.hpp"
 #include <service-cellular-api>
@@ -35,32 +38,21 @@
 #include <iterator>    // for distance, next
 #include <type_traits> // for add_const<>...
 #include <WindowsFactory.hpp>
+#include <WindowsStack.hpp>
+#include <WindowsPopupFilter.hpp>
 #include <service-gui/Common.hpp>
 #include <Utils.hpp>
 #include <service-db/Settings.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <service-audio/AudioServiceAPI.hpp> // for GetOutputVolume
 
-#include <popups/AlarmPopup.hpp>
-#include <popups/VolumeWindow.hpp>
-#include <popups/HomeModesWindow.hpp>
-#include <popups/TetheringPhoneModePopup.hpp>
-#include <popups/TetheringConfirmationPopup.hpp>
-#include <popups/PowerOffWindow.hpp>
-#include <popups/presenter/PowerOffPresenter.hpp>
-#include <popups/lock-popups/PhoneLockedWindow.hpp>
-#include <popups/lock-popups/PhoneLockedInfoWindow.hpp>
-#include <popups/lock-popups/PhoneLockInputWindow.hpp>
-#include <popups/lock-popups/PhoneLockChangeInfoWindow.hpp>
-#include <popups/lock-popups/SimLockInputWindow.hpp>
-#include <popups/lock-popups/SimInfoWindow.hpp>
-#include <popups/lock-popups/SimNotReadyWindow.hpp>
 #include <popups/data/PopupData.hpp>
 #include <popups/data/PopupRequestParams.hpp>
 #include <popups/data/AlarmPopupRequestParams.hpp>
 #include <popups/data/PhoneModeParams.hpp>
 #include <popups/data/BluetoothModeParams.hpp>
 #include <locks/data/LockData.hpp>
+#include <magic_enum.hpp>
 
 #if DEBUG_INPUT_EVENTS == 1
 #define debug_input_events(...) LOG_DEBUG(__VA_ARGS__)
@@ -114,12 +106,14 @@ namespace app
                                          uint32_t stackDepth,
                                          sys::ServicePriority priority)
         : Service(std::move(name), std::move(parent), stackDepth, priority),
-          default_window(gui::name::window::main_window), windowsStack(this),
+          popupFilter(std::make_unique<gui::popup::Filter>()), windowsStackImpl(std::make_unique<WindowsStack>()),
+          default_window(gui::name::window::main_window),
           keyTranslator{std::make_unique<gui::KeyInputSimpleTranslation>()}, startInBackground{startInBackground},
           callbackStorage{std::make_unique<CallbackStorage>()}, statusBarManager{std::make_unique<StatusBarManager>()},
           settings(std::make_unique<settings::Settings>()), statusIndicators{statusIndicators}, phoneLockSubject(this),
           lockPolicyHandler(this), simLockSubject(this)
     {
+        popupFilter->attachWindowsStack(windowsStackImpl.get());
         statusBarManager->enableIndicators({gui::status_bar::Indicator::Time});
 
         bus.channels.push_back(sys::BusChannel::ServiceCellularNotifications);
@@ -163,10 +157,7 @@ namespace app
             return actionHandled();
         });
         addActionReceiver(app::manager::actions::ShowPopup, [this](auto &&params) {
-            auto popupParams = static_cast<gui::PopupRequestParams *>(params.get());
-            if (const auto popupId = popupParams->getPopupId(); isPopupPermitted(popupId)) {
-                showPopup(popupId, popupParams);
-            }
+            actionPopupPush(std::forward<decltype(params)>(params));
             return actionHandled();
         });
         addActionReceiver(app::manager::actions::AbortPopup, [this](auto &&params) {
@@ -176,14 +167,16 @@ namespace app
             return actionHandled();
         });
         addActionReceiver(app::manager::actions::NotificationsChanged, [this](auto &&params) {
-            handleNotificationsChanged(std::move(params));
+            handleNotificationsChanged(std::forward<decltype(params)>(params));
             return actionHandled();
         });
+
+        registerPopupBlueprints();
     }
 
     ApplicationCommon::~ApplicationCommon() noexcept
     {
-        windowsStack.windows.clear();
+        windowsStack().clear();
     }
 
     ApplicationCommon::State ApplicationCommon::getState()
@@ -223,7 +216,7 @@ namespace app
 
     void ApplicationCommon::render(gui::RefreshModes mode)
     {
-        if (windowsStack.isEmpty()) {
+        if (windowsStack().isEmpty()) {
             LOG_ERROR("Current window is not defined");
             return;
         }
@@ -252,6 +245,16 @@ namespace app
     void ApplicationCommon::updateStatuses(gui::AppWindow *window) const
     {}
 
+    void ApplicationCommon::setDefaultWindow(const std::string &w)
+    {
+        default_window = w;
+    }
+
+    WindowsStack &ApplicationCommon::windowsStack() const
+    {
+        return *windowsStackImpl;
+    }
+
     void ApplicationCommon::updateCurrentWindow(std::unique_ptr<gui::SwitchData> data,
                                                 gui::ShowMode command,
                                                 gui::RefreshModes refreshMode)
@@ -290,36 +293,43 @@ namespace app
         }
     }
 
-    void ApplicationCommon::returnToPreviousWindow(const uint32_t times)
+    void ApplicationCommon::switchWindowPopup(const std::string &windowName,
+                                              const gui::popup::Disposition &d,
+                                              std::unique_ptr<gui::SwitchData> data,
+                                              SwitchReason reason)
     {
-        if (const auto prevWindow = getPrevWindow(times); prevWindow == gui::name::window::no_window) {
+        bus.sendUnicast(std::make_shared<AppSwitchWindowPopupMessage>(windowName, std::move(data), reason, d),
+                        this->GetName());
+    }
+
+    void ApplicationCommon::returnToPreviousWindow()
+    {
+        auto window = windowsStack().get(previousWindow);
+        if (not window) {
+            LOG_DEBUG("No window to back from - get to previous app");
             app::manager::Controller::switchBack(this);
+            return;
         }
-        else {
-            LOG_INFO("Back to previous window %s", prevWindow.c_str());
-            switchWindow(prevWindow, gui::ShowMode::GUI_SHOW_RETURN);
-        }
+        LOG_INFO("Back to previous window: %s", window->c_str());
+        windowsStack().pop(*window);
+        switchWindow(*window, gui::ShowMode::GUI_SHOW_RETURN);
     }
 
     void ApplicationCommon::popCurrentWindow()
     {
-        if (!windowsStack.stack.empty()) {
-            windowsStack.stack.pop_back();
-        }
+        windowsStack().pop();
     }
 
     void ApplicationCommon::popWindow(const std::string &window)
     {
-        auto popWindow = std::find(windowsStack.stack.begin(), windowsStack.stack.end(), window);
-        if (popWindow != windowsStack.stack.end()) {
-            windowsStack.stack.erase(popWindow);
-        }
+        windowsStack().drop(window);
     }
 
     void ApplicationCommon::refreshWindow(gui::RefreshModes mode)
     {
-        if (not windowsStack.isEmpty()) {
-            auto msg = std::make_shared<AppRefreshMessage>(mode, getCurrentWindow()->getName());
+        auto window = windowsStack().get(topWindow);
+        if (window) {
+            auto msg = std::make_shared<AppRefreshMessage>(mode, *window);
             bus.sendUnicast(msg, this->GetName());
         }
     }
@@ -408,7 +418,7 @@ namespace app
         else if (msg->getEvent().isShortRelease()) {
             longPressTimer.stop();
         }
-        if (not windowsStack.isEmpty() && getCurrentWindow()->onInput(msg->getEvent())) {
+        if (not windowsStack().isEmpty() && getCurrentWindow()->onInput(msg->getEvent())) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
         }
         return sys::msgHandled();
@@ -460,9 +470,9 @@ namespace app
 
             auto result = actionHandler(std::move(data));
 
-            if (getState() == State::ACTIVE_FORGROUND && windowsStack.isEmpty()) {
+            if (getState() == State::ACTIVE_FORGROUND && windowsStack().isEmpty()) {
                 LOG_ERROR("OnAction application switch with no window provided. Fallback to default mainWindow.");
-                setActiveWindow(gui::name::window::main_window);
+                pushWindow(default_window);
             }
 
             return result;
@@ -550,63 +560,80 @@ namespace app
     sys::MessagePointer ApplicationCommon::handleSwitchWindow(sys::Message *msgl)
     {
         auto msg = static_cast<AppSwitchWindowMessage *>(msgl);
-        // check if specified window is in the application
+        if (not windowsFactory.isRegistered(msg->getWindowName())) {
+            LOG_ERROR("No such window: %s", msg->getWindowName().c_str());
+            return sys::msgHandled();
+        }
+        auto switchData = std::move(msg->getData());
+        if (switchData && switchData->ignoreCurrentWindowOnStack) {
+            windowsStack().pop();
+        }
+        auto anotherWindowOnTop = (not isCurrentWindow(msg->getWindowName())) and (not windowsStack().isEmpty());
+        if (anotherWindowOnTop) {
+            auto closeReason = gui::Window::CloseReason::WindowSwitch;
+            switch (msg->getReason()) {
+            case SwitchReason::PhoneLock:
+                closeReason = gui::Window::CloseReason::PhoneLock;
+                break;
+            case SwitchReason::Popup:
+                closeReason = gui::Window::CloseReason::Popup;
+                break;
+            default:
+                break;
+            }
+            getCurrentWindow()->onClose(closeReason);
+        }
 
-        if (windowsFactory.isRegistered(msg->getWindowName())) {
-            auto switchData = std::move(msg->getData());
-            if (switchData && switchData->ignoreCurrentWindowOnStack) {
-                popToWindow(getPrevWindow());
-            }
-            if (!isCurrentWindow(msg->getWindowName())) {
-                if (!windowsStack.isEmpty()) {
-                    auto closeReason = gui::Window::CloseReason::WindowSwitch;
-                    switch (msg->getReason()) {
-                    case SwitchReason::PhoneLock:
-                        closeReason = gui::Window::CloseReason::PhoneLock;
-                        break;
-                    case SwitchReason::Popup:
-                        closeReason = gui::Window::CloseReason::Popup;
-                        break;
-                    default:
-                        break;
-                    }
-                    getCurrentWindow()->onClose(closeReason);
-                }
-                setActiveWindow(msg->getWindowName());
-            }
-            LOG_DEBUG("Current window: %s vs %s", getCurrentWindow()->getName().c_str(), msg->getWindowName().c_str());
-            getCurrentWindow()->handleSwitchData(switchData.get());
+        LOG_DEBUG("Current window: %s vs %s", getCurrentWindow()->getName().c_str(), msg->getWindowName().c_str());
+        const auto &[name, data] = msg->getSwitchData();
+        pushWindow(name, data);
+        getCurrentWindow()->handleSwitchData(switchData.get());
 
-            auto ret = dynamic_cast<gui::SwitchSpecialChar *>(switchData.get());
-            if (ret != nullptr && ret->type == gui::SwitchSpecialChar::Type::Response) {
-                auto text = dynamic_cast<gui::Text *>(getCurrentWindow()->getFocusItem());
-                if (text != nullptr) {
-                    text->addText(ret->getDescription());
-                    refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
-                    return sys::msgHandled();
-                }
-            }
-            getCurrentWindow()->onBeforeShow(msg->getCommand(), switchData.get());
+        if (handleUpdateTextRefresh(switchData.get())) {
+            return sys::msgHandled();
+        }
+        getCurrentWindow()->onBeforeShow(msg->getCommand(), switchData.get());
+
+        /// This is kind of gentle hack on our stateless Application Window management switching
+        /// if we are not requesting for popup and we cant handle next popup - just refresh the window
+        /// else -> popup will refresh it for us
+        if (not tryShowPopup()) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_DEEP);
         }
-        else {
-            LOG_ERROR("No such window: %s", msg->getWindowName().c_str());
-        }
         return sys::msgHandled();
     }
 
+    bool ApplicationCommon::handleUpdateTextRefresh(gui::SwitchData *data)
+    {
+        auto ret = dynamic_cast<gui::SwitchSpecialChar *>(data);
+        if (ret != nullptr && ret->type == gui::SwitchSpecialChar::Type::Response) {
+            auto text = dynamic_cast<gui::Text *>(getCurrentWindow()->getFocusItem());
+            if (text != nullptr) {
+                text->addText(ret->getDescription());
+                refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
+                return true;
+            }
+        }
+        return false;
+    }
+
     sys::MessagePointer ApplicationCommon::handleUpdateWindow(sys::Message *msgl)
     {
         auto msg = static_cast<AppUpdateWindowMessage *>(msgl);
-
-        if (windowsFactory.isRegistered(msg->getWindowName()) && isCurrentWindow(msg->getWindowName())) {
+        auto haveBuilder = windowsFactory.isRegistered(msg->getWindowName());
+        auto window      = isCurrentWindow(msg->getWindowName());
+        if (haveBuilder && window) {
             const auto &switchData = msg->getData();
             getCurrentWindow()->handleSwitchData(switchData.get());
             getCurrentWindow()->onBeforeShow(msg->getCommand(), switchData.get());
             refreshWindow(msg->getRefreshMode());
         }
         else {
-            LOG_ERROR("No such window: %s", msg->getWindowName().c_str());
+            LOG_ERROR("cant update window: %s in app: %s, params: haveBuilder: %s is_on_top: %s",
+                      msg->getWindowName().c_str(),
+                      GetName().c_str(),
+                      haveBuilder ? "yes" : "no",
+                      window ? "yes" : "no");
         }
         return sys::msgHandled();
     }
@@ -615,7 +642,7 @@ namespace app
     {
         setState(State::DEACTIVATING);
 
-        for (const auto &[windowName, window] : windowsStack) {
+        for (const auto &[windowName, window] : windowsStack()) {
             LOG_INFO("Closing a window: %s", windowName.c_str());
             window->onClose(gui::Window::CloseReason::ApplicationClose);
         }
@@ -643,10 +670,7 @@ namespace app
     sys::MessagePointer ApplicationCommon::handleAppRebuild(sys::Message *msgl)
     {
         LOG_INFO("Application %s rebuilding gui", GetName().c_str());
-        for (auto &[name, window] : windowsStack) {
-            LOG_DEBUG("Rebuild: %s", name.c_str());
-            windowsStack.windows[name] = windowsFactory.build(this, name);
-        }
+        windowsStack().rebuildWindows(windowsFactory, this);
         LOG_INFO("Refresh app with focus!");
         if (state == State::ACTIVE_FORGROUND) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_DEEP);
@@ -659,19 +683,21 @@ namespace app
     {
         auto *msg = static_cast<AppRefreshMessage *>(msgl);
         assert(msg);
-        if (windowsStack.isEmpty() || (getCurrentWindow()->getName() != msg->getWindowName())) {
+        if (windowsStack().isEmpty() || (getCurrentWindow()->getName() != msg->getWindowName())) {
             LOG_DEBUG("Ignore request for window %s we are on window %s",
                       msg->getWindowName().c_str(),
-                      windowsStack.isEmpty() ? "none" : getCurrentWindow()->getName().c_str());
+                      windowsStack().isEmpty() ? "none" : getCurrentWindow()->getName().c_str());
             return sys::msgNotHandled();
         }
+        LOG_DEBUG("rendering! %s", msg->getWindowName().c_str());
+
         render(msg->getMode());
         return sys::msgHandled();
     }
 
     sys::MessagePointer ApplicationCommon::handleGetDOM(sys::Message *msgl)
     {
-        if (windowsStack.isEmpty()) {
+        if (windowsStack().isEmpty()) {
             LOG_ERROR("Current window is not defined - can't dump DOM");
             return sys::msgNotHandled();
         }
@@ -724,15 +750,10 @@ namespace app
         settings->deinit();
         LOG_INFO("Closing an application: %s", GetName().c_str());
         LOG_INFO("Deleting windows");
-        windowsStack.windows.clear();
+        windowsStack().clear();
         return sys::ReturnCodes::Success;
     }
 
-    void ApplicationCommon::setActiveWindow(const std::string &windowName)
-    {
-        pushWindow(windowName);
-    }
-
     bool ApplicationCommon::adjustCurrentVolume(const int step)
     {
         return AudioServiceAPI::KeyPressed(this, step);
@@ -799,243 +820,116 @@ namespace app
         sender->bus.sendUnicast(msg, application);
     }
 
-    void ApplicationCommon::handlePhoneModeChanged(sys::phone_modes::PhoneMode mode)
+    void ApplicationCommon::actionPopupPush(std::unique_ptr<gui::SwitchData> params)
     {
-        auto flightModeSetting = settings->getValue(settings::Cellular::offlineMode, settings::SettingsScope::Global);
-        bool flightMode        = flightModeSetting == "1" ? true : false;
-
-        using namespace gui::popup;
-        const auto &popupName = resolveWindowName(gui::popup::ID::PhoneModes);
-        if (const auto currentWindowName = getCurrentWindow()->getName(); currentWindowName == popupName) {
-            updateCurrentWindow(std::make_unique<gui::ModesPopupData>(mode, flightMode));
+        auto rdata = dynamic_cast<gui::PopupRequestParams *>(params.get());
+        if (rdata == nullptr) {
+            assert(0 && "invalid popup data received");
+            return;
         }
-        else {
-            switchWindow(popupName, std::make_unique<gui::ModesPopupData>(mode, flightMode));
+        // two lines below is to **not** loose data on copy on dynamic_cast, but to move the data
+        (void)params.release();
+        auto data      = std::unique_ptr<gui::PopupRequestParams>(rdata);
+        auto id        = data->getPopupId();
+        auto blueprint = popupBlueprint.getBlueprint(id);
+        if (!blueprint) {
+            LOG_ERROR("no blueprint to handle %s popup - fallback", std::string(magic_enum::enum_name(id)).c_str());
+            blueprint = popupBlueprintFallback(id);
         }
+        auto request = gui::popup::Request(id, std::move(data), *blueprint);
+        windowsPopupQueue->pushRequest(std::move(request));
+        tryShowPopup();
     }
 
-    void ApplicationCommon::handleVolumeChanged(audio::Volume volume, audio::Context context)
+    gui::popup::Filter &ApplicationCommon::getPopupFilter() const
     {
-        using namespace gui::popup;
-        const auto popupName = resolveWindowName(gui::popup::ID::Volume);
-        if (const auto currentWindowName = getCurrentWindow()->getName(); currentWindowName == popupName) {
-            updateCurrentWindow(std::make_unique<gui::VolumePopupData>(volume, context));
-        }
-        else {
-            switchWindow(popupName, std::make_unique<gui::VolumePopupData>(volume, context));
-        }
+        return *popupFilter;
     }
 
-    void ApplicationCommon::attachPopups(const std::vector<gui::popup::ID> &popupsList)
+    bool ApplicationCommon::tryShowPopup()
     {
-        using namespace gui::popup;
-        for (auto popup : popupsList) {
-            switch (popup) {
-            case ID::Volume:
-                windowsFactory.attach(window::volume_window, [](ApplicationCommon *app, const std::string &name) {
-                    return std::make_unique<gui::VolumeWindow>(app, window::volume_window);
-                });
-                break;
-            case ID::Tethering:
-            case ID::TetheringPhoneModeChangeProhibited:
-                windowsFactory.attach(window::tethering_confirmation_window,
-                                      [](ApplicationCommon *app, const std::string &name) {
-                                          return std::make_unique<gui::TetheringConfirmationPopup>(
-                                              app, window::tethering_confirmation_window);
-                                      });
-                windowsFactory.attach(window::tethering_phonemode_change_window,
-                                      [](ApplicationCommon *app, const std::string &name) {
-                                          return std::make_unique<gui::TetheringPhoneModePopup>(
-                                              app, window::tethering_phonemode_change_window);
-                                      });
-                break;
-            case ID::PhoneModes:
-                windowsFactory.attach(window::phone_modes_window, [](ApplicationCommon *app, const std::string &name) {
-                    return std::make_unique<gui::HomeModesWindow>(app, window::phone_modes_window);
-                });
-                break;
-            case ID::Brightness:
-                break;
-            case ID::PhoneLock:
-            case ID::PhoneLockInput:
-            case ID::PhoneLockInfo:
-            case ID::PhoneLockChangeInfo:
-                windowsFactory.attach(window::phone_lock_window, [](ApplicationCommon *app, const std::string &name) {
-                    return std::make_unique<gui::PhoneLockedWindow>(app, window::phone_lock_window);
-                });
-                windowsFactory.attach(
-                    window::phone_lock_info_window, [](ApplicationCommon *app, const std::string &name) {
-                        return std::make_unique<gui::PhoneLockedInfoWindow>(app, window::phone_lock_info_window);
-                    });
-                windowsFactory.attach(
-                    window::phone_lock_input_window, [](ApplicationCommon *app, const std::string &name) {
-                        return std::make_unique<gui::PhoneLockInputWindow>(app, window::phone_lock_input_window);
-                    });
-                windowsFactory.attach(window::phone_lock_change_info_window,
-                                      [](ApplicationCommon *app, const std::string &name) {
-                                          return std::make_unique<gui::PhoneLockChangeInfoWindow>(
-                                              app, window::phone_lock_change_info_window);
-                                      });
-                windowsFactory.attach(window::power_off_window, [](ApplicationCommon *app, const std::string &name) {
-                    auto presenter = std::make_unique<gui::PowerOffPresenter>(app);
-                    return std::make_unique<gui::PowerOffWindow>(app, std::move(presenter));
-                });
-                break;
-            case ID::SimLock:
-            case ID::SimInfo:
-            case ID::SimNotReady:
-                windowsFactory.attach(window::sim_unlock_window, [](ApplicationCommon *app, const std::string &name) {
-                    return std::make_unique<gui::SimLockInputWindow>(app, window::sim_unlock_window);
-                });
-                windowsFactory.attach(window::sim_info_window, [](ApplicationCommon *app, const std::string &name) {
-                    return std::make_unique<gui::SimInfoWindow>(app, window::sim_info_window);
-                });
-                windowsFactory.attach(
-                    window::sim_not_ready_window, [](ApplicationCommon *app, const std::string &name) {
-                        return std::make_unique<gui::SimNotReadyWindow>(app, window::sim_not_ready_window);
-                    });
-                break;
-            case ID::Alarm:
-                windowsFactory.attach(window::alarm_window, [](ApplicationCommon *app, const std::string &name) {
-                    auto presenter = std::make_shared<popup::AlarmPopupPresenter>(app);
-                    return std::make_unique<gui::AlarmPopup>(app, window::alarm_window, presenter);
-                });
-            default:
-                break;
+        auto request = windowsPopupQueue->popRequest(getPopupFilter());
+        if (request) {
+            auto popup = std::string(magic_enum::enum_name(request->getPopupParams().getPopupId()));
+            LOG_DEBUG("handling popup: %s", popup.c_str());
+            /// request handle actually switches window to popup window
+            auto retval = request->handle();
+            if (not retval) {
+                LOG_ERROR("Popup %s handling failure, please check registered blueprint!", popup.c_str());
             }
+            return retval;
+            LOG_ERROR("no blueprint for popup: %s", popup.c_str());
         }
-    }
-
-    void ApplicationCommon::showPopup(gui::popup::ID id, const gui::PopupRequestParams *params)
-    {
-        using namespace gui::popup;
-        if (id == ID::PhoneModes) {
-            auto popupParams = static_cast<const gui::PhoneModePopupRequestParams *>(params);
-            handlePhoneModeChanged(popupParams->getPhoneMode());
-        }
-        else if (id == ID::Volume) {
-            auto volumeParams = static_cast<const gui::VolumePopupRequestParams *>(params);
-            LOG_INFO("Playback: %s, volume: %s",
-                     audio::str(volumeParams->getAudioContext().second).c_str(),
-                     std::to_string(volumeParams->getVolume()).c_str());
-            handleVolumeChanged(volumeParams->getVolume(), volumeParams->getAudioContext());
-        }
-        else if (id == ID::PhoneLock) {
-            switchWindow(
-                gui::popup::resolveWindowName(id), gui::ShowMode::GUI_SHOW_INIT, nullptr, SwitchReason::PhoneLock);
-        }
-        else if (id == ID::PhoneLockInput || id == ID::PhoneLockChangeInfo) {
-            auto popupParams = static_cast<const gui::PhoneUnlockInputRequestParams *>(params);
-
-            switchWindow(
-                gui::popup::resolveWindowName(id),
-                std::make_unique<locks::LockData>(popupParams->getLock(), popupParams->getPhoneLockInputTypeAction()));
-        }
-        else if (id == ID::SimLock || id == ID::SimInfo) {
-            auto popupParams = static_cast<const gui::SimUnlockInputRequestParams *>(params);
-
-            switchWindow(gui::popup::resolveWindowName(id),
-                         std::make_unique<locks::SimLockData>(popupParams->getLock(),
-                                                              popupParams->getSimInputTypeAction(),
-                                                              popupParams->getErrorCode()));
-        }
-        else if (id == ID::Alarm) {
-            auto popupParams =
-                const_cast<gui::AlarmPopupRequestParams *>(static_cast<const gui::AlarmPopupRequestParams *>(params));
-            switchWindow(gui::popup::resolveWindowName(id),
-                         std::make_unique<gui::AlarmPopupRequestParams>(popupParams));
-        }
-        else {
-            switchWindow(gui::popup::resolveWindowName(id), gui::ShowMode::GUI_SHOW_INIT, nullptr, SwitchReason::Popup);
-        }
+        return false;
     }
 
     void ApplicationCommon::abortPopup(gui::popup::ID id)
     {
         const auto popupName = gui::popup::resolveWindowName(id);
-
-        if (getCurrentWindow()->getName() == popupName) {
-            returnToPreviousWindow();
-        }
-        else {
-            popWindow(popupName);
-        }
+        LOG_INFO("abort popup: %s from window %s", popupName.c_str(), getCurrentWindow()->getName().c_str());
+        windowsStack().pop(popupName);
+        returnToPreviousWindow();
     }
 
-    bool ApplicationCommon::isPopupPermitted([[maybe_unused]] gui::popup::ID popupId) const
+    bool ApplicationCommon::userInterfaceDBNotification([[maybe_unused]] sys::Message *msg,
+                                                        [[maybe_unused]] const UiNotificationFilter &filter)
     {
-        return true;
-    }
-
-    bool ApplicationCommon::popToWindow(const std::string &window)
-    {
-        if (window == gui::name::window::no_window) {
-            bool ret = false;
-            if (windowsStack.stack.size() <= 1) {
-                windowsStack.stack.clear();
-                ret = true;
+        bool handled = false;
+        for (const auto &[name, window] : windowsStack()) {
+            if (filter == nullptr || (filter != nullptr && filter(msg, window->getName()))) {
+                handled |= window->onDatabaseMessage(msg);
             }
-            return ret;
         }
-
-        auto ret = std::find(windowsStack.stack.begin(), windowsStack.stack.end(), window);
-        if (ret != windowsStack.stack.end()) {
-            LOG_INFO("Pop last window(s) [%d] :  %s",
-                     static_cast<int>(std::distance(ret, windowsStack.stack.end())),
-                     ret->c_str());
-            windowsStack.stack.erase(std::next(ret), windowsStack.stack.end());
-            LOG_INFO("Curent window... %s vs %s", ret->c_str(), windowsStack.stack.back().c_str());
-            return true;
-        }
-        return false;
+        return handled;
     }
 
-    void ApplicationCommon::pushWindow(const std::string &newWindow)
+    void ApplicationCommon::pushWindow(const std::string &newWindow, const gui::popup::Disposition &d)
     {
         // handle if window was already on
-        LOG_DEBUG("App: %s window %s request", GetName().c_str(), newWindow.c_str());
-        if (popToWindow(newWindow)) {
+        LOG_INFO("App: %s window %s request", GetName().c_str(), newWindow.c_str());
+        if (newWindow.empty() && windowsStack().popLastWindow()) {
+            LOG_INFO("Empty window request!");
             return;
         }
-        else {
-            windowsStack.push(newWindow, windowsFactory.build(this, newWindow));
+        if (windowsStack().pop(newWindow)) {
+            LOG_INFO("Get back to window!");
+            return;
         }
-#if DEBUG_APPLICATION_MANAGEMENT == 1
-        LOG_DEBUG("[%d] newWindow: %s", (int)windowsStack.stack.size(), newWindow.c_str());
-        for (auto &el : windowsStack.stack) {
-            LOG_DEBUG("-> %s", el.c_str());
-        }
-#endif
-    };
+        LOG_INFO("Create window for stack: %s", newWindow.c_str());
+        windowsStack().push(newWindow, windowsFactory.build(this, newWindow), d);
+    }
 
-    const std::string ApplicationCommon::getPrevWindow(uint32_t count) const
+    std::optional<std::string> ApplicationCommon::getPrevWindow(uint32_t count) const
     {
-        if (this->windowsStack.stack.size() <= 1 || count > this->windowsStack.stack.size()) {
-            return gui::name::window::no_window;
-        }
-        return *std::prev(windowsStack.stack.end(), count + 1);
+        return windowsStack().get(count);
     }
 
     gui::AppWindow *ApplicationCommon::getCurrentWindow()
     {
-        if (windowsStack.stack.size() == 0) {
-            windowsStack.push(default_window, windowsFactory.build(this, default_window));
+        if (windowsStack().isEmpty()) {
+            windowsStack().push(default_window, windowsFactory.build(this, default_window));
         }
-        /// TODO handle nullptr? if not found on stack -> return default
-        return windowsStack.get(windowsStack.stack.back());
+        auto windowname = windowsStack().get(topWindow);
+        auto window     = windowsStack().get(*windowname);
+        if (windowname != window->getName()) {
+            LOG_FATAL("Factory vs Builtin name mismatch ! %s vs %s", windowname->c_str(), window->getName().c_str());
+            window->setName(*windowname);
+        }
+        return window;
     }
 
     bool ApplicationCommon::isCurrentWindow(const std::string &windowName) const noexcept
     {
-        if (windowsStack.isEmpty()) {
-            return false;
+        if (const auto &window = windowsStack().get(windowName); window != nullptr) {
+            return window->getName() == windowName;
         }
-        return windowsStack.stack.back() == windowName;
+        LOG_ERROR("no window: %s", windowName.c_str());
+        return false;
     }
 
     gui::AppWindow *ApplicationCommon::getWindow(const std::string &name)
     {
-        return windowsStack.get(name);
+        return windowsStack().get(name);
     }
 
     void ApplicationCommon::connect(GuiTimer *timer, gui::Item *item)
diff --git a/module-apps/apps-common/ApplicationCommon.hpp b/module-apps/apps-common/ApplicationCommon.hpp
index 03f035bc7..144e9f712 100644
--- a/module-apps/apps-common/ApplicationCommon.hpp
+++ b/module-apps/apps-common/ApplicationCommon.hpp
@@ -33,13 +33,22 @@
 #include <locks/handlers/SimLockSubject.hpp>
 #include <locks/handlers/LockPolicyHandler.hpp>
 #include "WindowsFactory.hpp"
-#include "WindowsStack.hpp"
+#include "WindowsPopupQueue.hpp"
+#include "PopupBlueprintFactory.hpp"
+#include "AppSwitchReason.hpp"
+#include "AppStartupReason.hpp"
 
 namespace app
 {
     class WindowsStack;
-
+    using UiNotificationFilter = std::function<bool(sys::Message *, const std::string &name)>;
 } // namespace app
+
+namespace db
+{
+    class NotificationMessage;
+}
+
 namespace gui
 {
     class AppWindow;
@@ -47,6 +56,10 @@ namespace gui
     class Item;
     class PopupRequestParams;
     class KeyInputSimpleTranslation;
+    namespace popup
+    {
+        class Filter;
+    }
 } // namespace gui
 namespace settings
 {
@@ -71,20 +84,6 @@ namespace app
         Failure
     };
 
-    enum class StartupReason
-    {
-        Launch,   // Default startup causing application MainWindow to be added to stack.
-        OnAction, // Switch to application  was caused by action. Enum is used to prevent called applications to
-        // switch to main window on application switch and allow declared handler to switch to desired window.
-    };
-
-    enum class SwitchReason
-    {
-        SwitchRequest,
-        PhoneLock,
-        Popup
-    };
-
     struct StartInBackground
     {
         StartInBackground(bool _value) : value{_value}
@@ -181,8 +180,12 @@ namespace app
         virtual sys::MessagePointer handleSwitchWindow(sys::Message *msgl);
         virtual sys::MessagePointer handleAppFocusLost(sys::Message *msgl);
         virtual void updateStatuses(gui::AppWindow *window) const;
+        void setDefaultWindow(const std::string &w);
 
       private:
+        std::unique_ptr<gui::popup::Filter> popupFilter;
+        std::unique_ptr<WindowsStack> windowsStackImpl;
+        WindowsStack &windowsStack() const;
         std::string default_window;
         State state = State::DEACTIVATED;
 
@@ -194,16 +197,23 @@ namespace app
         sys::MessagePointer handleAction(sys::Message *msgl);
         sys::MessagePointer handleApplicationSwitchLaunch(sys::Message *msgl);
         sys::MessagePointer handleApplicationSwitchOnAction(sys::Message *msgl);
+        /// this method filters out:
+        /// 1. refresh for windows we do not have builder
+        /// 2. refresh for windows which are not on top (to avoid building things we do not want to show
+        ///    i.e. due to delayed refresh
         sys::MessagePointer handleUpdateWindow(sys::Message *msgl);
+        bool handleUpdateTextRefresh(gui::SwitchData *data);
         sys::MessagePointer handleAppRebuild(sys::Message *msgl);
         sys::MessagePointer handleAppRefresh(sys::Message *msgl);
         sys::MessagePointer handleGetDOM(sys::Message *msgl);
         sys::MessagePointer handleSimStateUpdateMessage(sys::Message *msgl);
 
-        virtual bool isPopupPermitted(gui::popup::ID popupId) const;
-
         std::list<std::unique_ptr<app::GuiTimer>> gui_timers;
         std::unordered_map<manager::actions::ActionId, OnActionReceived> receivers;
+        void switchWindowPopup(const std::string &windowName,
+                               const gui::popup::Disposition &disposition,
+                               std::unique_ptr<gui::SwitchData> data = nullptr,
+                               SwitchReason reason                   = SwitchReason::SwitchRequest);
 
       public:
         sys::TimerHandle longPressTimer;
@@ -236,7 +246,6 @@ namespace app
 
         /// Method sending switch command for another window. It will switch window within active application.
         /// To switch windows between applications use app::manager::Controller::switchApplication
-        /// it will effectively trigger setActiveWindow and change on windows stack
         ///
         /// @param windowName name of window to show, only required parameter, our windows stack uses string names as
         /// id's
@@ -258,8 +267,8 @@ namespace app
         };
 
         /// Method used to go back to desired window by using the index difference on stack value
-        ///@param ignoredWindowsNumber: defines how many windows will be skipped while going back on stack
-        void returnToPreviousWindow(const uint32_t times = 1);
+        /// @param ignoredWindowsNumber: defines how many windows will be skipped while going back on stack
+        [[deprecated]] void returnToPreviousWindow();
 
         /// Find and pop window from stack by window name
         void popWindow(const std::string &window);
@@ -288,12 +297,6 @@ namespace app
         /// Called upon Application exit and/or termination request.
         sys::ReturnCodes DeinitHandler() override;
 
-        /// function to set active window for application
-        /// if none window is selected main window is used
-        /// if window name is "LastWindow" then previous window is selected
-        /// it modifies windows stack
-        void setActiveWindow(const std::string &windowName);
-
         /// see suspendInProgress documentation
         virtual void setSuspendFlag(bool val)
         {
@@ -344,40 +347,36 @@ namespace app
 
       protected:
         void longPressTimerCallback();
+        /// Method to register all possible popups to handle in application
+        virtual void registerPopupBlueprints();
+        /// fallback method  to get popup if none is added
+        std::optional<gui::popup::Blueprint> popupBlueprintFallback(gui::popup::ID id);
         /// Method used to register all windows and widgets in application
         virtual void createUserInterface() = 0;
         /// Method closing application's windows.
         virtual void destroyUserInterface() = 0;
 
-        /// Handle the change of phone mode and tethering mode
-        /// @param mode new phone mode
-        /// @param tethering new tethering mode
-        void handlePhoneModeChanged(sys::phone_modes::PhoneMode mode);
-
-        /// Handles volume changed event
-        /// @param volume current volume level
-        /// @param context audio context which contains current profile and playback
-        void handleVolumeChanged(audio::Volume volume, audio::Context context);
-
         /// @ingrup AppWindowStack
-        WindowsStack windowsStack;
         WindowsFactory windowsFactory;
+        std::unique_ptr<WindowsPopupQueue> windowsPopupQueue = std::make_unique<WindowsPopupQueue>();
+        PopupBlueprintFactory popupBlueprint;
 
         /// Method used to attach popups windows to application
-        virtual void attachPopups(const std::vector<gui::popup::ID> &popupsList);
-        virtual void showPopup(gui::popup::ID id, const gui::PopupRequestParams *params);
+        virtual void attachPopups(const std::vector<gui::popup::ID> &popupsList) = 0;
+        virtual void actionPopupPush(std::unique_ptr<gui::SwitchData> params);
+        virtual bool tryShowPopup();
         void abortPopup(gui::popup::ID id);
 
+        bool userInterfaceDBNotification(sys::Message *msg, const UiNotificationFilter &filter = nullptr);
+        virtual gui::popup::Filter &getPopupFilter() const;
+
       public:
-        /// @ingrup AppWindowStack
-        /// get to the first time we entered this &window
-        bool popToWindow(const std::string &window);
         /// push window to the top of windows stack
         /// @ingrup AppWindowStack
-        void pushWindow(const std::string &newWindow);
+        void pushWindow(const std::string &newWindow, const gui::popup::Disposition &d = gui::popup::WindowDisposition);
         /// getter for previous window name
         /// @ingrup AppWindowStack
-        const std::string getPrevWindow(uint32_t count = 1) const;
+        std::optional<std::string> getPrevWindow(uint32_t count = 1) const;
         /// clears windows stack
         /// @ingrup AppWindowStack
         void cleanPrevWindw();
@@ -385,8 +384,10 @@ namespace app
         /// if there is none - returns default window
         /// @ingrup AppWindowStack
         gui::AppWindow *getCurrentWindow();
+        /// @ingrup AppWindowStack
         bool isCurrentWindow(const std::string &windowName) const noexcept;
 
+        /// @ingrup AppWindowStack
         gui::AppWindow *getWindow(const std::string &name);
         /// to avoid conflicts with connect below
         using Service::connect;
diff --git a/module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp b/module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp
new file mode 100644
index 000000000..558240c8a
--- /dev/null
+++ b/module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp
@@ -0,0 +1,127 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "AppWindow.hpp"
+#include "ApplicationCommon.hpp"
+#include "data/AlarmPopupRequestParams.hpp"
+#include "service-db/Settings.hpp"
+#include "service-db/agents/settings/SystemSettings.hpp"
+#include "popups/data/PopupData.hpp"
+
+namespace app
+{
+    void ApplicationCommon::registerPopupBlueprints()
+    {
+        using namespace gui::popup;
+        popupBlueprint.registerBlueprint(
+            ID::PhoneModes, [&](gui::popup::ID /*id*/, std::unique_ptr<gui::PopupRequestParams> &params) {
+                auto popupParams = dynamic_cast<gui::PhoneModePopupRequestParams *>(params.get());
+                if (popupParams == nullptr) {
+                    return false;
+                }
+                const auto &mode = popupParams->getPhoneMode();
+                auto flightModeSetting =
+                    settings->getValue(settings::Cellular::offlineMode, settings::SettingsScope::Global);
+                bool flightMode = flightModeSetting == "1";
+
+                const auto &popupName = resolveWindowName(gui::popup::ID::PhoneModes);
+                if (const auto currentWindowName = getCurrentWindow()->getName(); currentWindowName == popupName) {
+                    updateCurrentWindow(std::make_unique<gui::ModesPopupData>(mode, flightMode));
+                }
+                else {
+                    switchWindowPopup(popupName,
+                                      popupParams->getDisposition(),
+                                      std::make_unique<gui::ModesPopupData>(mode, flightMode));
+                }
+                return true;
+            });
+        popupBlueprint.registerBlueprint(
+            ID::Volume, [&](gui::popup::ID /*id*/, std::unique_ptr<gui::PopupRequestParams> &params) {
+                auto volumeParams = dynamic_cast<const gui::VolumePopupRequestParams *>(params.get());
+                if (volumeParams == nullptr) {
+                    return false;
+                }
+                LOG_INFO("Playback: %s, volume: %s",
+                         audio::str(volumeParams->getAudioContext().second).c_str(),
+                         std::to_string(volumeParams->getVolume()).c_str());
+                auto volume          = volumeParams->getVolume();
+                auto context         = volumeParams->getAudioContext();
+                const auto popupName = resolveWindowName(gui::popup::ID::Volume);
+                if (const auto currentWindowName = getCurrentWindow()->getName(); currentWindowName == popupName) {
+                    updateCurrentWindow(std::make_unique<gui::VolumePopupData>(volume, context));
+                }
+                else {
+                    switchWindowPopup(popupName,
+                                      volumeParams->getDisposition(),
+                                      std::make_unique<gui::VolumePopupData>(volume, context));
+                }
+                return true;
+            });
+        popupBlueprint.registerBlueprint(
+            ID::PhoneLock, [&](gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> & /*params*/) {
+                switchWindowPopup(gui::popup::resolveWindowName(id),
+                                  gui::popup::popupDisposition(id, gui::popup::Disposition::Priority::Normal),
+                                  nullptr,
+                                  SwitchReason::PhoneLock);
+                return true;
+            });
+        auto phoneLockBlueprint = [&](gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &params) {
+            LOG_ERROR("HANDLE LOCK BLUEPRINT");
+            auto popupParams = dynamic_cast<gui::PhoneUnlockInputRequestParams *>(params.get());
+            if (popupParams == nullptr) {
+                LOG_ERROR("this is most probably due to wrong unique_ptr handling - please check");
+                return false;
+            }
+
+            popupParams->setDisposition(gui::popup::Disposition{gui::popup::Disposition::Priority::Normal,
+                                                                gui::popup::Disposition::WindowType::Popup,
+                                                                params->getPopupId()});
+            switchWindowPopup(
+                gui::popup::resolveWindowName(id),
+                popupParams->getDisposition(),
+                std::make_unique<locks::LockData>(popupParams->getLock(), popupParams->getPhoneLockInputTypeAction()));
+            return true;
+        };
+        popupBlueprint.registerBlueprint(ID::PhoneLockInput, phoneLockBlueprint);
+        popupBlueprint.registerBlueprint(ID::PhoneLockChangeInfo, phoneLockBlueprint);
+        auto simLockBlueprint = [&](gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &params) {
+            auto popupParams = dynamic_cast<const gui::SimUnlockInputRequestParams *>(params.get());
+            if (popupParams == nullptr) {
+                return false;
+            }
+            switchWindowPopup(gui::popup::resolveWindowName(id),
+                              popupParams->getDisposition(),
+                              std::make_unique<locks::SimLockData>(popupParams->getLock(),
+                                                                   popupParams->getSimInputTypeAction(),
+                                                                   popupParams->getErrorCode()));
+            return true;
+        };
+        popupBlueprint.registerBlueprint(ID::SimLock, simLockBlueprint);
+        popupBlueprint.registerBlueprint(ID::SimInfo, simLockBlueprint);
+        popupBlueprint.registerBlueprint(
+            ID::Alarm, [&](gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &params) {
+                auto popupParams = dynamic_cast<gui::AlarmPopupRequestParams *>(params.get());
+                if (popupParams == nullptr) {
+                    return false;
+                }
+                popupParams->setDisposition(gui::popup::Disposition{gui::popup::Disposition::Priority::High,
+                                                                    gui::popup::Disposition::WindowType::Popup,
+                                                                    params->getPopupId()});
+                switchWindowPopup(gui::popup::resolveWindowName(id),
+                                  popupParams->getDisposition(),
+                                  std::make_unique<gui::AlarmPopupRequestParams>(popupParams));
+                return true;
+            });
+    }
+
+    std::optional<gui::popup::Blueprint> ApplicationCommon::popupBlueprintFallback(gui::popup::ID id)
+    {
+        popupBlueprint.registerBlueprint(
+            id, [&](gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &p) -> bool {
+                switchWindowPopup(
+                    gui::popup::resolveWindowName(id), p->getDisposition(), nullptr, SwitchReason::PhoneLock);
+                return true;
+            });
+        return *popupBlueprint.getBlueprint(id);
+    }
+} // namespace app
diff --git a/module-apps/apps-common/CMakeLists.txt b/module-apps/apps-common/CMakeLists.txt
index 4228fcea0..46e9f8c38 100644
--- a/module-apps/apps-common/CMakeLists.txt
+++ b/module-apps/apps-common/CMakeLists.txt
@@ -6,6 +6,7 @@ add_library(apps-common STATIC)
 target_sources(apps-common
     PRIVATE
         ApplicationCommon.cpp
+        ApplicationCommonPopupBlueprints.cpp
         AsyncTask.cpp
         AudioOperations.cpp
         AudioOperations.hpp
@@ -14,9 +15,11 @@ target_sources(apps-common
         GuiTimer.cpp
         StatusBarManager.cpp
         WindowsFactory.cpp
+        WindowsStack.cpp
         audio/SoundsPlayer.cpp
         models/SongContext.cpp
         models/SongsRepository.cpp
+        audio/SoundsPlayer.cpp
         notifications/NotificationData.cpp
         notifications/NotificationListItem.cpp
         notifications/NotificationProvider.cpp
@@ -57,6 +60,10 @@ target_sources(apps-common
         windows/BrightnessWindow.cpp
         windows/Dialog.cpp
         windows/OptionWindow.cpp
+        PopupBlueprintFactory.cpp
+        WindowsPopupQueue.cpp
+        WindowsPopupFilter.cpp
+        WindowsPopupRequest.cpp
 
     PUBLIC
         ApplicationCommon.hpp
diff --git a/module-apps/apps-common/PopupBlueprintFactory.cpp b/module-apps/apps-common/PopupBlueprintFactory.cpp
new file mode 100644
index 000000000..78372bcfc
--- /dev/null
+++ b/module-apps/apps-common/PopupBlueprintFactory.cpp
@@ -0,0 +1,20 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "PopupBlueprintFactory.hpp"
+
+namespace app
+{
+    void PopupBlueprintFactory::registerBlueprint(gui::popup::ID id, gui::popup::Blueprint &&bp)
+    {
+        blueprints[id] = bp;
+    }
+
+    std::optional<gui::popup::Blueprint> PopupBlueprintFactory::getBlueprint(gui::popup::ID id)
+    {
+        if (auto blueprint = blueprints.find(id); blueprint != blueprints.end()) {
+            return {blueprint->second};
+        }
+        return std::nullopt;
+    }
+} // namespace app
diff --git a/module-apps/apps-common/PopupBlueprintFactory.hpp b/module-apps/apps-common/PopupBlueprintFactory.hpp
new file mode 100644
index 000000000..a5d126e4c
--- /dev/null
+++ b/module-apps/apps-common/PopupBlueprintFactory.hpp
@@ -0,0 +1,22 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include "WindowsPopupQueue.hpp"
+#include <map>
+
+namespace app
+{
+    class ApplicationCommon;
+
+    class PopupBlueprintFactory
+    {
+      private:
+        std::map<gui::popup::ID, gui::popup::Blueprint> blueprints;
+
+      public:
+        void registerBlueprint(gui::popup::ID id, gui::popup::Blueprint &&);
+        std::optional<gui::popup::Blueprint> getBlueprint(gui::popup::ID id);
+    };
+} // namespace app
diff --git a/module-apps/apps-common/WindowsFactory.cpp b/module-apps/apps-common/WindowsFactory.cpp
index 9cdec7b6c..c58caf091 100644
--- a/module-apps/apps-common/WindowsFactory.cpp
+++ b/module-apps/apps-common/WindowsFactory.cpp
@@ -3,13 +3,14 @@
 
 #include "WindowsFactory.hpp"
 #include <AppWindow.hpp>
+#include <utility>
 
 namespace app
 {
 
     void WindowsFactory::attach(const std::string &name, builder builder)
     {
-        builders[name] = builder;
+        builders[name] = std::move(builder);
     }
 
     auto WindowsFactory::isRegistered(const std::string &name) const -> bool
diff --git a/module-apps/apps-common/WindowsPopupFilter.cpp b/module-apps/apps-common/WindowsPopupFilter.cpp
new file mode 100644
index 000000000..54a2aef5d
--- /dev/null
+++ b/module-apps/apps-common/WindowsPopupFilter.cpp
@@ -0,0 +1,48 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "WindowsPopupFilter.hpp"
+#include "WindowsStack.hpp"
+#include "data/PopupRequestParams.hpp"
+#include "AppWindow.hpp"
+
+namespace gui::popup
+{
+    void Filter::attachWindowsStack(app::WindowsStack *stack)
+    {
+        this->stack = stack;
+    }
+
+    bool Filter::isPermitted(const gui::PopupRequestParams &params) const
+    {
+        for (const auto &filter : appDependentFilter) {
+            if (filter != nullptr && not filter(params)) {
+                return false;
+            }
+        }
+        if (stack != nullptr) {
+            /// there is no window to switch to
+            auto data = stack->getWindowData(app::topWindow);
+            if (not data) {
+                return true;
+            }
+            if ((*data).disposition.id == params.getPopupId()) {
+                /// its ok to switch to popup of the same ID
+                /// this is actually used by onboarding
+                return true;
+            }
+            if ((*data).disposition.priority > params.getDisposition().priority) {
+                /// it's not ok to switch to popup of lesser priority
+                /// equal ones are fine
+                return false;
+            }
+        }
+        return true;
+    }
+
+    void Filter::addAppDependentFilter(std::function<bool(const gui::PopupRequestParams &)> f)
+    {
+        appDependentFilter.push_back(f);
+    }
+
+} // namespace gui::popup
diff --git a/module-apps/apps-common/WindowsPopupFilter.hpp b/module-apps/apps-common/WindowsPopupFilter.hpp
new file mode 100644
index 000000000..74b3feaaa
--- /dev/null
+++ b/module-apps/apps-common/WindowsPopupFilter.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <functional>
+#include <list>
+
+namespace gui
+{
+    class PopupRequestParams;
+}
+namespace app
+{
+    class WindowsStack;
+}
+namespace gui::popup
+{
+    /// This filter class is used just to filter next popup to handle if any
+    /// it can and should be overriden to filter out only desired ones at the time
+    class Filter
+    {
+      private:
+        std::list<std::function<bool(const gui::PopupRequestParams &)>> appDependentFilter;
+        app::WindowsStack *stack = nullptr;
+
+      public:
+        void attachWindowsStack(app::WindowsStack *stack);
+        void addAppDependentFilter(std::function<bool(const gui::PopupRequestParams &)> f);
+        virtual bool isPermitted(const gui::PopupRequestParams &params) const;
+    };
+} // namespace gui::popup
diff --git a/module-apps/apps-common/WindowsPopupQueue.cpp b/module-apps/apps-common/WindowsPopupQueue.cpp
new file mode 100644
index 000000000..08a91591b
--- /dev/null
+++ b/module-apps/apps-common/WindowsPopupQueue.cpp
@@ -0,0 +1,24 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "WindowsPopupQueue.hpp"
+#include "WindowsPopupFilter.hpp"
+
+namespace app
+{
+    std::optional<gui::popup::Request> WindowsPopupQueue::popRequest(const gui::popup::Filter &filter)
+    {
+        for (const auto &val : requests) {
+            if (filter.isPermitted(val.getPopupParams())) {
+                return {std::move(requests.extract(val).value())};
+            }
+        }
+        return {std::nullopt};
+    }
+
+    bool WindowsPopupQueue::pushRequest(gui::popup::Request &&r)
+    {
+        const auto &[_, success] = requests.emplace(std::move(r));
+        return success;
+    }
+} // namespace app
diff --git a/module-apps/apps-common/WindowsPopupQueue.hpp b/module-apps/apps-common/WindowsPopupQueue.hpp
new file mode 100644
index 000000000..5c892b3a0
--- /dev/null
+++ b/module-apps/apps-common/WindowsPopupQueue.hpp
@@ -0,0 +1,45 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <set>
+#include <utility>
+#include "WindowsPopupRequest.hpp"
+
+namespace app
+{
+    class WindowsStack;
+}
+namespace gui
+{
+    namespace popup
+    {
+        class Filter;
+    } // namespace popup
+} // namespace gui
+
+namespace app
+{
+    class WindowsPopupQueue
+    {
+      public:
+        /// pops next available popup we require to show
+        /// * in order set by Disposition
+        /// * limited by Filter passed to request
+        std::optional<gui::popup::Request> popRequest(const gui::popup::Filter &filter);
+
+        /// append element to stack
+        /// returns success/fail
+        bool pushRequest(gui::popup::Request &&r);
+
+      private:
+        /// set of requests to handle if there are more than one
+        /// requests have to be sortable (this is by design)
+        /// to iterate by Requests in priority order
+        /// this behaviour can be easily changed - just change:
+        /// - gui::popup::Disposition class to hold more data
+        /// - change comparison algorithm in Request (please use std::set then)
+        std::set<gui::popup::Request> requests{};
+    };
+} // namespace app
diff --git a/module-apps/apps-common/WindowsPopupRequest.cpp b/module-apps/apps-common/WindowsPopupRequest.cpp
new file mode 100644
index 000000000..8807a6159
--- /dev/null
+++ b/module-apps/apps-common/WindowsPopupRequest.cpp
@@ -0,0 +1,28 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "WindowsPopupRequest.hpp"
+
+namespace gui::popup
+{
+    Request::Request(gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &&params, Blueprint blueprint)
+        : id(id), params(std::move(params)), blueprint(std::move(blueprint))
+    {
+        timeRequested = utils::time::getCurrentTimestamp();
+    }
+
+    bool Request::handle()
+    {
+        return blueprint(id, params);
+    }
+
+    bool Request::operator<(const Request &p) const
+    {
+        return params->getDisposition().priority > p.params->getDisposition().priority;
+    }
+
+    const gui::PopupRequestParams &Request::getPopupParams() const
+    {
+        return *params;
+    }
+} // namespace gui::popup
diff --git a/module-apps/apps-common/WindowsPopupRequest.hpp b/module-apps/apps-common/WindowsPopupRequest.hpp
new file mode 100644
index 000000000..f7b1a6851
--- /dev/null
+++ b/module-apps/apps-common/WindowsPopupRequest.hpp
@@ -0,0 +1,30 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include "popups/data/PopupRequestParamsBase.hpp"
+#include <time/time_conversion.hpp>
+#include <functional>
+
+namespace gui::popup
+{
+    /// Blueprint to create popup window/handle popup action if there is no window when required
+    using Blueprint = std::function<bool(gui::popup::ID, std::unique_ptr<gui::PopupRequestParams> &)>;
+
+    /// sortable class to select holding all data to handle popup
+    class Request
+    {
+        const gui::popup::ID id;
+        std::unique_ptr<gui::PopupRequestParams> params;
+        utils::time::Timestamp timeRequested;
+        Blueprint blueprint;
+
+      public:
+        Request(gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &&params, Blueprint blueprint);
+        /// with no Blueprint attached - will raise std::bad_function_call
+        bool handle();
+        bool operator<(const Request &p) const;
+        const gui::PopupRequestParams &getPopupParams() const;
+    };
+} // namespace gui::popup
diff --git a/module-apps/apps-common/WindowsStack.cpp b/module-apps/apps-common/WindowsStack.cpp
new file mode 100644
index 000000000..4ffe5a61c
--- /dev/null
+++ b/module-apps/apps-common/WindowsStack.cpp
@@ -0,0 +1,116 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "WindowsStack.hpp"
+#include "WindowsFactory.hpp"
+#include "windows/AppWindow.hpp"
+
+namespace app
+{
+    std::map<std::string, std::unique_ptr<gui::AppWindow>>::const_iterator WindowsStack::begin() const
+    {
+        return std::begin(windows);
+    }
+
+    std::map<std::string, std::unique_ptr<gui::AppWindow>>::const_iterator WindowsStack::end() const
+    {
+        return std::end(windows);
+    }
+
+    void WindowsStack::push(const std::string &name,
+                            std::unique_ptr<gui::AppWindow> window,
+                            const gui::popup::Disposition &disposition)
+    {
+        windows[name] = std::move(window);
+        stack.push_back(WindowData(name, disposition));
+    }
+
+    gui::AppWindow *WindowsStack::get(const std::string &name) const
+    {
+        auto ret = windows.find(name);
+        return ret == std::end(windows) ? nullptr : ret->second.get();
+    }
+
+    std::optional<WindowData> WindowsStack::getWindowData(uint32_t depth) const
+    {
+        if (depth >= stack.size()) {
+            return std::nullopt;
+        }
+        return {*std::prev(stack.end(), depth + 1)};
+    }
+
+    std::optional<std::string> WindowsStack::get(uint32_t depth) const
+    {
+        if (auto windowData = getWindowData(depth)) {
+            return {windowData->name};
+        }
+        return std::nullopt;
+    }
+
+    [[nodiscard]] bool WindowsStack::isEmpty() const noexcept
+    {
+        return stack.empty();
+    }
+
+    /// return false on pop empty
+    bool WindowsStack::pop() noexcept
+    {
+        if (!stack.empty()) {
+            stack.pop_back();
+            return true;
+        }
+        return false;
+    }
+
+    bool WindowsStack::pop(const std::string &window)
+    {
+        auto ret = findInStack(window);
+        if (ret != stack.end()) {
+            stack.erase(std::next(ret), stack.end());
+            return true;
+        }
+        return false;
+    }
+
+    bool WindowsStack::popLastWindow()
+    {
+        if (stack.size() == 1) {
+            stack.clear();
+            return true;
+        }
+        return false;
+    }
+
+    bool WindowsStack::drop(const std::string &window)
+    {
+        auto popWindow = findInStack(window);
+        if (popWindow != stack.end()) {
+            stack.erase(popWindow);
+            return true;
+        }
+        return false;
+    }
+
+    bool WindowsStack::rebuildWindows(app::WindowsFactory &windowsFactory, ApplicationCommon *app)
+    {
+        if (windows.empty()) {
+            return false;
+        }
+        for (auto &[name, window] : windows) {
+            windows[name] = windowsFactory.build(app, name);
+        }
+        return true;
+    }
+
+    void WindowsStack::clear()
+    {
+        stack.clear();
+        windows.clear();
+    }
+
+    decltype(WindowsStack::stack)::iterator WindowsStack::findInStack(const std::string &window)
+    {
+        return std::find_if(stack.begin(), stack.end(), [&](auto &el) { return el.name == window; });
+    }
+
+} // namespace app
diff --git a/module-apps/apps-common/WindowsStack.hpp b/module-apps/apps-common/WindowsStack.hpp
index 311a375cd..1563f0f63 100644
--- a/module-apps/apps-common/WindowsStack.hpp
+++ b/module-apps/apps-common/WindowsStack.hpp
@@ -3,58 +3,75 @@
 
 #pragma once
 
+#include <algorithm>
 #include <memory>
 #include <map>
+#include <optional>
 #include <vector>
 #include <string>
-#include <AppWindow.hpp>
+#include <ostream>
+#include <log/log.hpp>
+#include "popups/Disposition.hpp"
+
+namespace gui
+{
+    class AppWindow;
+}
 
 namespace app
 {
 
+    class WindowsFactory;
     class ApplicationCommon;
 
+    constexpr auto previousWindow = 1;
+    constexpr auto topWindow      = 0;
+
+    struct WindowData
+    {
+      public:
+        std::string name;
+        gui::popup::Disposition disposition{};
+
+        WindowData(const std::string &name, const gui::popup::Disposition &disposition)
+            : name(name), disposition(disposition)
+        {}
+    };
+
     class WindowsStack
     {
-        ApplicationCommon *parent;
+        std::vector<WindowData> stack;
+        std::map<std::string, std::unique_ptr<gui::AppWindow>> windows{};
+        decltype(stack)::iterator findInStack(const std::string &);
 
       public:
-        WindowsStack(ApplicationCommon *parent) : parent(parent)
-        {}
+        WindowsStack() = default;
 
-        std::vector<std::string> stack;
-        std::map<std::string, std::unique_ptr<gui::AppWindow>> windows;
+        /// iterators, unfortunately used in applications
+        std::map<std::string, std::unique_ptr<gui::AppWindow>>::const_iterator begin() const;
+        std::map<std::string, std::unique_ptr<gui::AppWindow>>::const_iterator end() const;
+        [[nodiscard]] bool isEmpty() const noexcept;
 
-        std::map<std::string, std::unique_ptr<gui::AppWindow>>::const_iterator begin() const
-        {
-            return std::begin(windows);
-        }
+        /// add window on top of stack
+        void push(const std::string &name,
+                  std::unique_ptr<gui::AppWindow> window,
+                  const gui::popup::Disposition &disposition = gui::popup::WindowDisposition);
 
-        std::map<std::string, std::unique_ptr<gui::AppWindow>>::const_iterator end() const
-        {
-            return std::end(windows);
-        }
+        /// window getters
+        gui::AppWindow *get(const std::string &name) const;
+        std::optional<std::string> get(uint32_t depth = 0) const;
+        std::optional<WindowData> getWindowData(uint32_t depth = 0) const;
 
-        [[nodiscard]] auto getParent() const
-        {
-            return parent;
-        }
+        /// functions removing windows from stack
+        /// `pop`  functions - handle last, latest window
+        /// `drop` functions - remove any window on stack
+        /// return false on pop empty
+        bool pop() noexcept;
+        bool pop(const std::string &window);
+        bool popLastWindow();
+        bool drop(const std::string &window);
+        void clear();
 
-        auto push(const std::string &name, std::unique_ptr<gui::AppWindow> window)
-        {
-            windows[name] = std::move(window);
-            stack.push_back(name);
-        }
-
-        gui::AppWindow *get(const std::string &name) const
-        {
-            auto ret = windows.find(name);
-            return ret == std::end(windows) ? nullptr : ret->second.get();
-        }
-
-        [[nodiscard]] auto isEmpty() const noexcept
-        {
-            return stack.size() == 0;
-        }
+        bool rebuildWindows(app::WindowsFactory &windowsFactory, ApplicationCommon *app);
     };
 } // namespace app
diff --git a/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp b/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
index 8a07f25d2..0cab836d7 100644
--- a/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
@@ -5,6 +5,7 @@
 #include <log/log.hpp>
 #include <ApplicationCommon.hpp>
 #include <gsl/assert>
+#include <AppWindow.hpp>
 
 using namespace locks;
 
diff --git a/module-apps/apps-common/locks/handlers/PhoneLockSubject.cpp b/module-apps/apps-common/locks/handlers/PhoneLockSubject.cpp
index dd29986b5..d6b6db127 100644
--- a/module-apps/apps-common/locks/handlers/PhoneLockSubject.cpp
+++ b/module-apps/apps-common/locks/handlers/PhoneLockSubject.cpp
@@ -2,6 +2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PhoneLockSubject.hpp"
+#include "AlarmEventRecord.hpp"
+#include "time/dateCommon.hpp"
 
 #include <service-appmgr/Constants.hpp>
 #include <locks/data/PhoneLockMessages.hpp>
diff --git a/module-apps/apps-common/messages/AppMessage.hpp b/module-apps/apps-common/messages/AppMessage.hpp
index ea948b37f..81a9e0646 100644
--- a/module-apps/apps-common/messages/AppMessage.hpp
+++ b/module-apps/apps-common/messages/AppMessage.hpp
@@ -4,11 +4,16 @@
 #pragma once
 
 #include "Common.hpp"
+#include "popups/Disposition.hpp"
 #include "SwitchData.hpp"
 #include "gui/input/InputEvent.hpp"
 #include "BaseAppMessage.hpp"
+#include "AppSwitchReason.hpp"
+#include "AppStartupReason.hpp"
 #include <memory>
 #include <string>
+#include <service-appmgr/Actions.hpp>
+#include <utility>
 
 namespace app
 {
@@ -49,14 +54,13 @@ namespace app
     // target
     class AppSwitchMessage : public AppMessage
     {
-      protected:
+      private:
         // name of the application to which switch is performed.
         std::string targetApplication;
         // name of the window to which switch should be performed.
         std::string targetWindow;
         // optional data for the target window.
         std::unique_ptr<gui::SwitchData> data;
-
         StartupReason startupReason = StartupReason::Launch;
 
       public:
@@ -129,8 +133,14 @@ namespace app
                                SwitchReason reason   = SwitchReason::SwitchRequest)
             : AppMessage(MessageType::AppSwitchWindow), window{window},
               senderWindow{senderWindow}, command{command}, reason{reason}, data{std::move(data)} {};
+
         virtual ~AppSwitchWindowMessage() = default;
 
+        [[nodiscard]] virtual bool toPopupRequest() const
+        {
+            return false;
+        }
+
         const std::string &getWindowName() const
         {
             return window;
@@ -151,6 +161,11 @@ namespace app
         {
             return data;
         };
+
+        virtual std::pair<const std::string &, gui::popup::Disposition> getSwitchData()
+        {
+            return {window, gui::popup::WindowDisposition};
+        }
     };
 
     class AppUpdateWindowMessage : public AppMessage
diff --git a/module-apps/apps-common/messages/AppSwitchWindowPopupMessage.hpp b/module-apps/apps-common/messages/AppSwitchWindowPopupMessage.hpp
new file mode 100644
index 000000000..e2b77f66e
--- /dev/null
+++ b/module-apps/apps-common/messages/AppSwitchWindowPopupMessage.hpp
@@ -0,0 +1,36 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include "AppMessage.hpp"
+#include "Disposition.hpp"
+#include <functional>
+
+namespace app
+{
+    class AppSwitchWindowPopupMessage : public AppSwitchWindowMessage
+    {
+        const gui::popup::Disposition disposition;
+
+      public:
+        AppSwitchWindowPopupMessage(const std::string &window,
+                                    std::unique_ptr<gui::SwitchData> data,
+                                    SwitchReason reason,
+                                    const gui::popup::Disposition &disposition)
+            : AppSwitchWindowMessage(
+                  window, "", std::forward<decltype(data)>(data), gui::ShowMode::GUI_SHOW_INIT, reason),
+              disposition(disposition)
+        {}
+
+        virtual bool toPopupRequest() const override
+        {
+            return true;
+        }
+
+        std::pair<const std::string &, gui::popup::Disposition> getSwitchData() override
+        {
+            return {window, disposition};
+        }
+    };
+} // namespace app
diff --git a/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp b/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp
index 7e1087077..8f1844165 100644
--- a/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp
+++ b/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp
@@ -5,6 +5,7 @@
 #include <widgets/TextWithIconsWidget.hpp>
 #include <widgets/ActiveIconFactory.hpp>
 #include <TextFixedSize.hpp>
+#include <AppWindow.hpp>
 
 using namespace gui::option;
 
diff --git a/module-apps/apps-common/popups/CMakeLists.txt b/module-apps/apps-common/popups/CMakeLists.txt
index 67d5c2339..138682dda 100644
--- a/module-apps/apps-common/popups/CMakeLists.txt
+++ b/module-apps/apps-common/popups/CMakeLists.txt
@@ -26,6 +26,7 @@ target_sources(apps-common
 		lock-popups/SimNotReadyWindow.cpp
 		presenter/PowerOffPresenter.cpp
 		presenter/AlarmPresenter.cpp
+		data/PopupRequestParamsBase.cpp
 
 	PRIVATE
 		HomeModesWindow.hpp
diff --git a/module-apps/apps-common/popups/Disposition.hpp b/module-apps/apps-common/popups/Disposition.hpp
new file mode 100644
index 000000000..a14bd4889
--- /dev/null
+++ b/module-apps/apps-common/popups/Disposition.hpp
@@ -0,0 +1,46 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include "Popups.hpp"
+#include <type_traits>
+namespace gui
+{
+    namespace popup
+    {
+        struct Disposition
+        {
+          public:
+            /// from lowest to highest, order matters
+            enum class Priority
+            {
+                Low,
+                Normal,
+                High,
+                Highest
+            };
+
+            Priority priority = Priority::Normal;
+
+            enum class WindowType
+            {
+                Normal,
+                Popup,
+            } windowtype = WindowType::Normal;
+
+            gui::popup::ID id = gui::popup::ID::Invalid;
+        };
+
+        constexpr Disposition WindowDisposition = gui::popup::Disposition{
+            Disposition::Priority::Normal, Disposition::WindowType::Normal, gui::popup::ID::Invalid};
+        constexpr Disposition popupDisposition(gui::popup::ID id,
+                                               Disposition::Priority priority = Disposition::Priority::Normal)
+        {
+            return gui::popup::Disposition{priority, Disposition::WindowType::Normal, id};
+        }
+
+    }; // namespace popup
+} // namespace gui
+
+static_assert(std::is_compound<gui::popup::Disposition>(), "This class is designed to carry trivial compound data");
diff --git a/module-apps/apps-common/popups/Popups.cpp b/module-apps/apps-common/popups/Popups.cpp
index 5f97395bd..ebab95a13 100644
--- a/module-apps/apps-common/popups/Popups.cpp
+++ b/module-apps/apps-common/popups/Popups.cpp
@@ -2,6 +2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Popups.hpp"
+#include "AppWindow.hpp"
+#include <cassert>
 
 namespace gui::popup
 {
@@ -44,6 +46,9 @@ namespace gui::popup
             return gui::popup::window::reboot_window;
         case ID::BedtimeNotification:
             return gui::popup::window::bedtime_notification_window;
+        case ID::Invalid:
+            assert(0);
+            return gui::name::window::main_window;
         }
 
         return {};
diff --git a/module-apps/apps-common/popups/Popups.hpp b/module-apps/apps-common/popups/Popups.hpp
index 13bbdddc6..18ec9a90b 100644
--- a/module-apps/apps-common/popups/Popups.hpp
+++ b/module-apps/apps-common/popups/Popups.hpp
@@ -29,6 +29,7 @@ namespace gui
             PowerOff,
             Reboot,
             BedtimeNotification,
+            Invalid,
         };
 
         namespace window
diff --git a/module-apps/apps-common/popups/data/AlarmPopupRequestParams.hpp b/module-apps/apps-common/popups/data/AlarmPopupRequestParams.hpp
index 6b5281e4a..a364a11a0 100644
--- a/module-apps/apps-common/popups/data/AlarmPopupRequestParams.hpp
+++ b/module-apps/apps-common/popups/data/AlarmPopupRequestParams.hpp
@@ -28,7 +28,7 @@ namespace gui
 
         explicit AlarmPopupRequestParams(AlarmPopupRequestParams *p)
             : PopupRequestParams{p->getPopupId()}, type(p->type), record(std::move(p->record)),
-              snoozedAlarms(std::move(p->snoozedAlarms))
+              snoozedAlarms(p->snoozedAlarms)
         {}
 
         [[nodiscard]] AlarmPopupType getPopupType() const
diff --git a/module-apps/apps-common/popups/data/PopupRequestParams.hpp b/module-apps/apps-common/popups/data/PopupRequestParams.hpp
index cb5cc17ca..5033376be 100644
--- a/module-apps/apps-common/popups/data/PopupRequestParams.hpp
+++ b/module-apps/apps-common/popups/data/PopupRequestParams.hpp
@@ -4,9 +4,8 @@
 #pragma once
 
 #include "popups/Popups.hpp"
+#include "PopupRequestParamsBase.hpp"
 
-#include <memory>
-#include <service-appmgr/Actions.hpp>
 #include <PhoneModes/Common.hpp>
 #include <module-audio/Audio/AudioCommon.hpp>
 #include <locks/widgets/Lock.hpp>
@@ -14,23 +13,6 @@
 
 namespace gui
 {
-
-    class PopupRequestParams : public app::manager::actions::ActionParams
-    {
-      public:
-        explicit PopupRequestParams(gui::popup::ID popupId)
-            : app::manager::actions::ActionParams{"Popup request parameters"}, popupId{popupId}
-        {}
-
-        [[nodiscard]] auto getPopupId() const noexcept
-        {
-            return popupId;
-        }
-
-      private:
-        gui::popup::ID popupId;
-    };
-
     class PhoneUnlockInputRequestParams : public PopupRequestParams
     {
       public:
diff --git a/module-apps/apps-common/popups/data/PopupRequestParamsBase.cpp b/module-apps/apps-common/popups/data/PopupRequestParamsBase.cpp
new file mode 100644
index 000000000..d32a56abd
--- /dev/null
+++ b/module-apps/apps-common/popups/data/PopupRequestParamsBase.cpp
@@ -0,0 +1,29 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "PopupRequestParamsBase.hpp"
+
+namespace gui
+{
+    PopupRequestParams::PopupRequestParams(gui::popup::ID popupId) : PopupRequestParams(popupId, popup::Disposition{})
+    {}
+
+    PopupRequestParams::PopupRequestParams(gui::popup::ID popupId, popup::Disposition disposition)
+        : app::manager::actions::ActionParams{"Popup request parameters"}, popupId{popupId}, disposition(disposition)
+    {}
+
+    gui::popup::ID PopupRequestParams::getPopupId() const noexcept
+    {
+        return popupId;
+    }
+
+    const popup::Disposition &PopupRequestParams::getDisposition() const noexcept
+    {
+        return disposition;
+    }
+
+    void PopupRequestParams::setDisposition(const popup::Disposition &d)
+    {
+        this->disposition = d;
+    }
+} // namespace gui
diff --git a/module-apps/apps-common/popups/data/PopupRequestParamsBase.hpp b/module-apps/apps-common/popups/data/PopupRequestParamsBase.hpp
new file mode 100644
index 000000000..606bf7382
--- /dev/null
+++ b/module-apps/apps-common/popups/data/PopupRequestParamsBase.hpp
@@ -0,0 +1,26 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include "popups/Popups.hpp"
+
+#include <service-appmgr/Actions.hpp>
+#include <popups/Disposition.hpp>
+
+namespace gui
+{
+    class PopupRequestParams : public app::manager::actions::ActionParams
+    {
+      public:
+        explicit PopupRequestParams(gui::popup::ID popupId);
+        explicit PopupRequestParams(gui::popup::ID popupId, popup::Disposition disposition);
+        [[nodiscard]] gui::popup::ID getPopupId() const noexcept;
+        [[nodiscard]] const popup::Disposition &getDisposition() const noexcept;
+        void setDisposition(const popup::Disposition &d);
+
+      private:
+        gui::popup::ID popupId;
+        popup::Disposition disposition;
+    };
+} // namespace gui
diff --git a/module-apps/apps-common/widgets/ActiveIconFactory.cpp b/module-apps/apps-common/widgets/ActiveIconFactory.cpp
index f4bffdfce..eaf1ba1c2 100644
--- a/module-apps/apps-common/widgets/ActiveIconFactory.cpp
+++ b/module-apps/apps-common/widgets/ActiveIconFactory.cpp
@@ -9,6 +9,7 @@
 #include <application-phonebook/data/PhonebookItemData.hpp>
 #include <application-call/data/CallSwitchData.hpp>
 #include <module-apps/application-messages/data/SMSdata.hpp>
+#include <AppWindow.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/apps-common/windows/AppWindow.hpp b/module-apps/apps-common/windows/AppWindow.hpp
index 0a5cfdd5f..658ebca00 100644
--- a/module-apps/apps-common/windows/AppWindow.hpp
+++ b/module-apps/apps-common/windows/AppWindow.hpp
@@ -9,6 +9,7 @@
 #include <gui/widgets/Window.hpp>
 #include <Service/Service.hpp>
 #include <Service/Message.hpp>
+#include "AppWindowConstants.hpp"
 
 namespace app
 {
@@ -17,15 +18,6 @@ namespace app
 
 namespace gui
 {
-    namespace name
-    {
-        namespace window
-        {
-            inline constexpr auto main_window = "MainWindow";
-            inline constexpr auto no_window   = "";
-        } // namespace window
-    }     // namespace name
-
     /*
      * @brief This is wrapper for gui window used within applications.
      */
diff --git a/module-apps/apps-common/windows/AppWindowConstants.hpp b/module-apps/apps-common/windows/AppWindowConstants.hpp
new file mode 100644
index 000000000..f93b99300
--- /dev/null
+++ b/module-apps/apps-common/windows/AppWindowConstants.hpp
@@ -0,0 +1,9 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+namespace gui::name::window
+{
+    inline constexpr auto main_window = "MainWindow";
+} // namespace gui::name::window
diff --git a/module-apps/tests/CMakeLists.txt b/module-apps/tests/CMakeLists.txt
index bd1752f8b..69b776bf9 100644
--- a/module-apps/tests/CMakeLists.txt
+++ b/module-apps/tests/CMakeLists.txt
@@ -9,3 +9,5 @@ add_catch2_executable(
     LIBS
         module-apps
 )
+
+add_subdirectory(windows)
diff --git a/module-apps/tests/windows/CMakeLists.txt b/module-apps/tests/windows/CMakeLists.txt
new file mode 100644
index 000000000..b560a1435
--- /dev/null
+++ b/module-apps/tests/windows/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_catch2_executable(
+    NAME
+        windows-management
+    SRCS
+        tests-main.cpp
+        test-WindowsStack.cpp
+        test-WindowsPopupQueue.cpp
+        test-WindowsPopupFilter.cpp
+    LIBS
+    module-gui
+)
diff --git a/module-apps/tests/windows/mock/TestWindow.hpp b/module-apps/tests/windows/mock/TestWindow.hpp
new file mode 100644
index 000000000..c9cb434b5
--- /dev/null
+++ b/module-apps/tests/windows/mock/TestWindow.hpp
@@ -0,0 +1,13 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <module-apps/apps-common/windows/AppWindow.hpp>
+
+class TestWindow : public gui::AppWindow
+{
+  public:
+    explicit TestWindow(const std::string &name) : gui::AppWindow(nullptr, name)
+    {}
+};
diff --git a/module-apps/tests/windows/test-WindowsPopupFilter.cpp b/module-apps/tests/windows/test-WindowsPopupFilter.cpp
new file mode 100644
index 000000000..119a22bac
--- /dev/null
+++ b/module-apps/tests/windows/test-WindowsPopupFilter.cpp
@@ -0,0 +1,87 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "WindowsPopupFilter.hpp"
+#include "WindowsStack.hpp"
+#include "mock/TestWindow.hpp"
+#include "popups/data/PopupRequestParamsBase.hpp"
+#include <catch2/catch.hpp>
+#include <module-apps/apps-common/WindowsPopupQueue.hpp>
+
+TEST_CASE("WindowsPopupQueue::isPermitted")
+{
+    auto prp = gui::PopupRequestParams(gui::popup::ID::Alarm, gui::popup::popupDisposition(gui::popup::ID::Alarm));
+    gui::popup::Filter filter;
+    SECTION("filter is ok, there is not stack")
+    {
+        filter.addAppDependentFilter([](const gui::PopupRequestParams &) -> bool { return true; });
+        REQUIRE(filter.isPermitted(prp));
+    }
+
+    SECTION("just stack")
+    {
+        app::WindowsStack stack;
+        filter.attachWindowsStack(&stack);
+
+        SECTION("stack is empty - it's ok to show popup")
+        {
+            REQUIRE(filter.isPermitted(prp));
+        }
+
+        SECTION("stack with same popup on top already")
+        {
+            auto w = std::make_unique<TestWindow>("wn");
+            stack.push("wn", std::move(w));
+            REQUIRE(filter.isPermitted(prp));
+        }
+
+        SECTION("stack with priority")
+        {
+            auto w = std::make_unique<TestWindow>("wn");
+            stack.push("wn",
+                       std::move(w),
+                       gui::popup::popupDisposition(gui::popup::ID::Alarm, gui::popup::Disposition::Priority::Normal));
+
+            // lesser priority
+            {
+                auto prp =
+                    gui::PopupRequestParams(gui::popup::ID::AlarmActivated,
+                                            gui::popup::popupDisposition(gui::popup::ID::AlarmActivated,
+                                                                         gui::popup::Disposition::Priority::Low));
+                REQUIRE(not filter.isPermitted(prp));
+            }
+            // higher priority & different popup on top
+            {
+                auto prp =
+                    gui::PopupRequestParams(gui::popup::ID::AlarmActivated,
+                                            gui::popup::popupDisposition(gui::popup::ID::AlarmActivated,
+                                                                         gui::popup::Disposition::Priority::High));
+                REQUIRE(filter.isPermitted(prp));
+            }
+            // equal priority & different popup on top - this is fine (see i.e. phone lock input )
+            {
+                auto prp =
+                    gui::PopupRequestParams(gui::popup::ID::AlarmActivated,
+                                            gui::popup::popupDisposition(gui::popup::ID::AlarmActivated,
+                                                                         gui::popup::Disposition::Priority::Normal));
+                REQUIRE(filter.isPermitted(prp));
+            }
+            // equal priority & same popup - this is not fine, i.e. alarm for alarm clock
+            {
+                auto prp = gui::PopupRequestParams(
+                    gui::popup::ID::Alarm,
+                    gui::popup::popupDisposition(gui::popup::ID::Alarm, gui::popup::Disposition::Priority::Normal));
+                REQUIRE(not filter.isPermitted(prp));
+            }
+        }
+    }
+}
+
+TEST_CASE("WindowsPopupQueue::addAppDependentFilter")
+{
+    gui::popup::Filter filter;
+    auto prp = gui::PopupRequestParams(gui::popup::ID::Alarm);
+    // create filter that accepts nothing
+    filter.addAppDependentFilter([](const gui::PopupRequestParams &) -> bool { return false; });
+    REQUIRE(not filter.isPermitted(prp));
+}
diff --git a/module-apps/tests/windows/test-WindowsPopupQueue.cpp b/module-apps/tests/windows/test-WindowsPopupQueue.cpp
new file mode 100644
index 000000000..2c5eb9260
--- /dev/null
+++ b/module-apps/tests/windows/test-WindowsPopupQueue.cpp
@@ -0,0 +1,101 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "WindowsPopupFilter.hpp"
+#include <catch2/catch.hpp>
+#include <module-apps/apps-common/WindowsPopupQueue.hpp>
+
+gui::popup::Filter filter;
+
+TEST_CASE("WindowsPopupQueue creation")
+{
+    auto wp = app::WindowsPopupQueue();
+
+    std::optional<gui::popup::Request> r = wp.popRequest(filter);
+    REQUIRE(not r);
+}
+
+TEST_CASE("WindowsPopupQueue push")
+{
+    using namespace gui::popup;
+    auto wp = app::WindowsPopupQueue();
+    Blueprint blueprint;
+    Request request(gui::popup::ID::Alarm, std::make_unique<gui::PopupRequestParams>(gui::popup::ID::Alarm), blueprint);
+    {
+        auto r = wp.pushRequest(std::move(request));
+        REQUIRE(r);
+    }
+    {
+        auto r = wp.popRequest(filter);
+        REQUIRE(r);
+    }
+    {
+        auto r = wp.popRequest(filter);
+        REQUIRE(not r);
+    }
+}
+
+class NoneFilter : public gui::popup::Filter
+{
+    bool isPermitted(const gui::PopupRequestParams & /*params*/) const override
+    {
+        return false;
+    }
+};
+
+TEST_CASE("WindowsPopupQueue filter")
+{
+    using namespace gui::popup;
+    auto wp = app::WindowsPopupQueue();
+    Blueprint blueprint;
+    auto noneFilter = NoneFilter();
+    Request request(gui::popup::ID::Alarm, std::make_unique<gui::PopupRequestParams>(gui::popup::ID::Alarm), blueprint);
+    {
+        auto r = wp.pushRequest(std::move(request));
+        REQUIRE(r);
+    }
+    {
+        auto r = wp.popRequest(noneFilter);
+        REQUIRE(not r);
+    }
+    {
+        auto r = wp.popRequest(filter);
+        REQUIRE(r);
+    }
+    {
+        auto r = wp.popRequest(noneFilter);
+        REQUIRE(not r);
+    }
+    {
+        auto r = wp.popRequest(filter);
+        REQUIRE(not r);
+    }
+}
+
+TEST_CASE("WindowsPopupRequest - handle empty request foo")
+{
+    using namespace gui::popup;
+    SECTION("no blueprint")
+    {
+        Blueprint blueprint;
+        Request request(
+            gui::popup::ID::Alarm, std::make_unique<gui::PopupRequestParams>(gui::popup::ID::Alarm), blueprint);
+        REQUIRE_THROWS_AS(request.handle(), std::bad_function_call);
+    }
+
+    SECTION("failing blueprint")
+    {
+        Blueprint blueprint = [](gui::popup::ID, std::unique_ptr<gui::PopupRequestParams> &) -> bool { return false; };
+        Request request(
+            gui::popup::ID::Alarm, std::make_unique<gui::PopupRequestParams>(gui::popup::ID::Alarm), blueprint);
+        REQUIRE(not request.handle());
+    }
+
+    SECTION("successful blueprint")
+    {
+        Blueprint blueprint = [](gui::popup::ID, std::unique_ptr<gui::PopupRequestParams> &) -> bool { return true; };
+        Request request(
+            gui::popup::ID::Alarm, std::make_unique<gui::PopupRequestParams>(gui::popup::ID::Alarm), blueprint);
+        REQUIRE(request.handle());
+    }
+}
diff --git a/module-apps/tests/windows/test-WindowsStack.cpp b/module-apps/tests/windows/test-WindowsStack.cpp
new file mode 100644
index 000000000..e74b3ca02
--- /dev/null
+++ b/module-apps/tests/windows/test-WindowsStack.cpp
@@ -0,0 +1,260 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include <catch2/catch.hpp>
+
+#include "WindowsFactory.hpp"
+#include "mock/TestWindow.hpp"
+
+#include <module-apps/apps-common/WindowsStack.hpp>
+#include <ostream>
+#include <string>
+#include <type_traits>
+#include <sstream>
+
+void add_dummy_windows(
+    app::WindowsStack &ws,
+    unsigned int count,
+    const std::function<std::string(unsigned int)> &naming = [](unsigned int i) {
+        return "window_name_" + std::to_string(i);
+    })
+{
+    for (unsigned int i = 0; i < count; ++i) {
+        std::string window_name = naming(i);
+        ws.push(window_name, std::make_unique<TestWindow>(window_name));
+    }
+}
+
+void add_dummy_builders(
+    app::WindowsFactory &wf,
+    unsigned int count,
+    const std::function<std::string(unsigned int)> &naming =
+        [](unsigned int i) { return "window_name_" + std::to_string(i); },
+    const std::function<app::WindowsFactory::handle(app::ApplicationCommon *, std::string)> &builder =
+        [](app::ApplicationCommon *, std::string name) -> std::unique_ptr<gui::AppWindow> {
+        return std::make_unique<TestWindow>(name);
+    })
+{
+    for (unsigned int i = 0; i < count; ++i) {
+        std::string window_name = naming(i);
+        wf.attach(window_name, builder);
+    }
+}
+
+TEST_CASE("WindowsStack creation")
+{
+    app::WindowsStack stack;
+    REQUIRE(true);
+}
+
+TEST_CASE("iteration")
+{
+    app::WindowsStack stack;
+
+    SECTION("empty")
+    {
+        unsigned int i = 0;
+        for (const auto &[name, window] : stack) {
+            REQUIRE(!name.empty());
+            REQUIRE(window != nullptr);
+            ++i;
+        }
+        REQUIRE(i == 0);
+    }
+
+    SECTION("not empty")
+    {
+        unsigned int count = 1;
+        add_dummy_windows(stack, count);
+
+        unsigned int i = 0;
+        for (const auto &[name, window] : stack) {
+            REQUIRE(!name.empty());
+            REQUIRE(window != nullptr);
+            ++i;
+        }
+        REQUIRE(i == count);
+    }
+}
+
+TEST_CASE("window getter by int")
+{
+    app::WindowsStack stack;
+
+    SECTION("empty")
+    {
+        REQUIRE(!stack.get(0));
+        REQUIRE(!stack.get(1));
+        REQUIRE(!stack.get(100));
+    }
+
+    SECTION("not empty")
+    {
+        unsigned int count = 10;
+        REQUIRE(count > 1);
+        add_dummy_windows(stack, count);
+        REQUIRE(stack.get());
+        REQUIRE(stack.get(1));
+        REQUIRE(stack.get(count - 1));
+        REQUIRE(!stack.get(count));
+    }
+}
+
+TEST_CASE("window getter by string")
+{
+    app::WindowsStack stack;
+    SECTION("empty")
+    {
+        REQUIRE(!stack.get(""));
+        REQUIRE(!stack.get("any_window_name"));
+    }
+
+    SECTION("not empty")
+    {
+        const unsigned int count = 10;
+        std::string name_prefix  = "window";
+        auto naming_foo          = [name_prefix](unsigned int i) { return name_prefix + std::to_string(i); };
+        add_dummy_windows(stack, count, naming_foo);
+
+        REQUIRE(stack.get(naming_foo(count / 2)));
+        REQUIRE(!stack.get(naming_foo(count)));
+    }
+}
+
+TEST_CASE("isEmpty")
+{
+    app::WindowsStack stack;
+    SECTION("empty")
+    {
+        REQUIRE(stack.isEmpty());
+    }
+
+    SECTION("not empty")
+    {
+        unsigned int count = 10;
+        REQUIRE(count > 1);
+        add_dummy_windows(stack, count);
+        REQUIRE(!stack.isEmpty());
+    }
+}
+
+TEST_CASE("pop")
+{
+    app::WindowsStack stack;
+    SECTION("empty")
+    {
+        REQUIRE(!stack.pop());
+    }
+
+    SECTION("not empty")
+    {
+        unsigned int count = 10;
+        REQUIRE(count > 1);
+        add_dummy_windows(stack, count);
+        for (unsigned int i = 0; i < count; ++i) {
+            REQUIRE(stack.pop());
+        }
+        REQUIRE(!stack.pop());
+    }
+}
+
+TEST_CASE("pop")
+{
+    app::WindowsStack stack;
+
+    SECTION("empty")
+    {
+        REQUIRE(!stack.pop("window"));
+    }
+
+    SECTION("not empty")
+    {
+        unsigned int count      = 10;
+        std::string name_prefix = "window";
+        auto naming_foo         = [name_prefix](unsigned int i) { return name_prefix + std::to_string(i); };
+        REQUIRE(count > 1);
+        add_dummy_windows(stack, count, naming_foo);
+        // get back to half of stack
+        REQUIRE(stack.pop(naming_foo(count / 2)));
+        // po the rest of stack
+        for (unsigned int i = 0; i < count / 2 + 1; ++i) {
+            REQUIRE(stack.pop());
+        }
+        REQUIRE(!stack.pop());
+    }
+}
+
+TEST_CASE("clearLastWindow")
+{
+    app::WindowsStack stack;
+    SECTION("empty")
+    {
+        REQUIRE(!stack.popLastWindow());
+    }
+
+    SECTION("not empty")
+    {
+        REQUIRE(!stack.popLastWindow());
+        add_dummy_windows(stack, 1);
+        REQUIRE(stack.popLastWindow());
+        add_dummy_windows(stack, 10);
+        REQUIRE(!stack.popLastWindow());
+    }
+}
+
+TEST_CASE("drop")
+{
+    app::WindowsStack stack;
+    SECTION("empty")
+    {
+        REQUIRE(!stack.drop(""));
+        REQUIRE(!stack.drop("any_window_name"));
+    }
+
+    SECTION("not empty")
+    {
+        const unsigned int count = 10;
+        std::string name_prefix  = "window";
+        auto naming_foo          = [name_prefix](unsigned int i) { return name_prefix + std::to_string(i); };
+        add_dummy_windows(stack, count, naming_foo);
+
+        REQUIRE(stack.drop(naming_foo(count / 2)));
+        for (unsigned int i = 0; i < count - 1; ++i) {
+            REQUIRE(stack.pop());
+        }
+        REQUIRE(!stack.pop());
+    }
+}
+
+TEST_CASE("rebuildWindows")
+{
+    app::WindowsStack stack;
+    app::WindowsFactory wf;
+    REQUIRE(not stack.rebuildWindows(wf, nullptr));
+
+    SECTION("rebuild with no builders")
+    {
+        add_dummy_windows(stack, 10);
+        REQUIRE_THROWS_AS(stack.rebuildWindows(wf, nullptr), std::bad_function_call);
+    }
+
+    SECTION("rebuild with no builders")
+    {
+        add_dummy_builders(wf, 10);
+        add_dummy_windows(stack, 10);
+        REQUIRE(stack.rebuildWindows(wf, nullptr));
+    }
+}
+
+TEST_CASE("WindowsStack::clear")
+{
+    app::WindowsStack stack;
+    app::WindowsFactory wf;
+    REQUIRE(stack.isEmpty());
+    stack.clear();
+    REQUIRE(stack.isEmpty());
+    add_dummy_builders(wf, 10);
+    add_dummy_windows(stack, 10);
+    stack.clear();
+    REQUIRE(stack.isEmpty());
+}
diff --git a/module-apps/tests/windows/tests-main.cpp b/module-apps/tests/windows/tests-main.cpp
new file mode 100644
index 000000000..8a6ad34dd
--- /dev/null
+++ b/module-apps/tests/windows/tests-main.cpp
@@ -0,0 +1,5 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
+#include <catch2/catch.hpp>
diff --git a/module-gui/gui/SwitchData.hpp b/module-gui/gui/SwitchData.hpp
index deeefabec..010cc27ac 100644
--- a/module-gui/gui/SwitchData.hpp
+++ b/module-gui/gui/SwitchData.hpp
@@ -17,14 +17,22 @@ namespace gui
     /// if requested)
     class SwitchData
     {
+        bool popup = false;
+
       protected:
         std::string description = "";
 
       public:
         SwitchData() = default;
         explicit SwitchData(std::string description) : description{std::move(description)} {};
+        explicit SwitchData(std::string description, bool popup) : popup(popup), description{std::move(description)} {};
 
         virtual ~SwitchData() = default;
+
+        [[nodiscard]] bool isPopup() const
+        {
+            return popup;
+        }
         [[nodiscard]] virtual const std::string &getDescription() const
         {
             return description;
diff --git a/module-gui/gui/widgets/Window.hpp b/module-gui/gui/widgets/Window.hpp
index 65a6c2a65..de8e4d3e0 100644
--- a/module-gui/gui/widgets/Window.hpp
+++ b/module-gui/gui/widgets/Window.hpp
@@ -76,6 +76,14 @@ namespace gui
             return name;
         };
 
+        /// function to set name - some windows have different name set in
+        /// - builder
+        /// - actual window name
+        [[deprecated]] void setName(const std::string &name)
+        {
+            this->name = name;
+        }
+
         /// used for fetching unique name of window
         virtual std::string getUniqueName()
         {
diff --git a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
index 54aef686e..1b18eee3f 100644
--- a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
+++ b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
@@ -24,6 +24,7 @@
 #include <service-desktop/DesktopMessages.hpp>
 #include <service-eink/ServiceEink.hpp>
 #include <service-evtmgr/EventManagerCommon.hpp>
+#include <AppWindowConstants.hpp>
 
 #include <algorithm>
 #include <utility>
diff --git a/module-utils/log/Logger.cpp b/module-utils/log/Logger.cpp
index 03b95f6ca..695829c20 100644
--- a/module-utils/log/Logger.cpp
+++ b/module-utils/log/Logger.cpp
@@ -25,7 +25,11 @@ namespace Log
                                                             {"ServiceEink", logger_level::LOGINFO},
                                                             {"ServiceDB", logger_level::LOGINFO},
                                                             {CRIT_STR, logger_level::LOGTRACE},
-                                                            {IRQ_STR, logger_level::LOGTRACE}};
+                                                            {IRQ_STR, logger_level::LOGTRACE},
+                                                            {"FileIndexer", logger_level::LOGINFO},
+                                                            {"ServiceAudio", logger_level::LOGERROR},
+                                                            {"EventManager", logger_level::LOGINFO}};
+
     const char *Logger::levelNames[]                     = {"TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL"};
 
     std::ostream &operator<<(std::ostream &stream, const Application &application)
diff --git a/products/BellHybrid/apps/Application.cpp b/products/BellHybrid/apps/Application.cpp
index 65222d5cf..48500b722 100644
--- a/products/BellHybrid/apps/Application.cpp
+++ b/products/BellHybrid/apps/Application.cpp
@@ -17,9 +17,29 @@
 #include <common/windows/BellWelcomeWindow.hpp>
 #include <service-appmgr/Constants.hpp>
 #include <common/popups/BedtimeNotificationWindow.hpp>
+#include <apps-common/WindowsPopupFilter.hpp>
 
 namespace app
 {
+    Application::Application(std::string name,
+                             std::string parent,
+                             StatusIndicators statusIndicators,
+                             StartInBackground startInBackground,
+                             uint32_t stackDepth,
+                             sys::ServicePriority priority)
+        : ApplicationCommon(name, parent, statusIndicators, startInBackground, stackDepth, priority)
+    {
+        getPopupFilter().addAppDependentFilter([&](const gui::PopupRequestParams &popupParams) {
+            bool val = ((isCurrentWindow(gui::popup::resolveWindowName(gui::popup::ID::Reboot))) ||
+                        (isCurrentWindow(gui::popup::resolveWindowName(gui::popup::ID::PowerOff))) ||
+                        (isCurrentWindow(gui::BellTurnOffWindow::name)));
+            if (val == true) {
+                LOG_ERROR("block popup - as curent window is in higher order popup");
+            }
+            return !val;
+        });
+    }
+
     void Application::attachPopups(const std::vector<gui::popup::ID> &popupsList)
     {
         using namespace gui::popup;
@@ -73,13 +93,6 @@ namespace app
         }
     }
 
-    bool Application::isPopupPermitted(gui::popup::ID) const
-    {
-        return not((isCurrentWindow(gui::popup::resolveWindowName(gui::popup::ID::Reboot))) ||
-                   (isCurrentWindow(gui::popup::resolveWindowName(gui::popup::ID::PowerOff))) ||
-                   (isCurrentWindow(gui::BellTurnOffWindow::name)));
-    }
-
     sys::MessagePointer Application::handleKBDKeyEvent(sys::Message *msgl)
     {
         onKeyPressed();
diff --git a/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp b/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp
index bf0bba1e2..1b5ea2042 100644
--- a/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp
+++ b/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp
@@ -54,7 +54,7 @@ namespace app
             priv->timeModel  = std::make_shared<app::TimeModel>();
             priv->alarmPresenter =
                 std::make_shared<bell_alarm::BellAlarmWindowPresenter>(priv->alarmModel, priv->timeModel);
-            return std::make_unique<gui::BellAlarmWindow>(app, priv->alarmPresenter);
+            return std::make_unique<gui::BellAlarmWindow>(app, priv->alarmPresenter, name);
         });
 
         windowsFactory.attach(gui::window::name::bellAlarmSet, [&](ApplicationCommon *app, const std::string &name) {
diff --git a/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp b/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp
index 05b4f3ef0..6d9e12da3 100644
--- a/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp
+++ b/products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp
@@ -42,7 +42,7 @@ namespace app
 
         windowsFactory.attach(gui::window::bell_finished::defaultName,
                               [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::BellFinishedWindow>(app);
+                                  return std::make_unique<gui::BellFinishedWindow>(app, name);
                               });
 
         attachPopups({gui::popup::ID::AlarmActivated,
diff --git a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
index c7180ea11..4b5752e24 100644
--- a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
+++ b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
@@ -22,6 +22,8 @@
 #include <service-appmgr/Controller.hpp>
 #include <system/messages/SystemManagerMessage.hpp>
 #include <common/popups/BedtimeNotificationWindow.hpp>
+#include <apps-common/WindowsPopupFilter.hpp>
+#include <common/windows/BellTurnOffWindow.hpp>
 
 namespace app
 {
@@ -32,6 +34,24 @@ namespace app
                                              std::uint32_t stackDepth)
         : Application(name, parent, statusIndicators, startInBackground, stackDepth)
     {
+
+        getPopupFilter().addAppDependentFilter([&](const gui::PopupRequestParams &popupParams) {
+            auto val = ((isCurrentWindow(gui::popup::resolveWindowName(gui::popup::ID::Reboot))) ||
+                        (isCurrentWindow(gui::popup::resolveWindowName(gui::popup::ID::PowerOff))) ||
+                        (isCurrentWindow(gui::BellTurnOffWindow::name)));
+            if (val) {
+                LOG_INFO("popup blocked");
+                return !val;
+            }
+            if (not(((popupParams.getPopupId() == gui::popup::ID::AlarmActivated ||
+                      popupParams.getPopupId() == gui::popup::ID::AlarmDeactivated)) and
+                    (not isHomeScreenFocused()))) {
+                LOG_INFO("popup blocked");
+                return false;
+            }
+            return true;
+        });
+
         bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);
         addActionReceiver(manager::actions::ShowAlarm, [this](auto &&data) {
             switchWindow(gui::name::window::main_window, std::move(data));
@@ -120,29 +140,14 @@ namespace app
         if (respMessage != nullptr && respMessage->retCode == sys::ReturnCodes::Success) {
             return retMsg;
         }
-        auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
-        if (msg != nullptr) {
-            for (auto &[name, window] : windowsStack.windows) {
-                window->onDatabaseMessage(msg);
-            }
+        if (auto msg = dynamic_cast<db::NotificationMessage *>(msgl); msg != nullptr) {
+            userInterfaceDBNotification(
+                msgl, [&]([[maybe_unused]] sys::Message *, [[maybe_unused]] const std::string &) { return true; });
             return sys::msgHandled();
         }
-
         return handleAsyncResponse(resp);
     }
 
-    void ApplicationBellMain::showPopup(gui::popup::ID id, const gui::PopupRequestParams *params)
-    {
-        if (id == gui::popup::ID::AlarmActivated || id == gui::popup::ID::AlarmDeactivated) {
-            if (not isHomeScreenFocused()) {
-                switchWindow(gui::popup::resolveWindowName(id));
-            }
-        }
-        else {
-            Application::showPopup(id, params);
-        }
-    }
-
     auto ApplicationBellMain::isHomeScreenFocused() -> bool
     {
         return GetName() == app::applicationBellName && getCurrentWindow()->getName() == gui::name::window::main_window;
diff --git a/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp b/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp
index 1977b61e3..052a215ec 100644
--- a/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp
+++ b/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp
@@ -40,10 +40,10 @@ namespace app
         }
 
       private:
-        void showPopup(gui::popup::ID id, const gui::PopupRequestParams *params) override;
         auto isHomeScreenFocused() -> bool;
         void onStart() override;
         sys::MessagePointer handleSwitchWindow(sys::Message *msgl) override;
+        void handleLowBatteryNotification(manager::actions::ActionParamsPtr &&data);
     };
 
     template <> struct ManifestTraits<ApplicationBellMain>
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellBatteryShutdownWindow.hpp b/products/BellHybrid/apps/application-bell-main/windows/BellBatteryShutdownWindow.hpp
index 9fc66065d..5171804e1 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellBatteryShutdownWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellBatteryShutdownWindow.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <apps-common/ApplicationCommon.hpp>
+#include <apps-common/windows/AppWindow.hpp>
 
 namespace gui
 {
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp
index 7eebe91f8..a43fd30e5 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp
@@ -62,7 +62,7 @@ namespace app
         });
         windowsFactory.attach(gui::window::bell_finished::defaultName,
                               [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::BellFinishedWindow>(app);
+                                  return std::make_unique<gui::BellFinishedWindow>(app, name);
                               });
 
         attachPopups({gui::popup::ID::AlarmActivated,
diff --git a/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp b/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp
index 20c691a65..bff8975e0 100644
--- a/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp
+++ b/products/BellHybrid/apps/application-bell-onboarding/ApplicationBellOnBoarding.cpp
@@ -88,7 +88,7 @@ namespace app
             gui::window::name::finalizeOnBoardingWindow, [this](ApplicationCommon *app, const std::string &name) {
                 auto presenter =
                     std::make_unique<OnBoarding::OnBoardingFinalizeWindowPresenter>([&]() { finalizeOnBoarding(); });
-                return std::make_unique<gui::OnBoardingFinalizeWindow>(app, std::move(presenter));
+                return std::make_unique<gui::OnBoardingFinalizeWindow>(app, std::move(presenter), name);
             });
 
         windowsFactory.attach(gui::window::name::informationOnBoardingWindow,
@@ -184,7 +184,7 @@ namespace app
 
         auto selectedWindowCondition =
             getCurrentWindow()->getName() == gui::window::name::informationOnBoardingWindow &&
-            msg->getWindowName() == getPrevWindow() &&
+            msg->getWindowName() == *getPrevWindow() &&
             msg->getSenderWindowName() == gui::window::name::informationOnBoardingWindow;
 
         if (selectedWindowCondition && informationState == OnBoarding::InformationStates::DeepClickWarningInfo) {
@@ -215,7 +215,7 @@ namespace app
                      inputEvent.isKeyRelease(gui::KeyCode::KEY_LEFT)) {
                 informationState = OnBoarding::InformationStates::DeepClickWarningInfo;
                 if (getCurrentWindow()->getName() == gui::window::name::informationOnBoardingWindow) {
-                    displayInformation(getPrevWindow());
+                    displayInformation(*getPrevWindow());
                 }
                 else {
                     displayInformation(getCurrentWindow()->getName());
@@ -225,7 +225,7 @@ namespace app
                 if (informationState == OnBoarding::InformationStates::DeepClickWarningInfo) {
                     informationPromptTimer.stop();
                     informationState = OnBoarding::InformationStates::DeepClickCorrectionInfo;
-                    displayInformation(getPrevWindow());
+                    displayInformation(*getPrevWindow());
                 }
                 else {
                     informationState = OnBoarding::InformationStates::RotateInfo;
@@ -237,13 +237,13 @@ namespace app
                 switch (informationState) {
                 case OnBoarding::InformationStates::DeepClickCorrectionInfo:
                     if (inputEvent.isKeyRelease(gui::KeyCode::KEY_ENTER)) {
-                        switchWindow(getPrevWindow());
+                        switchWindow(*getPrevWindow());
                         return true;
                     }
                     break;
                 case OnBoarding::InformationStates::LightClickInfo:
                     if (inputEvent.isKeyRelease(gui::KeyCode::KEY_ENTER)) {
-                        switchWindow(getPrevWindow());
+                        switchWindow(*getPrevWindow());
                         return true;
                     }
                     break;
@@ -251,7 +251,7 @@ namespace app
                     if (inputEvent.isKeyRelease(gui::KeyCode::KEY_UP) ||
                         inputEvent.isKeyRelease(gui::KeyCode::KEY_DOWN) ||
                         inputEvent.isKeyRelease(gui::KeyCode::KEY_ENTER)) {
-                        switchWindow(getPrevWindow());
+                        switchWindow(*getPrevWindow());
                         return true;
                     }
                     break;
diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.cpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.cpp
index 01857ec46..3ae168b5c 100644
--- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.cpp
@@ -11,8 +11,9 @@ namespace gui
 {
     OnBoardingFinalizeWindow::OnBoardingFinalizeWindow(
         app::ApplicationCommon *app,
-        std::unique_ptr<app::OnBoarding::OnBoardingFinalizeWindowContract::Presenter> &&presenter)
-        : BellFinishedWindow(app), presenter{std::move(presenter)}
+        std::unique_ptr<app::OnBoarding::OnBoardingFinalizeWindowContract::Presenter> &&presenter,
+        const std::string &name)
+        : BellFinishedWindow(app, name), presenter{std::move(presenter)}
     {
         this->presenter->attach(this);
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.hpp b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.hpp
index cfbc88099..e04799070 100644
--- a/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-onboarding/windows/OnBoardingFinalizeWindow.hpp
@@ -14,7 +14,8 @@ namespace gui
       public:
         OnBoardingFinalizeWindow(
             app::ApplicationCommon *app,
-            std::unique_ptr<app::OnBoarding::OnBoardingFinalizeWindowContract::Presenter> &&presenter);
+            std::unique_ptr<app::OnBoarding::OnBoardingFinalizeWindowContract::Presenter> &&presenter,
+            const std::string &name);
 
       private:
         std::unique_ptr<app::OnBoarding::OnBoardingFinalizeWindowContract::Presenter> presenter;
diff --git a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
index aabd3e79c..7f1f50202 100644
--- a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
@@ -106,7 +106,7 @@ namespace app
 
         windowsFactory.attach(gui::window::bell_finished::defaultName,
                               [](ApplicationCommon *app, const std::string &name) {
-                                  return std::make_unique<gui::BellFinishedWindow>(app);
+                                  return std::make_unique<gui::BellFinishedWindow>(app, name);
                               });
 
         windowsFactory.attach(gui::window::name::bellSettingsHomeView,
diff --git a/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp b/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp
index 7038d2db1..16460e839 100644
--- a/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp
+++ b/products/BellHybrid/apps/common/include/common/windows/BellFinishedWindow.hpp
@@ -19,8 +19,7 @@ namespace gui
     class BellFinishedWindow : public WindowWithTimer
     {
       public:
-        explicit BellFinishedWindow(app::ApplicationCommon *app,
-                                    const std::string &name = window::bell_finished::defaultName);
+        explicit BellFinishedWindow(app::ApplicationCommon *app, const std::string &name);
 
       protected:
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/include/Application.hpp b/products/BellHybrid/apps/include/Application.hpp
index 12b860af8..206fa91cf 100644
--- a/products/BellHybrid/apps/include/Application.hpp
+++ b/products/BellHybrid/apps/include/Application.hpp
@@ -13,10 +13,15 @@ namespace app
         using ApplicationCommon::ApplicationCommon;
         void resumeIdleTimer();
         void suspendIdleTimer();
+        explicit Application(std::string name,
+                             std::string parent                  = "",
+                             StatusIndicators statusIndicators   = StatusIndicators{},
+                             StartInBackground startInBackground = {false},
+                             uint32_t stackDepth                 = 4096,
+                             sys::ServicePriority priority       = sys::ServicePriority::Idle);
 
       protected:
         void attachPopups(const std::vector<gui::popup::ID> &popupsList) override;
-        bool isPopupPermitted(gui::popup::ID popupId) const override;
         void startIdleTimer();
         void restartIdleTimer();
         void stopIdleTimer();
diff --git a/products/PurePhone/apps/Application.cpp b/products/PurePhone/apps/Application.cpp
index b021d0bde..23361d08e 100644
--- a/products/PurePhone/apps/Application.cpp
+++ b/products/PurePhone/apps/Application.cpp
@@ -2,6 +2,20 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <Application.hpp>
+#include <popups/AlarmPopup.hpp>
+#include <popups/VolumeWindow.hpp>
+#include <popups/HomeModesWindow.hpp>
+#include <popups/TetheringPhoneModePopup.hpp>
+#include <popups/TetheringConfirmationPopup.hpp>
+#include <popups/PowerOffWindow.hpp>
+#include <popups/presenter/PowerOffPresenter.hpp>
+#include <popups/lock-popups/PhoneLockedWindow.hpp>
+#include <popups/lock-popups/PhoneLockedInfoWindow.hpp>
+#include <popups/lock-popups/PhoneLockInputWindow.hpp>
+#include <popups/lock-popups/PhoneLockChangeInfoWindow.hpp>
+#include <popups/lock-popups/SimLockInputWindow.hpp>
+#include <popups/lock-popups/SimInfoWindow.hpp>
+#include <popups/lock-popups/SimNotReadyWindow.hpp>
 
 namespace app
 {
@@ -16,4 +30,84 @@ namespace app
         window->updateTime();
         window->updatePhoneMode(statusIndicators.phoneMode);
     }
-} // namespace app
\ No newline at end of file
+
+    void Application::attachPopups(const std::vector<gui::popup::ID> &popupsList)
+    {
+        using namespace gui::popup;
+        for (auto popup : popupsList) {
+            switch (popup) {
+            case ID::Volume:
+                windowsFactory.attach(window::volume_window, [](ApplicationCommon *app, const std::string &name) {
+                    return std::make_unique<gui::VolumeWindow>(app, window::volume_window);
+                });
+                break;
+            case ID::Tethering:
+            case ID::TetheringPhoneModeChangeProhibited:
+                windowsFactory.attach(window::tethering_confirmation_window,
+                                      [](ApplicationCommon *app, const std::string &name) {
+                                          return std::make_unique<gui::TetheringConfirmationPopup>(
+                                              app, window::tethering_confirmation_window);
+                                      });
+                windowsFactory.attach(window::tethering_phonemode_change_window,
+                                      [](ApplicationCommon *app, const std::string &name) {
+                                          return std::make_unique<gui::TetheringPhoneModePopup>(
+                                              app, window::tethering_phonemode_change_window);
+                                      });
+                break;
+            case ID::PhoneModes:
+                windowsFactory.attach(window::phone_modes_window, [](ApplicationCommon *app, const std::string &name) {
+                    return std::make_unique<gui::HomeModesWindow>(app, window::phone_modes_window);
+                });
+                break;
+            case ID::Brightness:
+                break;
+            case ID::PhoneLock:
+            case ID::PhoneLockInput:
+            case ID::PhoneLockInfo:
+            case ID::PhoneLockChangeInfo:
+                windowsFactory.attach(window::phone_lock_window, [](ApplicationCommon *app, const std::string &name) {
+                    return std::make_unique<gui::PhoneLockedWindow>(app, window::phone_lock_window);
+                });
+                windowsFactory.attach(
+                    window::phone_lock_info_window, [](ApplicationCommon *app, const std::string &name) {
+                        return std::make_unique<gui::PhoneLockedInfoWindow>(app, window::phone_lock_info_window);
+                    });
+                windowsFactory.attach(
+                    window::phone_lock_input_window, [](ApplicationCommon *app, const std::string &name) {
+                        return std::make_unique<gui::PhoneLockInputWindow>(app, window::phone_lock_input_window);
+                    });
+                windowsFactory.attach(window::phone_lock_change_info_window,
+                                      [](ApplicationCommon *app, const std::string &name) {
+                                          return std::make_unique<gui::PhoneLockChangeInfoWindow>(
+                                              app, window::phone_lock_change_info_window);
+                                      });
+                windowsFactory.attach(window::power_off_window, [](ApplicationCommon *app, const std::string &name) {
+                    auto presenter = std::make_unique<gui::PowerOffPresenter>(app);
+                    return std::make_unique<gui::PowerOffWindow>(app, std::move(presenter));
+                });
+                break;
+            case ID::SimLock:
+            case ID::SimInfo:
+            case ID::SimNotReady:
+                windowsFactory.attach(window::sim_unlock_window, [](ApplicationCommon *app, const std::string &name) {
+                    return std::make_unique<gui::SimLockInputWindow>(app, window::sim_unlock_window);
+                });
+                windowsFactory.attach(window::sim_info_window, [](ApplicationCommon *app, const std::string &name) {
+                    return std::make_unique<gui::SimInfoWindow>(app, window::sim_info_window);
+                });
+                windowsFactory.attach(
+                    window::sim_not_ready_window, [](ApplicationCommon *app, const std::string &name) {
+                        return std::make_unique<gui::SimNotReadyWindow>(app, window::sim_not_ready_window);
+                    });
+                break;
+            case ID::Alarm:
+                windowsFactory.attach(window::alarm_window, [](ApplicationCommon *app, const std::string &name) {
+                    auto presenter = std::make_shared<popup::AlarmPopupPresenter>(app);
+                    return std::make_unique<gui::AlarmPopup>(app, window::alarm_window, presenter);
+                });
+            default:
+                break;
+            }
+        }
+    }
+} // namespace app
diff --git a/products/PurePhone/apps/include/Application.hpp b/products/PurePhone/apps/include/Application.hpp
index 26b3d666b..e9bdfcaaf 100644
--- a/products/PurePhone/apps/include/Application.hpp
+++ b/products/PurePhone/apps/include/Application.hpp
@@ -11,6 +11,7 @@ namespace app
     {
       protected:
         void updateStatuses(gui::AppWindow *window) const override;
+        void attachPopups(const std::vector<gui::popup::ID> &popupsList) override;
 
       public:
         using ApplicationCommon::ApplicationCommon;