From bb1d81908360d583cb088468463581101d2d514b Mon Sep 17 00:00:00 2001
From: Oskar Chodowicz <o.chodowicz@samsung.com>
Date: Thu, 7 Feb 2019 18:05:49 +0100
Subject: [PATCH] Use Button class instead of Evas_Object

Change-Id: I47704c34796cfa845656d5a7b683509f4e8092e1
---
 src/AccessibilityLauncherPage.cpp   | 19 +++++-------
 src/AccessibilityLauncherPage.hpp   |  1 -
 src/AccessoriesSwitchesPage.cpp     | 13 ++++-----
 src/AddSwitchPage.cpp               | 19 +++++-------
 src/AddSwitchPage.hpp               |  1 -
 src/Button.cpp                      |  5 +++-
 src/Button.hpp                      |  3 +-
 src/CameraSwitchesPage.cpp          | 19 +++++-------
 src/CameraSwitchesPage.hpp          |  1 -
 src/MainData.cpp                    | 29 +++++++------------
 src/MainData.hpp                    |  6 ++--
 src/MainPage.cpp                    | 14 +++------
 src/MainPage.hpp                    |  1 -
 src/Naviframe.cpp                   | 34 ++++++++++++++++++----
 src/Naviframe.hpp                   | 11 +++++--
 src/RemoveSwitchPage.cpp            | 35 ++++++++--------------
 src/RemoveSwitchPage.hpp            |  4 +--
 src/ScreenReaderSettingsPage.cpp    | 22 ++++----------
 src/SetValuePage.cpp                | 46 ++++++++++++++---------------
 src/SetValuePage.hpp                |  2 ++
 src/SwitchesPage.cpp                | 38 +++++++++---------------
 src/SwitchesPage.hpp                |  5 ++--
 src/UniversalSwitchPage.cpp         | 58 ++++++++++++++-----------------------
 src/UniversalSwitchPage.hpp         |  5 ++--
 src/UniversalSwitchSettingsPage.cpp | 12 +++++---
 src/Widget.cpp                      | 11 +++++++
 src/Widget.hpp                      |  2 ++
 src/WidgetFactory.cpp               |  5 ----
 src/WidgetFactory.hpp               |  1 -
 29 files changed, 188 insertions(+), 234 deletions(-)

diff --git a/src/AccessibilityLauncherPage.cpp b/src/AccessibilityLauncherPage.cpp
index 4dadb3c..d309e1e 100644
--- a/src/AccessibilityLauncherPage.cpp
+++ b/src/AccessibilityLauncherPage.cpp
@@ -46,7 +46,8 @@ AccessibilityLauncherPage::AccessibilityLauncherPage(SettingAccessibility *ad)
 
 	int state = 0;
 
-	auto genlist = Widget::make<Genlist>(ad->md.getNaviframe());
+	auto naviframe = ad->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -96,12 +97,15 @@ AccessibilityLauncherPage::AccessibilityLauncherPage(SettingAccessibility *ad)
 
 	}
 
-	ad->md.naviframe_it = elm_naviframe_item_push(ad->md.getNaviframe()->getObject(), _("IDS_ACCS_ACCESSIBILITY_LAUNCHER"), NULL, NULL, genlist->getObject(), NULL);
+	ad->md.naviframe_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_ACCESSIBILITY_LAUNCHER"), NULL, NULL, genlist->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(ad->md.naviframe_it, onNaviframePopCb, items);
 	elm_object_item_domain_text_translatable_set(ad->md.naviframe_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(ad->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, onBackButtonCb, ad);
-	elm_layout_content_set(ad->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
+
 }
 
 Eina_Bool AccessibilityLauncherPage::onNaviframePopCb(void *data, Elm_Object_Item *it)
@@ -113,13 +117,6 @@ Eina_Bool AccessibilityLauncherPage::onNaviframePopCb(void *data, Elm_Object_Ite
 	return EINA_TRUE;
 }
 
-void AccessibilityLauncherPage::onBackButtonCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
-
 void AccessibilityLauncherPage::updateVconf(ItemWrapper *items)
 {
 	int value = 0;
diff --git a/src/AccessibilityLauncherPage.hpp b/src/AccessibilityLauncherPage.hpp
index 8a2cc69..de1f36d 100644
--- a/src/AccessibilityLauncherPage.hpp
+++ b/src/AccessibilityLauncherPage.hpp
@@ -43,7 +43,6 @@ public:
 
 private:
 	static Eina_Bool onNaviframePopCb(void *data, Elm_Object_Item *it);
-	static void onBackButtonCb(void *data, Evas_Object *obj, void *event_info);
 	static void updateVconf(ItemWrapper *items);
 	static void onCheckboxChangeCb(void *data, Evas_Object *obj, void *event_info);
 	static void onItemSelectedCb(void *data, Evas_Object *obj, void *event_info);
diff --git a/src/AccessoriesSwitchesPage.cpp b/src/AccessoriesSwitchesPage.cpp
index f833c25..f83e327 100644
--- a/src/AccessoriesSwitchesPage.cpp
+++ b/src/AccessoriesSwitchesPage.cpp
@@ -34,11 +34,10 @@ AccessoriesSwitchesPage::AccessoriesSwitchesPage(SettingAccessibility *ad)
 		context_->us_configuration.switch_id = {};
 	});
 
-	auto prevBtn = Widget::make<Button>(layout, std::string{}, [naviframe]() {
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
 		naviframe->popBack();
-	});
-	prevBtn->setStyle(Button::BACK_BUTTON_ARROW_STYLE);
-	layout->setPartContent("prev_btn", prevBtn);
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 
 	context_->us_configuration.switch_id = {};
 	setting_accessibility_universal_switch_dbus_config_captureSwitch(&context_->config, ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER, -1, captureSwitchCb, this);
@@ -85,7 +84,7 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 		setting_accessibility_universal_switch_dbus_config_captureSwitch(&context_->config, ACCESSIBILITY_UNIVERSAL_SWITCH_ACCESSORIES_SWITCH_PROVIDER, -1, captureSwitchCb, this);
 	};
 
-	auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
+	auto cancelBtn = Widget::make<Button>(popup, cancelBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL");
 	cancelBtn->setStyle("popup");
 	popup->setPartContent("button1", cancelBtn);
 
@@ -103,7 +102,7 @@ void AccessoriesSwitchesPage::newSwitchPopup()
 		parent->removeChild(popup);
 	};
 
-	auto saveBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_SAVE", saveBtnCb);
+	auto saveBtn = Widget::make<Button>(popup, saveBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_SAVE");
 	saveBtn->setStyle("popup");
 	popup->setPartContent("button2", saveBtn);
 }
@@ -119,7 +118,7 @@ void AccessoriesSwitchesPage::alreadyMappedSwitchPopup()
 		parent->removeChild(popup);
 	};
 
-	auto okBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_OK", okBtnCb);
+	auto okBtn = Widget::make<Button>(popup, okBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_OK");
 	okBtn->setStyle("popup");
 	popup->setPartContent("button1", okBtn);
 
diff --git a/src/AddSwitchPage.cpp b/src/AddSwitchPage.cpp
index c0317b1..c73c3af 100644
--- a/src/AddSwitchPage.cpp
+++ b/src/AddSwitchPage.cpp
@@ -27,7 +27,8 @@ AddSwitchPage::AddSwitchPage(SettingAccessibility *ad)
 {
 	retm_if(ad == NULL, "Input parameter is NULL");
 
-	auto genlist = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -47,12 +48,14 @@ AddSwitchPage::AddSwitchPage(SettingAccessibility *ad)
 		}
 	}
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH"), NULL, NULL, genlist->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH"), NULL, NULL, genlist->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(navi_it, onNaviframePopCb, context_);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void AddSwitchPage::attachCallbackOnSwitchAttach(UniversalSwitchCb cb, void *cbData)
@@ -112,14 +115,6 @@ void AddSwitchPage::showSwitchesPage(const std::string &providerId)
 	}
 }
 
-void AddSwitchPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
-
 Eina_Bool AddSwitchPage::onNaviframePopCb(void *data, Elm_Object_Item *it)
 {
 	return EINA_TRUE;
diff --git a/src/AddSwitchPage.hpp b/src/AddSwitchPage.hpp
index 201cc1c..1a983c2 100644
--- a/src/AddSwitchPage.hpp
+++ b/src/AddSwitchPage.hpp
@@ -48,7 +48,6 @@ private:
 	static void disableScreenSwitchProviderIfSwitchMapped(const std::vector<UniversalSwitchConfigurationItem *> &configuration_items, UniversalSwitchSwitchProvider *switch_provider, Elm_Object_Item *item);
 	static void onSwitchAddition(void *data, Evas_Object *obj, void *event_info);
 	void showSwitchesPage(const std::string &providerId);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
 	static Eina_Bool onNaviframePopCb(void *data, Elm_Object_Item *it);
 
 	SettingAccessibility *context_ = nullptr;
diff --git a/src/Button.cpp b/src/Button.cpp
index 30db1f1..65a1650 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -1,4 +1,5 @@
 #include "Button.hpp"
+#include "setting-debug.h"
 
 Button::Button(Widget *parent)
 	: Widget(parent)
@@ -9,12 +10,14 @@ Button::Button(Widget *parent)
 	show();
 }
 
-Button::Button(Widget *parent, const TranslatedString &text, std::function<void()> onClick)
+Button::Button(Widget *parent, std::function<void()> onClick, const TranslatedString &text, const std::string &style)
 {
 	uniqueObj_.reset(elm_button_add(parent->getObject()));
 	setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	setAlignHint(EVAS_HINT_FILL, 0.5);
 	setText(text);
+	if(!style.empty())
+		setStyle(style);
 	setEvasSmartCallback("clicked", onClick);
 	show();
 }
diff --git a/src/Button.hpp b/src/Button.hpp
index dbbf5bc..dd57a16 100644
--- a/src/Button.hpp
+++ b/src/Button.hpp
@@ -9,7 +9,8 @@ public:
 	static constexpr const char *BACK_BUTTON_ARROW_STYLE = "naviframe/end_btn/default";
 
 	Button(Widget *parent);
-	Button(Widget *parent, const TranslatedString &text, std::function<void()> onClick);
+	Button(Widget *parent, std::function<void()> onClick, const TranslatedString &text = {}, const std::string &style = {});
+
 };
 
 #endif
diff --git a/src/CameraSwitchesPage.cpp b/src/CameraSwitchesPage.cpp
index 893f995..3391477 100644
--- a/src/CameraSwitchesPage.cpp
+++ b/src/CameraSwitchesPage.cpp
@@ -25,7 +25,8 @@
 CameraSwitchesPage::CameraSwitchesPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	auto genlist = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -58,11 +59,13 @@ CameraSwitchesPage::CameraSwitchesPage(SettingAccessibility *ad)
 		}
 	}
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_TITLE"), NULL, NULL, genlist->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_ADD_SWITCH_CAMERA_TITLE"), NULL, NULL, genlist->getObject(), NULL);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void CameraSwitchesPage::attachActionCallback(UniversalSwitchCb cb, void *cbData)
@@ -93,11 +96,3 @@ void CameraSwitchesPage::switchActionCb(SettingAccessibility *ad, const std::str
 		self->camera_switch_added_cb(self->camera_switch_added_cb_data, self->chosenSwitch_->id, action, self->chosenSwitch_->name);
 	self->chosenSwitch_ = nullptr;
 }
-
-void CameraSwitchesPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
diff --git a/src/CameraSwitchesPage.hpp b/src/CameraSwitchesPage.hpp
index ec20f3d..b1ddc92 100644
--- a/src/CameraSwitchesPage.hpp
+++ b/src/CameraSwitchesPage.hpp
@@ -38,7 +38,6 @@ public:
 private:
 	static void addSwitchCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchActionCb(SettingAccessibility *ad, const std::string &action, void *user_data);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
 
 	SettingAccessibility *context_ = nullptr;
 	GenGroupItemData *universal_switch_camera_comment = nullptr;
diff --git a/src/MainData.cpp b/src/MainData.cpp
index d1cb375..ede896b 100644
--- a/src/MainData.cpp
+++ b/src/MainData.cpp
@@ -19,6 +19,7 @@
 #include "setting-common-general-func.h"
 #include "setting-common-draw-widget.h"
 #include "setting-debug.h"
+#include "Button.hpp"
 #include "WidgetFactory.hpp"
 
 #include <app.h>
@@ -39,10 +40,10 @@ int MainData::initApp(const std::string &name)
 	return SETTING_RETURN_SUCCESS;
 }
 
-void MainData::initView(const std::string &name)
+void MainData::initView(const TranslatedString &name, std::function<void()> backCb)
 {
 	/* init without genlist */
-	auto ret = initViewWithoutGenlist(name);
+	auto ret = initViewWithoutGenlist(name, backCb);
 	if (ret != SETTING_RETURN_SUCCESS)
 		return;
 
@@ -65,7 +66,7 @@ Genlist *MainData::getGenlist() const
 	return genlist_;
 }
 
-int MainData::initViewWithoutGenlist(const std::string &name)
+int MainData::initViewWithoutGenlist(const TranslatedString &name, std::function<void()> backCb)
 {
 	auto conformant = Widget::make<Conformant>(window.get());
 	conformant->setWeightHint(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -82,7 +83,11 @@ int MainData::initViewWithoutGenlist(const std::string &name)
 	layout_ = Widget::make<Layout>(naviframe_);
 	layout_->setTheme("layout", "application", "default");
 
-	naviframe_->pushBack(name, layout_, {}, {});
+	auto prevBtn = Widget::make<Button>(naviframe_, [naviframe = naviframe_]() {
+		naviframe->popBack();
+	}, "IDS_ST_BUTTON_BACK", Button::BACK_BUTTON_ARROW_STYLE);
+
+	naviframe_->pushBack(name, layout_, {}, backCb, prevBtn);
 	naviframe_it = naviframe_->top();
 
 	return SETTING_RETURN_SUCCESS;
@@ -115,18 +120,4 @@ void MainData::createMainWindow(const std::string &name)
 	window->setIndicatorMode(ELM_WIN_INDICATOR_SHOW);
 	window->setOpacity(ELM_WIN_INDICATOR_OPAQUE);
 
-}
-
-void MainData::addBackButton(Elm_Naviframe_Item_Pop_Cb view_pop_cb, void *ad) const
-{
-	auto back_button = WidgetFactory::createButton(naviframe_->getObject(), "IDS_ST_BUTTON_BACK", WidgetFactory::BACK_BUTTON_ARROW_STYLE, softkeyBackClickCb, naviframe_->getObject());
-	elm_layout_content_set(naviframe_->getObject(), "prev_btn", back_button);
-	elm_naviframe_item_pop_cb_set(naviframe_it, view_pop_cb, ad);
-}
-
-void MainData::softkeyBackClickCb(void *data, Evas_Object *obj, void *event_inf)
-{
-	auto naviframe = static_cast<Evas_Object *>(data);
-	ret_if(!naviframe);
-	elm_naviframe_item_pop(naviframe);
-}
+}
\ No newline at end of file
diff --git a/src/MainData.hpp b/src/MainData.hpp
index d05e1f5..0a23aff 100644
--- a/src/MainData.hpp
+++ b/src/MainData.hpp
@@ -35,19 +35,17 @@ struct MainData {
 public:
 	MainData() = default;
 	int initApp(const std::string &name);
-	void initView(const std::string &name);
+	void initView(const TranslatedString &name, std::function<void()> backCb);
 	Window *getWindow() const;
 	Naviframe *getNaviframe() const;
 	Genlist *getGenlist() const;
-	void addBackButton(Elm_Naviframe_Item_Pop_Cb view_pop_cb, void *ad) const;
 	Elm_Object_Item *naviframe_it;
 
 private:
-	int initViewWithoutGenlist(const std::string &name);
+	int initViewWithoutGenlist(const TranslatedString &name, std::function<void()> backCb);
 	void addRotateSupport();
 	void prepareViewList();
 	void createMainWindow(const std::string &name);
-	static void softkeyBackClickCb(void *data, Evas_Object *obj, void *event_inf);
 
 	Evas *evas = nullptr;
 	std::unique_ptr<Window> window;
diff --git a/src/MainPage.cpp b/src/MainPage.cpp
index f2001a5..fc5dfd4 100644
--- a/src/MainPage.cpp
+++ b/src/MainPage.cpp
@@ -8,11 +8,12 @@
 MainPage::MainPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	context_->md.initView(_("IDS_ST_BODY_ACCESSIBILITY"));
+	context_->md.initView("IDS_ST_BODY_ACCESSIBILITY", [this]() {
+		vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, onScreenReaderVconfKeyChanged);
+		ui_app_exit();
+	});
 	context_->md.getGenlist()->setStyle("dialogue");
 
-	context_->md.addBackButton(cancelCb, nullptr);
-
 	Evas_Object *scroller = context_->md.getGenlist()->getObject();
 	createGendialTitleItem(scroller, &(itc_group_item), "IDS_ST_HEADER_VISION");
 
@@ -57,13 +58,6 @@ MainPage::MainPage(SettingAccessibility *ad)
 	}
 }
 
-Eina_Bool MainPage::cancelCb(void *data, Elm_Object_Item *it)
-{
-	vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, onScreenReaderVconfKeyChanged);
-	ui_app_exit();
-	return EINA_TRUE;
-}
-
 void MainPage::onScreenReaderVconfKeyChanged(keynode_t *key, void *user_data)
 {
 	auto screen_reader_item = static_cast<GenGroupItemData *>(user_data);
diff --git a/src/MainPage.hpp b/src/MainPage.hpp
index e1d2ca4..16584a2 100644
--- a/src/MainPage.hpp
+++ b/src/MainPage.hpp
@@ -15,7 +15,6 @@ public:
 	MainPage(SettingAccessibility *ad);
 
 private:
-	static Eina_Bool cancelCb(void *data, Elm_Object_Item *it);
 	static void onScreenReaderVconfKeyChanged(keynode_t *key, void *user_data);
 	static void onScreenReaderItemClicked(void *data, Evas_Object *obj, void *event_info);
 	static void onUniversalSwitchItemClicked(void *data, Evas_Object *obj, void *event_info);
diff --git a/src/Naviframe.cpp b/src/Naviframe.cpp
index 1478f5a..ad3d2fa 100644
--- a/src/Naviframe.cpp
+++ b/src/Naviframe.cpp
@@ -10,6 +10,7 @@ Naviframe::Naviframe(Widget *parent)
 	uniqueObj_.reset(elm_naviframe_add(parent->getObject()));
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
 	eext_object_event_callback_add(uniqueObj_.get(), EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
+	elm_naviframe_content_preserve_on_pop_set(uniqueObj_.get(), EINA_TRUE);
 	show();
 }
 
@@ -18,23 +19,44 @@ void Naviframe::createPrevBtnAutomatically(bool automatically)
 	elm_naviframe_prev_btn_auto_pushed_set(uniqueObj_.get(), automatically ? EINA_TRUE : EINA_FALSE);
 }
 
-void Naviframe::pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb)
+void Naviframe::pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb, Widget *prevBtn)
 {
-	top_ = elm_naviframe_item_push(uniqueObj_.get(), title.c_str(), nullptr, nullptr, content->getObject(), style.c_str());
+	naviframeStack_.push(std::make_pair(content, prevBtn));
+	auto top = elm_naviframe_item_push(uniqueObj_.get(), title.c_str(), prevBtn ? prevBtn->getObject() : nullptr, nullptr, content->getObject(), style.c_str());
 	if (onPopCb) {
-		naviframeCallbacks_.insert_or_assign(top_, std::move(onPopCb));
-		elm_naviframe_item_pop_cb_set(top_, callbackMethod, this);
+		naviframeCallbacks_.insert_or_assign(top, std::move(onPopCb));
+		elm_naviframe_item_pop_cb_set(top, callbackMethod, this);
+	}
+}
+
+void Naviframe::onPopAnimationEnd()
+{
+	if (naviframeStack_.size())
+	{
+		auto children = naviframeStack_.top();
+		auto removeFromParent = [](Widget *child) {
+			if (child) {
+				auto parent = child->getParent();
+				parent->removeChild(child);
+			}
+		};
+		removeFromParent(children.first);
+		removeFromParent(children.second);
+		naviframeStack_.pop();
 	}
 }
 
 void Naviframe::popBack()
 {
 	elm_naviframe_item_pop(uniqueObj_.get());
-	top_ = elm_naviframe_top_item_get(uniqueObj_.get());
 }
 
 void Naviframe::onPop(Elm_Object_Item *item)
 {
+	setEvasSmartCallback("transition,finished", [this]() {
+		removeEvasSmartCallback("transition,finished");
+		onPopAnimationEnd();
+	});
 	auto cb = naviframeCallbacks_.find(item);
 	if (cb == naviframeCallbacks_.end()) {
 		SETTING_TRACE_ERROR("No callback registered for this frame");
@@ -45,7 +67,7 @@ void Naviframe::onPop(Elm_Object_Item *item)
 
 Elm_Naviframe_Item *Naviframe::top()
 {
-	return top_;
+	return elm_naviframe_top_item_get(uniqueObj_.get());
 }
 
 Eina_Bool Naviframe::callbackMethod(void *data, Elm_Object_Item *it)
diff --git a/src/Naviframe.hpp b/src/Naviframe.hpp
index 10afde6..2131e8c 100644
--- a/src/Naviframe.hpp
+++ b/src/Naviframe.hpp
@@ -2,6 +2,8 @@
 #define NAVIFRAME_HPP
 
 #include "Widget.hpp"
+#include <stack>
+#include <utility>
 
 class Naviframe : public Widget
 {
@@ -9,16 +11,19 @@ public:
 	Naviframe(Widget *parent);
 
 	void createPrevBtnAutomatically(bool automatically);
-	void pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb);
+	void pushBack(const TranslatedString &title, Widget *content, const std::string &style, std::function<void()> onPopCb, Widget *prevBtn = nullptr);
 	void popBack();
-	void onPop(Elm_Object_Item *item);
 	Elm_Naviframe_Item *top();
 
 private:
+	void onPop(Elm_Object_Item *item);
 	static Eina_Bool callbackMethod(void *data, Elm_Object_Item *it);
+	void onPopAnimationEnd();
 
-	Elm_Naviframe_Item *top_ = nullptr;
+	std::stack<std::pair<Widget*, Widget*>> naviframeStack_;
 	std::unordered_map<Elm_Object_Item *, std::function<void()>> naviframeCallbacks_;
 };
 
+
+
 #endif
diff --git a/src/RemoveSwitchPage.cpp b/src/RemoveSwitchPage.cpp
index 9f92d7c..dd25917 100644
--- a/src/RemoveSwitchPage.cpp
+++ b/src/RemoveSwitchPage.cpp
@@ -35,12 +35,15 @@ RemoveSwitchPage::RemoveSwitchPage(SettingAccessibility *ad)
 	setValuePage_ = std::make_unique<SetValuePage>(context_, ValueEditorType::SWITCHES, _("IDS_ACCS_SELECT_ITEMS"));
 	SetValuePage::addRemoveSwitchPageCallback(context_, useNaviframeTitleAsCounter, this);
 
-	all_checkbox = WidgetFactory::createCheck(context_->md.getNaviframe()->getObject(), EINA_FALSE, nullptr, {}, onAllButtonsClicked, this);
+	auto naviframe = context_->md.getNaviframe();
+	all_checkbox = WidgetFactory::createCheck(naviframe->getObject(), EINA_FALSE, nullptr, {}, onAllButtonsClicked, this);
 	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", all_checkbox);
 
-	remove_switches_popup_button = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), "IDS_ACCS_DELETE_CAPS", "naviframe/title_right", onDeleteButtonClicked, this);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "title_right_btn", remove_switches_popup_button);
-	elm_object_disabled_set(remove_switches_popup_button, EINA_TRUE);
+	removeSwitchPopupBtn_ = Widget::make<Button>(naviframe, [this]() {
+		createPopupForSwitchesRemoving();
+	}, "IDS_ACCS_DELETE_CAPS", "naviframe/title_right");
+	removeSwitchPopupBtn_->disable(true);
+	naviframe->setPartContent("title_right_btn", removeSwitchPopupBtn_);
 
 	for (auto i = 0u; i < context_->config.configuration_items.size(); ++i) {
 		auto activity_name = setting_accessibility_universal_switch_dbus_config_get_activity_name(&context_->config, context_->config.configuration_items[i]->activity_type);
@@ -54,15 +57,6 @@ void RemoveSwitchPage::attachCallback(UniversalSwitchCb cb, void *cbData)
 	switch_removed_cb_data = cbData;
 }
 
-void RemoveSwitchPage::onDeleteButtonClicked(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Input parameter is NULL");
-	auto self = static_cast<RemoveSwitchPage *>(data);
-	retm_if(self->context_->set_value_layout.getGenlist() == NULL, "No genlist provided");
-
-	self->createPopupForSwitchesRemoving();
-}
-
 void RemoveSwitchPage::onAllButtonsClicked(void *data, Evas_Object *obj, void *event_info)
 {
 	retm_if(data == NULL, "Input parameter is NULL");
@@ -96,7 +90,7 @@ void RemoveSwitchPage::useNaviframeTitleAsCounter(RemoveSwitchPage *self)
 	} else {
 		title = TranslatedString{"IDS_ACCS_SELECT_ITEMS"} .str();
 	}
-	elm_object_disabled_set(self->remove_switches_popup_button, self->context_->switches_to_remove_counter ? EINA_FALSE : EINA_TRUE);
+	self->removeSwitchPopupBtn_->disable(self->context_->switches_to_remove_counter ? false : true);
 	elm_layout_text_set(self->context_->md.getNaviframe()->getObject(), "default", title.c_str());
 }
 
@@ -125,16 +119,9 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 	popup->setEvasSmartCallback("block,clicked", removeCb);
 
 
-	auto cancelBtn = Widget::make<Button>(popup);
-	cancelBtn->setText("IDS_ST_BUTTON_CANCEL");
-	cancelBtn->setStyle("bottom");
-	cancelBtn->setEvasSmartCallback("clicked", removeCb);
+	auto cancelBtn = Widget::make<Button>(popup, removeCb, "IDS_ST_BUTTON_CANCEL", "bottom");
 	popup->setPartContent("button1", cancelBtn);
 
-	auto deleteSwitchBtn = Widget::make<Button>(popup);
-	deleteSwitchBtn->setText("IDS_ACCS_DELETE");
-	deleteSwitchBtn->setStyle("bottom");
-
 	auto removeSwitchCb = [removeCb, this]() {
 
 		Elm_Object_Item *item = elm_genlist_last_item_get(context_->set_value_layout.getGenlist()->getObject());
@@ -146,6 +133,7 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 		}
 
 		removeCb();
+		context_->md.getNaviframe()->removeChild(removeSwitchPopupBtn_);
 		context_->md.getNaviframe()->popBack();
 
 		bool disable_universal_switch = context_->switches_to_remove_counter == context_->set_value_layout.getGenlist()->size();
@@ -153,7 +141,8 @@ void RemoveSwitchPage::createPopupForSwitchesRemoving()
 			LOGE("Failed to set vconf key %s.", VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE);
 
 	};
-	deleteSwitchBtn->setEvasSmartCallback("clicked", removeSwitchCb);
+
+	auto deleteSwitchBtn = Widget::make<Button>(popup, removeSwitchCb, "IDS_ACCS_DELETE", "bottom");
 	popup->setPartContent("button2", deleteSwitchBtn);
 }
 
diff --git a/src/RemoveSwitchPage.hpp b/src/RemoveSwitchPage.hpp
index 5b00e00..23654b4 100644
--- a/src/RemoveSwitchPage.hpp
+++ b/src/RemoveSwitchPage.hpp
@@ -20,6 +20,7 @@
 #include "SettingAccessibility.hpp"
 #include "SetValuePage.hpp"
 #include "Popup.hpp"
+#include "Button.hpp"
 
 class SetValuePage;
 
@@ -41,7 +42,6 @@ public:
 	static void useNaviframeTitleAsCounter(RemoveSwitchPage *self);
 
 private:
-	static void onDeleteButtonClicked(void *data, Evas_Object *obj, void *event_info);
 	static void onAllButtonsClicked(void *data, Evas_Object *obj, void *event_info);
 	void createPopupForSwitchesRemoving();
 	static void onRemoveSelectedSwitches(void *data, Evas_Object *obj, void *event_info);
@@ -52,7 +52,7 @@ private:
 	std::unique_ptr<SetValuePage> setValuePage_;
 	UniversalSwitchCb switch_removed_cb;
 	void *switch_removed_cb_data = nullptr;
-	Evas_Object *remove_switches_popup_button = nullptr;
+	Button *removeSwitchPopupBtn_ = nullptr;
 	Evas_Object *all_checkbox = nullptr;
 };
 
diff --git a/src/ScreenReaderSettingsPage.cpp b/src/ScreenReaderSettingsPage.cpp
index 2d80fa4..f357fa0 100644
--- a/src/ScreenReaderSettingsPage.cpp
+++ b/src/ScreenReaderSettingsPage.cpp
@@ -272,10 +272,7 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 	box->setMaxSizeHint(-1, ELM_SCALE_SIZE(POPUP_CONTENT_BASE_SIZE) * vConfCheckData.size());
 	self->popup_->setContent(box);
 
-	auto btnCancel = Widget::make<Button>(self->popup_);
-	btnCancel->setStyle("popup");
-	btnCancel->setText("IDS_MSG_ACBUTTON_CANCEL_ABB");
-	btnCancel->setEvasSmartCallback("clicked", removeCb);
+	auto btnCancel = Widget::make<Button>(self->popup_, removeCb, "IDS_MSG_ACBUTTON_CANCEL_ABB", "popup");
 	self->popup_->setPartContent("button1", btnCancel);
 
 	auto onDone = [removeCb]() {
@@ -289,10 +286,7 @@ void ScreenReaderSettingsPage::mouseUpGendialListCb(void *data, Evas_Object *obj
 		}
 	};
 
-	auto btnDone = Widget::make<Button>(self->popup_);
-	btnDone->setStyle("popup");
-	btnDone->setText("IDS_MSG_ACBUTTON_DONE_ABB");
-	btnDone->setEvasSmartCallback("clicked", onDone);
+	auto btnDone = Widget::make<Button>(self->popup_, onDone, "IDS_MSG_ACBUTTON_DONE_ABB", "popup");
 	self->popup_->setPartContent("button2", btnDone);
 }
 
@@ -456,21 +450,15 @@ void ScreenReaderSettingsPage::createSpeechRatePopup(void *item)
 	slider->setValue(val);
 	layout->setPartContent("slider", slider);
 
-	auto cancelBtn = Widget::make<Button>(popup_);
-	cancelBtn->setText("IDS_ST_BUTTON_CANCEL_ABB");
-	cancelBtn->setStyle("bottom");
-	cancelBtn->setEvasSmartCallback("clicked", removeCb);
+	auto cancelBtn = Widget::make<Button>(popup_, removeCb, "IDS_ST_BUTTON_CANCEL_ABB", "bottom");
 	popup_->setPartContent("button1", cancelBtn);
 
-	auto doneBtn = Widget::make<Button>(popup_);
-	doneBtn->setText("IDS_ST_SK3_DONE");
-	doneBtn->setStyle("bottom");
-	doneBtn->setEvasSmartCallback("clicked", [p = popup_, window, slider]() {
+	auto doneBtn = Widget::make<Button>(popup_, [p = popup_, window, slider]() {
 		auto value = static_cast<int>(slider->getValue());
 		if (0 != tts_setting_set_speed(value))
 			SETTING_TRACE("Setting speed to tts engine failed");
 		window->removeChild(p);
-	});
+	}, "IDS_ST_SK3_DONE", "bottom");
 	popup_->setPartContent("button2", doneBtn);
 
 	evas_object_event_callback_add(popup_->getObject(), EVAS_CALLBACK_DEL, onPopupDel, item);
diff --git a/src/SetValuePage.cpp b/src/SetValuePage.cpp
index 6b52a25..8d70dc1 100644
--- a/src/SetValuePage.cpp
+++ b/src/SetValuePage.cpp
@@ -40,9 +40,10 @@
 #define PRT_SET_VALUE_ENTRY "set-value-entry"
 
 SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const char *title)
+	: context_(ad)
 {
 	const char *layout_grp = NULL;
-	retm_if(ad == NULL, "Input parameter is NULL");
+	retm_if(context_ == NULL, "Input parameter is NULL");
 	retm_if(title == NULL, "Title parameter is NULL");
 
 	switch (type) {
@@ -63,40 +64,43 @@ SetValuePage::SetValuePage(SettingAccessibility *ad, ValueEditorType type, const
 		layout_grp = GRP_SET_VALUE_NUMERIC;
 		SETTING_TRACE_DEBUG("Unrecognized layout type!");
 	}
-	ad->set_value_layout.setLayout(createLayout(ad->md.getNaviframe(), layout_grp));
+	auto naviframe = context_->md.getNaviframe();
+	context_->set_value_layout.setLayout(createLayout(naviframe, layout_grp));
 	switch (type) {
 	case ValueEditorType::NUMERIC:
-		ad->set_value_layout.setScroller(createScroller(ad->set_value_layout.getLayout()->getObject()));
-		ad->set_value_layout.setBox(createBox(ad->set_value_layout.getScroller()));
-		evas_object_smart_callback_add(ad->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
+		context_->set_value_layout.setScroller(createScroller(context_->set_value_layout.getLayout()->getObject()));
+		context_->set_value_layout.setBox(createBox(context_->set_value_layout.getScroller()));
+		evas_object_smart_callback_add(context_->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
 		break;
 	case ValueEditorType::NUMERIC_SWITCH:
-		ad->set_value_layout.setScroller(createScroller(ad->set_value_layout.getLayout()->getObject()));
-		ad->set_value_layout.setBox(createBox(ad->set_value_layout.getScroller()));
-		ad->set_value_layout.setCheck(createCheck(ad->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
-		evas_object_smart_callback_add(ad->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
+		context_->set_value_layout.setScroller(createScroller(context_->set_value_layout.getLayout()->getObject()));
+		context_->set_value_layout.setBox(createBox(context_->set_value_layout.getScroller()));
+		context_->set_value_layout.setCheck(createCheck(context_->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
+		evas_object_smart_callback_add(context_->set_value_layout.getScroller(), "scroll,page,changed", scrollerScrollCb, (void *)ad);
 		break;
 	case ValueEditorType::RADIOS:
-		ad->set_value_layout.radio_item_change_cb = NULL;
-		ad->set_value_layout.setGenlist(createGenlist(ad->set_value_layout.getLayout(), NULL));
+		context_->set_value_layout.radio_item_change_cb = NULL;
+		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), NULL));
 		break;
 	case ValueEditorType::SWITCHES:
-		ad->set_value_layout.setGenlist(createGenlist(ad->set_value_layout.getLayout(), NULL));
+		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), NULL));
 		break;
 	case ValueEditorType::LIST_SWITCH:
-		ad->set_value_layout.setCheck(createCheck(ad->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
-		ad->set_value_layout.setGenlist(createGenlist(ad->set_value_layout.getLayout(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS")));
+		context_->set_value_layout.setCheck(createCheck(context_->set_value_layout.getLayout()->getObject(), EINA_FALSE, checkStateChangedCb, ad));
+		context_->set_value_layout.setGenlist(createGenlist(context_->set_value_layout.getLayout(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_FEEDBACK_OPTIONS")));
 		break;
 	default:
 		LOGE("Wrong value type");
 	}
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(ad->md.getNaviframe()->getObject(), title, NULL, NULL, ad->set_value_layout.getLayout()->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), title, NULL, NULL, context_->set_value_layout.getLayout()->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(navi_it, naviframePopCb, ad);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(ad->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, ad);
-	elm_layout_content_set(ad->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void SetValuePage::setDescription(SettingAccessibility *ad, const char *description)
@@ -561,11 +565,3 @@ Eina_Bool SetValuePage::naviframePopCb(void *data, Elm_Object_Item *it)
 
 	return EINA_TRUE;
 }
-
-void SetValuePage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
diff --git a/src/SetValuePage.hpp b/src/SetValuePage.hpp
index c7ee611..16cdd97 100644
--- a/src/SetValuePage.hpp
+++ b/src/SetValuePage.hpp
@@ -72,6 +72,8 @@ private:
 	static void checkStateChangedCb(void *data, Evas_Object *obj, void *event_info);
 	static Eina_Bool naviframePopCb(void *data, Elm_Object_Item *it);
 	static void backCb(void *data, Evas_Object *obj, void *event_info);
+
+	SettingAccessibility *context_ = nullptr;
 };
 
 #endif
diff --git a/src/SwitchesPage.cpp b/src/SwitchesPage.cpp
index f06e443..724dfd7 100644
--- a/src/SwitchesPage.cpp
+++ b/src/SwitchesPage.cpp
@@ -24,19 +24,26 @@
 SwitchesPage::SwitchesPage(SettingAccessibility *ad)
 	: context_(ad)
 {
-	switches_ = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	switches_ = Widget::make<Genlist>(naviframe);
 	switches_->setMode(ELM_LIST_COMPRESS);
 	switches_->setStyle("dialogue");
 
-	context_->md.naviframe_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SWITCHES"), NULL, NULL, switches_->getObject(), NULL);
+	context_->md.naviframe_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_SWITCHES"), NULL, NULL, switches_->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(context_->md.naviframe_it, naviframePopCb, this);
 	elm_object_item_domain_text_translatable_set(context_->md.naviframe_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, ad);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	removeSwitchesPageBtn_ = Widget::make<Button>(naviframe, [this]() {
+		removeSwitchPage_ = std::make_unique<RemoveSwitchPage>(context_);
+		removeSwitchPage_->attachCallback(switchRemovedCb, this);
+	}, "IDS_ACCS_DELETE_CAPS", "naviframe/title_right");
+	naviframe->setPartContent("title_right_btn", removeSwitchesPageBtn_);
 
-	remove_switches_page_button = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), "IDS_ACCS_DELETE_CAPS", "naviframe/title_right", createRemovePageCb, this);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "title_right_btn", remove_switches_page_button);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe, this]() {
+		naviframe->removeChild(removeSwitchesPageBtn_);
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 
 	updateSwitchesList();
 }
@@ -52,7 +59,7 @@ void SwitchesPage::updateSwitchesList()
 	switches_->clear();
 	createSwitchesGroup();
 	createAddButton();
-	elm_object_disabled_set(remove_switches_page_button, context_->config.configuration_items.size() == 0);
+	removeSwitchesPageBtn_->disable(context_->config.configuration_items.size() == 0);
 }
 
 void SwitchesPage::createAddButton()
@@ -78,15 +85,6 @@ void SwitchesPage::createSwitchesGroup()
 	}
 }
 
-void SwitchesPage::createRemovePageCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto self = static_cast<SwitchesPage *>(data);
-
-	self->removeSwitchPage_ = std::make_unique<RemoveSwitchPage>(self->context_);
-	self->removeSwitchPage_->attachCallback(switchRemovedCb, self);
-}
-
 void SwitchesPage::addSwitchClickedCb(void *data, Evas_Object *obj, void *event_info)
 {
 	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
@@ -171,11 +169,3 @@ Eina_Bool SwitchesPage::naviframePopCb(void *data, Elm_Object_Item *it)
 
 	return EINA_TRUE;
 }
-
-void SwitchesPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
diff --git a/src/SwitchesPage.hpp b/src/SwitchesPage.hpp
index 10ad379..2f1394a 100644
--- a/src/SwitchesPage.hpp
+++ b/src/SwitchesPage.hpp
@@ -23,6 +23,7 @@
 #include "AddSwitchPage.hpp"
 #include "UpdateSwitchPage.hpp"
 #include "Genlist.hpp"
+#include "Button.hpp"
 
 class RemoveSwitchPage;
 class AddSwitchPage;
@@ -49,17 +50,15 @@ private:
 	void updateSwitchesList();
 	void createAddButton();
 	void createSwitchesGroup();
-	static void createRemovePageCb(void *data, Evas_Object *obj, void *event_info);
 	static void addSwitchClickedCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchClickCb(void *data, Evas_Object *obj, void *event_info);
 	static void switchUpdatedCb(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
 	static void switchRemovedCb(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
 	GenGroupItemData *addMappedSwitchMenuItem(const std::string &main_text, const std::string &sub_text, SettingCallback item_cb, void *user_data);
 	static Eina_Bool  naviframePopCb(void *data, Elm_Object_Item *it);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
 
 	SettingAccessibility *context_ = nullptr;
-	Evas_Object *remove_switches_page_button = nullptr;
+	Button *removeSwitchesPageBtn_ = nullptr;
 	back_cb universal_switch_switches_back = nullptr;
 	void *universal_switch_switches_back_data = nullptr;
 	Genlist *switches_ = nullptr;
diff --git a/src/UniversalSwitchPage.cpp b/src/UniversalSwitchPage.cpp
index 189e998..f93d459 100644
--- a/src/UniversalSwitchPage.cpp
+++ b/src/UniversalSwitchPage.cpp
@@ -17,7 +17,6 @@
 #include "UniversalSwitchPage.hpp"
 
 #include "setting-accessibility.h"
-#include "Button.hpp"
 #include "Popup.hpp"
 #include "WidgetFactory.hpp"
 
@@ -29,7 +28,8 @@ UniversalSwitchPage::UniversalSwitchPage(SettingAccessibility *ad)
 {
 	int state = false;
 	context_->md.naviframe_it = NULL;
-	auto genlist = Widget::make<Genlist>(context_->md.getNaviframe());
+	auto naviframe = context_->md.getNaviframe();
+	auto genlist = Widget::make<Genlist>(naviframe);
 	genlist->setMode(ELM_LIST_COMPRESS);
 	genlist->setStyle("dialogue");
 	genlist->clear(); // TODO check if necessary
@@ -67,19 +67,24 @@ UniversalSwitchPage::UniversalSwitchPage(SettingAccessibility *ad)
 		elm_genlist_item_select_mode_set(universal_switch_comment->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 	}
 
-	context_->md.naviframe_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH"), NULL, NULL, genlist->getObject(), NULL);
-	elm_object_item_domain_text_translatable_set(context_->md.naviframe_it, PACKAGE, EINA_TRUE);
-	elm_naviframe_item_pop_cb_set(context_->md.naviframe_it, naviframePopCb, this);
+	auto prevBtn = Widget::make<Button>(naviframe, [this, naviframe]() {
+		naviframe->removeChild(usSettingsBtn_);
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
 
-	std::string title_str = "<font_size=30>" + TranslatedString{"IDS_ACCS_SETTINGS_CAPS"} .str() + "</font_size>";
+	naviframe->pushBack("IDS_ACCS_UNIVERSAL_SWITCH", genlist, {}, [this]() {
+		vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, onVconfKeyChange);
+		stopUniversalSwitch(context_);
 
-	universal_switch_settings_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), title_str, "naviframe/title_right", createSettingsPage, this);
-	if (universal_switch_settings_btn)
-		elm_object_disabled_set(universal_switch_settings_btn, EINA_TRUE);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "title_right_btn", universal_switch_settings_btn);
+		universal_switch_off_checkbox = NULL;
+	}, prevBtn);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	std::string title_str = "<font_size=30>" + TranslatedString{"IDS_ACCS_SETTINGS_CAPS"} .str() + "</font_size>";
+	usSettingsBtn_ = Widget::make<Button>(naviframe, [this]() {
+		universalSwitchSettingsPage_ = std::make_unique<UniversalSwitchSettingsPage>(context_);
+	}, title_str, "naviframe/title_right");
+	usSettingsBtn_->disable(true);
+	naviframe->setPartContent("title_right_btn", usSettingsBtn_);
 
 	startUniversalSwitch();
 }
@@ -137,7 +142,7 @@ void UniversalSwitchPage::updateVconfKey(int state)
 			auto parent = popup->getParent();
 			parent->removeChild(popup);
 		};
-		auto addBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_POPUP_ADD", addBtnCb);
+		auto addBtn = Widget::make<Button>(popup, addBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_POPUP_ADD");
 		addBtn->setStyle("popup");
 		popup->setPartContent("button1", addBtn);
 
@@ -147,7 +152,7 @@ void UniversalSwitchPage::updateVconfKey(int state)
 			auto parent = popup->getParent();
 			parent->removeChild(popup);
 		};
-		auto cancelBtn = Widget::make<Button>(popup, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL", cancelBtnCb);
+		auto cancelBtn = Widget::make<Button>(popup, cancelBtnCb, "IDS_ACCS_UNIVERSAL_SWITCH_CANCEL");
 		cancelBtn->setStyle("popup");
 		popup->setPartContent("button2", cancelBtn);
 	} else {
@@ -169,27 +174,6 @@ void UniversalSwitchPage::onNewSwitchAddition(void *data, const std::string &swi
 	SETTING_TRACE_DEBUG("New switch added. Id: %s, name: %s, action: %s. Switches count: %d", switch_id.c_str(), switch_name.c_str(), switch_action.c_str(), switch_count);
 }
 
-void UniversalSwitchPage::backCb(void *data, Evas_Object *obj, void *event_info)
-{
-	retm_if(data == NULL, "Data argument is NULL");
-	auto ad = static_cast<SettingAccessibility *>(data);
-
-	elm_naviframe_item_pop(ad->md.getNaviframe()->getObject());
-}
-
-Eina_Bool UniversalSwitchPage::naviframePopCb(void *data, Elm_Object_Item *it)
-{
-	auto self = static_cast<UniversalSwitchPage *>(data);
-
-	vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_UNIVERSAL_SWITCH_INTERACTION_SERVICE, onVconfKeyChange);
-	stopUniversalSwitch(self->context_);
-
-	self->universal_switch_off_checkbox = NULL;
-	self->universal_switch_settings_btn = NULL;
-
-	return EINA_TRUE;
-}
-
 void UniversalSwitchPage::stopUniversalSwitch(SettingAccessibility *ad)
 {
 	setting_accessibility_universal_switch_dbus_config_shutdown(&ad->config);
@@ -222,8 +206,8 @@ void UniversalSwitchPage::onUniversalSwitchStarting(void *data)
 	if (self->universal_switch_off_checkbox)
 		elm_object_item_disabled_set(self->universal_switch_off_checkbox->item, EINA_FALSE);
 
-	if (self->universal_switch_settings_btn)
-		elm_object_disabled_set(self->universal_switch_settings_btn, EINA_FALSE);
+	if (self->usSettingsBtn_)
+		self->usSettingsBtn_->disable(false);
 }
 
 void UniversalSwitchPage::listCb(void *data, Evas_Object *obj, void *event_info)
diff --git a/src/UniversalSwitchPage.hpp b/src/UniversalSwitchPage.hpp
index 12de42a..704f3de 100644
--- a/src/UniversalSwitchPage.hpp
+++ b/src/UniversalSwitchPage.hpp
@@ -19,6 +19,7 @@
 
 #include "SettingAccessibility.hpp"
 #include "UniversalSwitchSettingsPage.hpp"
+#include "Button.hpp"
 
 #include <vconf.h>
 
@@ -44,8 +45,6 @@ private:
 	static bool setState(bool state);
 	void updateVconfKey(int state); //TODO rename
 	static void onNewSwitchAddition(void *data, const std::string &switch_id, const std::string &switch_action, const std::string &switch_name);
-	static void backCb(void *data, Evas_Object *obj, void *event_info);
-	static Eina_Bool naviframePopCb(void *data, Elm_Object_Item *it);
 	static void stopUniversalSwitch(SettingAccessibility *ad);
 	void startUniversalSwitch();
 	static void onUniversalSwitchStarting(void *data);
@@ -57,7 +56,7 @@ private:
 	std::unique_ptr<UniversalSwitchSettingsPage> universalSwitchSettingsPage_;
 	GenGroupItemData *universal_switch_comment;
 	GenGroupItemData *universal_switch_off_checkbox;
-	Evas_Object *universal_switch_settings_btn;
+	Button *usSettingsBtn_ = nullptr;
 
 };
 
diff --git a/src/UniversalSwitchSettingsPage.cpp b/src/UniversalSwitchSettingsPage.cpp
index fe2004e..4cd45ae 100644
--- a/src/UniversalSwitchSettingsPage.cpp
+++ b/src/UniversalSwitchSettingsPage.cpp
@@ -18,6 +18,7 @@
 
 #include "setting-accessibility.h"
 #include "utils.hpp"
+#include "Button.hpp"
 #include "WidgetFactory.hpp"
 
 #include <app.h>
@@ -137,8 +138,9 @@ const char *_manage_options_key_array[] = {
 UniversalSwitchSettingsPage::UniversalSwitchSettingsPage(SettingAccessibility *ad)
 	: context_(ad)
 {
+	auto naviframe = context_->md.getNaviframe();
 	context_->md.naviframe_it = NULL;
-	genlist_ = Widget::make<Genlist>(context_->md.getNaviframe());
+	genlist_ = Widget::make<Genlist>(naviframe);
 	genlist_->setMode(ELM_LIST_COMPRESS);
 	genlist_->setStyle("dialogue");
 
@@ -149,12 +151,14 @@ UniversalSwitchSettingsPage::UniversalSwitchSettingsPage(SettingAccessibility *a
 	createFeedbackGroup();
 	createManageGroup();
 
-	Elm_Object_Item *navi_it = elm_naviframe_item_push(context_->md.getNaviframe()->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS"), NULL, NULL, genlist_->getObject(), NULL);
+	Elm_Object_Item *navi_it = elm_naviframe_item_push(naviframe->getObject(), _("IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS"), NULL, NULL, genlist_->getObject(), NULL);
 	elm_naviframe_item_pop_cb_set(navi_it, naviframPopCb, context_);
 	elm_object_item_domain_text_translatable_set(navi_it, PACKAGE, EINA_TRUE);
 
-	Evas_Object *back_btn = WidgetFactory::createButton(context_->md.getNaviframe()->getObject(), {}, WidgetFactory::BACK_BUTTON_ARROW_STYLE, backCb, context_);
-	elm_layout_content_set(context_->md.getNaviframe()->getObject(), "prev_btn", back_btn);
+	auto prevBtn = Widget::make<Button>(naviframe, [naviframe]() {
+		naviframe->popBack();
+	}, std::string{}, Button::BACK_BUTTON_ARROW_STYLE);
+	naviframe->setPartContent("prev_btn", prevBtn);
 }
 
 void UniversalSwitchSettingsPage::createManageGroup()
diff --git a/src/Widget.cpp b/src/Widget.cpp
index 0a3c06f..1de370d 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -44,6 +44,12 @@ void Widget::setEvasSmartCallback(const std::string &eventName, std::function<vo
 	evas_object_smart_callback_add(getObject(), eventName.c_str(), smartCallbackMethod, dataPtr);
 }
 
+void Widget::removeEvasSmartCallback(const std::string &eventName)
+{
+	evas_object_smart_callback_del(uniqueObj_.get(), eventName.c_str(), smartCallbackMethod);
+	smartCallbacks_.erase(eventName);
+}
+
 void Widget::setEextEventCallback(const Eext_Callback_Type type, std::function<void()> callback)
 {
 	auto cbData = std::make_unique<WidgetCallback::Data<Eext_Callback_Type>>(this, type);
@@ -72,6 +78,11 @@ void Widget::setPartContent(const std::string &part, Widget *content)
 	elm_object_part_content_set(uniqueObj_.get(), part.c_str(), content->getObject());
 }
 
+void Widget::disable(bool disable)
+{
+	disable ? elm_object_disabled_set(uniqueObj_.get(), EINA_TRUE) : elm_object_disabled_set(uniqueObj_.get(), EINA_FALSE);
+}
+
 void Widget::emitSignal(const std::string &signal)
 {
 	elm_object_signal_emit(uniqueObj_.get(), signal.c_str(), "");
diff --git a/src/Widget.hpp b/src/Widget.hpp
index 0d864a5..16b5c93 100644
--- a/src/Widget.hpp
+++ b/src/Widget.hpp
@@ -41,11 +41,13 @@ public:
 	void setMinSizeHint(Evas_Coord v, Evas_Coord h);
 	void setMaxSizeHint(Evas_Coord v, Evas_Coord h);
 	void setEvasSmartCallback(const std::string &eventName, std::function<void()> callback);
+	void removeEvasSmartCallback(const std::string &eventName);
 	void setEextEventCallback(const Eext_Callback_Type type, std::function<void()> callback);
 	void setStyle(const std::string &style);
 	void setColor(int r, int g, int b, int a);
 	void setContent(Widget *widget);
 	void setPartContent(const std::string &part, Widget *content);
+	void disable(bool disable);
 	void emitSignal(const std::string &signal);
 	void show();
 	void hide();
diff --git a/src/WidgetFactory.cpp b/src/WidgetFactory.cpp
index de10d99..410cdd7 100644
--- a/src/WidgetFactory.cpp
+++ b/src/WidgetFactory.cpp
@@ -7,22 +7,17 @@ Evas_Object *WidgetFactory::createButton(Evas_Object *parent, const std::string
 		const std::string &btn_style, Evas_Smart_Cb onClicked, void *cbData)
 {
 	retv_if(!parent, NULL);
-
 	auto button = elm_button_add(parent);
 	retv_if(!button, NULL);
-
 	if (!btn_style.empty()) //TODO: "if" can be probably removed
 		elm_object_style_set(button, btn_style.c_str());
-
 	if (btn_style != BACK_BUTTON_ARROW_STYLE) {
 		elm_object_text_set(button, TranslatedString{btn_str} .c_str());
 		evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		evas_object_size_hint_align_set(button, EVAS_HINT_FILL, 0.5);
 	}
-
 	if (onClicked)
 		evas_object_smart_callback_add(button, "clicked", onClicked, cbData);
-
 	evas_object_show(button);
 	return button;
 }
diff --git a/src/WidgetFactory.hpp b/src/WidgetFactory.hpp
index 1fda40d..f801d22 100644
--- a/src/WidgetFactory.hpp
+++ b/src/WidgetFactory.hpp
@@ -13,7 +13,6 @@ public:
 
 	static Evas_Object *createButton(Evas_Object *parent, const std::string &btn_str,
 									 const std::string &btn_style, Evas_Smart_Cb onClicked, void *cbData);
-
 	static Evas_Object *createRadio(Evas_Object *parent, int value, Elm_Radio *group, Evas_Smart_Cb onChanged, void *cbData);
 	static Evas_Object *createCheck(Evas_Object *parent, Eina_Bool state, Eina_Bool *statePtr, const std::string &style, Evas_Smart_Cb onChanged, void *cbData);
 
-- 
2.7.4