diff --git a/Makefile b/Makefile
index f17afdb7..612d823f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,16 +12,16 @@ SRCS =  src/main.cpp\
 		src/app/browser/header/tab.cpp\
 		src/app/browser/main.cpp\
 		src/app/browser/main/tab.cpp\
-		src/app/browser/main/tab/data.cpp\
-		src/app/browser/main/tab/data/content.cpp\
-		src/app/browser/main/tab/data/navbar.cpp\
-		src/app/browser/main/tab/data/navbar/base.cpp\
-		src/app/browser/main/tab/data/navbar/bookmark.cpp\
-		src/app/browser/main/tab/data/navbar/history.cpp\
-		src/app/browser/main/tab/data/navbar/history/back.cpp\
-		src/app/browser/main/tab/data/navbar/history/forward.cpp\
-		src/app/browser/main/tab/data/navbar/request.cpp\
-		src/app/browser/main/tab/data/navbar/update.cpp\
+		src/app/browser/main/tab/page.cpp\
+		src/app/browser/main/tab/page/content.cpp\
+		src/app/browser/main/tab/page/navbar.cpp\
+		src/app/browser/main/tab/page/navbar/base.cpp\
+		src/app/browser/main/tab/page/navbar/bookmark.cpp\
+		src/app/browser/main/tab/page/navbar/history.cpp\
+		src/app/browser/main/tab/page/navbar/history/back.cpp\
+		src/app/browser/main/tab/page/navbar/history/forward.cpp\
+		src/app/browser/main/tab/page/navbar/request.cpp\
+		src/app/browser/main/tab/page/navbar/update.cpp\
 		src/app/browser/main/tab/label.cpp\
 		src/lib/database.cpp\
 		src/lib/database/session.cpp
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 39bfdfc9..4c542a98 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,16 +4,16 @@ src/app/browser/header/menu.cpp
 src/app/browser/header/tab.cpp
 src/app/browser/main.cpp
 src/app/browser/main/tab.cpp
-src/app/browser/main/tab/data.cpp
-src/app/browser/main/tab/data/content.cpp
-src/app/browser/main/tab/data/navbar.cpp
-src/app/browser/main/tab/data/navbar/base.cpp
-src/app/browser/main/tab/data/navbar/bookmark.cpp
-src/app/browser/main/tab/data/navbar/history.cpp
-src/app/browser/main/tab/data/navbar/history/back.cpp
-src/app/browser/main/tab/data/navbar/history/forward.cpp
-src/app/browser/main/tab/data/navbar/request.cpp
-src/app/browser/main/tab/data/navbar/update.cpp
+src/app/browser/main/tab/page.cpp
+src/app/browser/main/tab/page/content.cpp
+src/app/browser/main/tab/page/navbar.cpp
+src/app/browser/main/tab/page/navbar/base.cpp
+src/app/browser/main/tab/page/navbar/bookmark.cpp
+src/app/browser/main/tab/page/navbar/history.cpp
+src/app/browser/main/tab/page/navbar/history/back.cpp
+src/app/browser/main/tab/page/navbar/history/forward.cpp
+src/app/browser/main/tab/page/navbar/request.cpp
+src/app/browser/main/tab/page/navbar/update.cpp
 src/app/browser/main/tab/label.cpp
 src/lib/database.cpp
 src/lib/database/session.cpp
diff --git a/src/app/browser/main/tab.cpp b/src/app/browser/main/tab.cpp
index a0ff735f..2f2ef5bf 100644
--- a/src/app/browser/main/tab.cpp
+++ b/src/app/browser/main/tab.cpp
@@ -1,6 +1,6 @@
 #include "tab.hpp"
-#include "tab/data.hpp"
 #include "tab/label.hpp"
+#include "tab/page.hpp"
 
 using namespace app::browser::main;
 
@@ -29,15 +29,15 @@ void Tab::append(
     bool focus
 ) {
     auto label = new tab::Label();
-    auto data  = new tab::Data();
+    auto page  = new tab::Page();
 
     append_page(
-        * data,
+        * page,
         * label
     );
 
     set_tab_reorderable(
-        * data,
+        * page,
         true
     );
 
@@ -45,7 +45,7 @@ void Tab::append(
     {
         set_current_page(
             page_num(
-                * data
+                * page
             )
         );
     }
@@ -86,7 +86,7 @@ void Tab::update(
     );
 
     page->activate_action(
-        "data.update"
+        "page.update"
     );
 
 } // @TODO
diff --git a/src/app/browser/main/tab/data/content.hpp b/src/app/browser/main/tab/data/content.hpp
deleted file mode 100644
index f1615a81..00000000
--- a/src/app/browser/main/tab/data/content.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_CONTENT_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_CONTENT_HPP
-
-#include <gtkmm/box.h>
-
-namespace app::browser::main::tab::data
-{
-    class Content : public Gtk::Box
-    {
-        public:
-
-            Content();
-
-            ~Content();
-    };
-}
-
-#endif // APP_BROWSER_MAIN_TAB_DATA_CONTENT_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/base.hpp b/src/app/browser/main/tab/data/navbar/base.hpp
deleted file mode 100644
index 8e0f570d..00000000
--- a/src/app/browser/main/tab/data/navbar/base.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_BASE_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_BASE_HPP
-
-#include <glibmm/i18n.h>
-#include <gtkmm/button.h>
-
-namespace app::browser::main::tab::data::navbar
-{
-    class Base : public Gtk::Button
-    {
-        public:
-
-            Base();
-
-            ~Base();
-    };
-}
-
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_BASE_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/bookmark.hpp b/src/app/browser/main/tab/data/navbar/bookmark.hpp
deleted file mode 100644
index 60e533ed..00000000
--- a/src/app/browser/main/tab/data/navbar/bookmark.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_BOOKMARK_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_BOOKMARK_HPP
-
-#include <glibmm/i18n.h>
-#include <gtkmm/button.h>
-
-namespace app::browser::main::tab::data::navbar
-{
-    class Bookmark : public Gtk::Button
-    {
-        public:
-
-            Bookmark();
-
-            ~Bookmark();
-    };
-}
-
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_BOOKMARK_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/history/back.hpp b/src/app/browser/main/tab/data/navbar/history/back.hpp
deleted file mode 100644
index c93b8ce3..00000000
--- a/src/app/browser/main/tab/data/navbar/history/back.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_BACK_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_BACK_HPP
-
-#include <glibmm/i18n.h>
-#include <gtkmm/button.h>
-
-namespace app::browser::main::tab::data::navbar::history
-{
-    class Back : public Gtk::Button
-    {
-        public:
-
-            Back();
-
-            ~Back();
-    };
-}
-
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_BACK_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/history/forward.hpp b/src/app/browser/main/tab/data/navbar/history/forward.hpp
deleted file mode 100644
index 4478c6f1..00000000
--- a/src/app/browser/main/tab/data/navbar/history/forward.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_FORWARD_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_FORWARD_HPP
-
-#include <glibmm/i18n.h>
-#include <gtkmm/button.h>
-
-namespace app::browser::main::tab::data::navbar::history
-{
-    class Forward : public Gtk::Button
-    {
-        public:
-
-            Forward();
-
-            ~Forward();
-    };
-}
-
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_FORWARD_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/update.hpp b/src/app/browser/main/tab/data/navbar/update.hpp
deleted file mode 100644
index 9aaf740c..00000000
--- a/src/app/browser/main/tab/data/navbar/update.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_UPDATE_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_UPDATE_HPP
-
-#include <glibmm/i18n.h>
-#include <gtkmm/button.h>
-
-namespace app::browser::main::tab::data::navbar
-{
-    class Update : public Gtk::Button
-    {
-        public:
-
-            Update();
-
-            ~Update();
-    };
-}
-
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_UPDATE_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data.cpp b/src/app/browser/main/tab/page.cpp
similarity index 75%
rename from src/app/browser/main/tab/data.cpp
rename to src/app/browser/main/tab/page.cpp
index 3460da95..9e3a7fa0 100644
--- a/src/app/browser/main/tab/data.cpp
+++ b/src/app/browser/main/tab/page.cpp
@@ -1,10 +1,10 @@
-#include "data.hpp"
-#include "data/navbar.hpp"
-#include "data/content.hpp"
+#include "page.hpp"
+#include "page/navbar.hpp"
+#include "page/content.hpp"
 
 using namespace app::browser::main::tab;
 
-Data::Data()
+Page::Page()
 {
     // Init container
     set_orientation(
@@ -19,17 +19,17 @@ Data::Data()
             "update",
             sigc::mem_fun(
                 * this,
-                & Data::update
+                & Page::update
             )
         );
 
     insert_action_group(
-        "data",
+        "page",
         action_group
     );
 
     // Init components
-    navbar = new data::Navbar();
+    navbar = new page::Navbar();
 
         append(
             * navbar
@@ -39,17 +39,17 @@ Data::Data()
         // because of insert_action_group + append here @TODO
         navbar->refresh();
 
-    content = new data::Content();
+    content = new page::Content();
 
         append(
             * content
         );
 }
 
-Data::~Data() = default;
+Page::~Page() = default;
 
 // Actions
-void Data::update()
+void Page::update()
 {
     // navbar->get_request_value() @TODO
 }
diff --git a/src/app/browser/main/tab/data.hpp b/src/app/browser/main/tab/page.hpp
similarity index 56%
rename from src/app/browser/main/tab/data.hpp
rename to src/app/browser/main/tab/page.hpp
index 1624cdca..bbd61b55 100644
--- a/src/app/browser/main/tab/data.hpp
+++ b/src/app/browser/main/tab/page.hpp
@@ -1,5 +1,5 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_HPP
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_HPP
 
 #include <giomm/simpleactiongroup.h>
 #include <glibmm/refptr.h>
@@ -8,28 +8,28 @@
 
 namespace app::browser::main::tab
 {
-    namespace data
+    namespace page
     {
         class Navbar;
         class Content;
     }
 
-    class Data : public Gtk::Box
+    class Page : public Gtk::Box
     {
         private:
 
             Glib::RefPtr<Gio::SimpleActionGroup> action_group;
 
-            data::Navbar * navbar;
-            data::Content * content;
+            page::Navbar * navbar;
+            page::Content * content;
 
         public:
 
-            Data();
-            ~Data();
+            Page();
+            ~Page();
 
             void update();
     };
 }
 
-#endif // APP_BROWSER_MAIN_TAB_DATA_HPP
\ No newline at end of file
+#endif // APP_BROWSER_MAIN_TAB_PAGE_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/content.cpp b/src/app/browser/main/tab/page/content.cpp
similarity index 79%
rename from src/app/browser/main/tab/data/content.cpp
rename to src/app/browser/main/tab/page/content.cpp
index 7b298cab..1c94bb76 100644
--- a/src/app/browser/main/tab/data/content.cpp
+++ b/src/app/browser/main/tab/page/content.cpp
@@ -1,6 +1,6 @@
 #include "content.hpp"
 
-using namespace app::browser::main::tab::data;
+using namespace app::browser::main::tab::page;
 
 Content::Content()
 {
diff --git a/src/app/browser/main/tab/page/content.hpp b/src/app/browser/main/tab/page/content.hpp
new file mode 100644
index 00000000..c9d1d6df
--- /dev/null
+++ b/src/app/browser/main/tab/page/content.hpp
@@ -0,0 +1,18 @@
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_CONTENT_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_CONTENT_HPP
+
+#include <gtkmm/box.h>
+
+namespace app::browser::main::tab::page
+{
+    class Content : public Gtk::Box
+    {
+        public:
+
+            Content();
+
+            ~Content();
+    };
+}
+
+#endif // APP_BROWSER_MAIN_TAB_PAGE_CONTENT_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar.cpp b/src/app/browser/main/tab/page/navbar.cpp
similarity index 97%
rename from src/app/browser/main/tab/data/navbar.cpp
rename to src/app/browser/main/tab/page/navbar.cpp
index 75f1e82c..1321d88e 100644
--- a/src/app/browser/main/tab/data/navbar.cpp
+++ b/src/app/browser/main/tab/page/navbar.cpp
@@ -5,7 +5,7 @@
 #include "navbar/request.hpp"
 #include "navbar/update.hpp"
 
-using namespace app::browser::main::tab::data;
+using namespace app::browser::main::tab::page;
 
 Navbar::Navbar()
 {
diff --git a/src/app/browser/main/tab/data/navbar.hpp b/src/app/browser/main/tab/page/navbar.hpp
similarity index 84%
rename from src/app/browser/main/tab/data/navbar.hpp
rename to src/app/browser/main/tab/page/navbar.hpp
index 5401b0ba..c3b2fb88 100644
--- a/src/app/browser/main/tab/data/navbar.hpp
+++ b/src/app/browser/main/tab/page/navbar.hpp
@@ -1,5 +1,5 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HPP
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HPP
 
 #include <giomm/simpleactiongroup.h>
 #include <glibmm/refptr.h>
@@ -7,7 +7,7 @@
 #include <gtkmm/box.h>
 #include <sigc++/functors/mem_fun.h>
 
-namespace app::browser::main::tab::data
+namespace app::browser::main::tab::page
 {
     namespace navbar
     {
@@ -49,4 +49,4 @@ namespace app::browser::main::tab::data
     };
 }
 
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HPP
\ No newline at end of file
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/base.cpp b/src/app/browser/main/tab/page/navbar/base.cpp
similarity index 79%
rename from src/app/browser/main/tab/data/navbar/base.cpp
rename to src/app/browser/main/tab/page/navbar/base.cpp
index 81b4074e..885973ef 100644
--- a/src/app/browser/main/tab/data/navbar/base.cpp
+++ b/src/app/browser/main/tab/page/navbar/base.cpp
@@ -1,6 +1,6 @@
 #include "base.hpp"
 
-using namespace app::browser::main::tab::data::navbar;
+using namespace app::browser::main::tab::page::navbar;
 
 Base::Base()
 {
diff --git a/src/app/browser/main/tab/page/navbar/base.hpp b/src/app/browser/main/tab/page/navbar/base.hpp
new file mode 100644
index 00000000..6944b717
--- /dev/null
+++ b/src/app/browser/main/tab/page/navbar/base.hpp
@@ -0,0 +1,19 @@
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_BASE_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_BASE_HPP
+
+#include <glibmm/i18n.h>
+#include <gtkmm/button.h>
+
+namespace app::browser::main::tab::page::navbar
+{
+    class Base : public Gtk::Button
+    {
+        public:
+
+            Base();
+
+            ~Base();
+    };
+}
+
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_BASE_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/bookmark.cpp b/src/app/browser/main/tab/page/navbar/bookmark.cpp
similarity index 83%
rename from src/app/browser/main/tab/data/navbar/bookmark.cpp
rename to src/app/browser/main/tab/page/navbar/bookmark.cpp
index f3be49f5..e3b40a62 100644
--- a/src/app/browser/main/tab/data/navbar/bookmark.cpp
+++ b/src/app/browser/main/tab/page/navbar/bookmark.cpp
@@ -1,6 +1,6 @@
 #include "bookmark.hpp"
 
-using namespace app::browser::main::tab::data::navbar;
+using namespace app::browser::main::tab::page::navbar;
 
 Bookmark::Bookmark()
 {
diff --git a/src/app/browser/main/tab/page/navbar/bookmark.hpp b/src/app/browser/main/tab/page/navbar/bookmark.hpp
new file mode 100644
index 00000000..59e3e7ca
--- /dev/null
+++ b/src/app/browser/main/tab/page/navbar/bookmark.hpp
@@ -0,0 +1,19 @@
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_BOOKMARK_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_BOOKMARK_HPP
+
+#include <glibmm/i18n.h>
+#include <gtkmm/button.h>
+
+namespace app::browser::main::tab::page::navbar
+{
+    class Bookmark : public Gtk::Button
+    {
+        public:
+
+            Bookmark();
+
+            ~Bookmark();
+    };
+}
+
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_BOOKMARK_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/history.cpp b/src/app/browser/main/tab/page/navbar/history.cpp
similarity index 87%
rename from src/app/browser/main/tab/data/navbar/history.cpp
rename to src/app/browser/main/tab/page/navbar/history.cpp
index aba38fe5..fc0e1611 100644
--- a/src/app/browser/main/tab/data/navbar/history.cpp
+++ b/src/app/browser/main/tab/page/navbar/history.cpp
@@ -2,7 +2,7 @@
 #include "history/back.hpp"
 #include "history/forward.hpp"
 
-using namespace app::browser::main::tab::data::navbar;
+using namespace app::browser::main::tab::page::navbar;
 
 History::History()
 {
diff --git a/src/app/browser/main/tab/data/navbar/history.hpp b/src/app/browser/main/tab/page/navbar/history.hpp
similarity index 62%
rename from src/app/browser/main/tab/data/navbar/history.hpp
rename to src/app/browser/main/tab/page/navbar/history.hpp
index 13592d85..d4e3f59b 100644
--- a/src/app/browser/main/tab/data/navbar/history.hpp
+++ b/src/app/browser/main/tab/page/navbar/history.hpp
@@ -1,10 +1,10 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_HPP
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_HPP
 
 #include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 
-namespace app::browser::main::tab::data::navbar
+namespace app::browser::main::tab::page::navbar
 {
     namespace history
     {
@@ -27,4 +27,4 @@ namespace app::browser::main::tab::data::navbar
     };
 }
 
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_HISTORY_HPP
\ No newline at end of file
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/history/back.cpp b/src/app/browser/main/tab/page/navbar/history/back.cpp
similarity index 77%
rename from src/app/browser/main/tab/data/navbar/history/back.cpp
rename to src/app/browser/main/tab/page/navbar/history/back.cpp
index fe413105..6ec60c62 100644
--- a/src/app/browser/main/tab/data/navbar/history/back.cpp
+++ b/src/app/browser/main/tab/page/navbar/history/back.cpp
@@ -1,6 +1,6 @@
 #include "back.hpp"
 
-using namespace app::browser::main::tab::data::navbar::history;
+using namespace app::browser::main::tab::page::navbar::history;
 
 Back::Back()
 {
diff --git a/src/app/browser/main/tab/page/navbar/history/back.hpp b/src/app/browser/main/tab/page/navbar/history/back.hpp
new file mode 100644
index 00000000..1f36aad0
--- /dev/null
+++ b/src/app/browser/main/tab/page/navbar/history/back.hpp
@@ -0,0 +1,19 @@
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_BACK_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_BACK_HPP
+
+#include <glibmm/i18n.h>
+#include <gtkmm/button.h>
+
+namespace app::browser::main::tab::page::navbar::history
+{
+    class Back : public Gtk::Button
+    {
+        public:
+
+            Back();
+
+            ~Back();
+    };
+}
+
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_BACK_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/history/forward.cpp b/src/app/browser/main/tab/page/navbar/history/forward.cpp
similarity index 78%
rename from src/app/browser/main/tab/data/navbar/history/forward.cpp
rename to src/app/browser/main/tab/page/navbar/history/forward.cpp
index 05b48f81..45968e04 100644
--- a/src/app/browser/main/tab/data/navbar/history/forward.cpp
+++ b/src/app/browser/main/tab/page/navbar/history/forward.cpp
@@ -1,6 +1,6 @@
 #include "forward.hpp"
 
-using namespace app::browser::main::tab::data::navbar::history;
+using namespace app::browser::main::tab::page::navbar::history;
 
 Forward::Forward()
 {
diff --git a/src/app/browser/main/tab/page/navbar/history/forward.hpp b/src/app/browser/main/tab/page/navbar/history/forward.hpp
new file mode 100644
index 00000000..4ea4f2da
--- /dev/null
+++ b/src/app/browser/main/tab/page/navbar/history/forward.hpp
@@ -0,0 +1,19 @@
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_FORWARD_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_FORWARD_HPP
+
+#include <glibmm/i18n.h>
+#include <gtkmm/button.h>
+
+namespace app::browser::main::tab::page::navbar::history
+{
+    class Forward : public Gtk::Button
+    {
+        public:
+
+            Forward();
+
+            ~Forward();
+    };
+}
+
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_HISTORY_FORWARD_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/request.cpp b/src/app/browser/main/tab/page/navbar/request.cpp
similarity index 93%
rename from src/app/browser/main/tab/data/navbar/request.cpp
rename to src/app/browser/main/tab/page/navbar/request.cpp
index ec1f7769..3d653813 100644
--- a/src/app/browser/main/tab/data/navbar/request.cpp
+++ b/src/app/browser/main/tab/page/navbar/request.cpp
@@ -1,6 +1,6 @@
 #include "request.hpp"
 
-using namespace app::browser::main::tab::data::navbar;
+using namespace app::browser::main::tab::page::navbar;
 using namespace std;
 
 // Construct
@@ -33,7 +33,7 @@ Request::Request()
             parse();
 
             activate_action(
-                "data.update"
+                "page.update"
             );
         }
     );
diff --git a/src/app/browser/main/tab/data/navbar/request.hpp b/src/app/browser/main/tab/page/navbar/request.hpp
similarity index 73%
rename from src/app/browser/main/tab/data/navbar/request.hpp
rename to src/app/browser/main/tab/page/navbar/request.hpp
index f50a8976..46431b55 100644
--- a/src/app/browser/main/tab/data/navbar/request.hpp
+++ b/src/app/browser/main/tab/page/navbar/request.hpp
@@ -1,5 +1,5 @@
-#ifndef APP_BROWSER_MAIN_TAB_DATA_NAVBAR_REQUEST_HPP
-#define APP_BROWSER_MAIN_TAB_DATA_NAVBAR_REQUEST_HPP
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_REQUEST_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_REQUEST_HPP
 
 #include <glibmm/i18n.h>
 #include <gtkmm/entry.h>
@@ -7,7 +7,7 @@
 #include <regex>
 #include <string>
 
-namespace app::browser::main::tab::data::navbar
+namespace app::browser::main::tab::page::navbar
 {
     class Request : public Gtk::Entry
     {
@@ -36,4 +36,4 @@ namespace app::browser::main::tab::data::navbar
     };
 }
 
-#endif // APP_BROWSER_MAIN_TAB_DATA_NAVBAR_REQUEST_HPP
\ No newline at end of file
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_REQUEST_HPP
\ No newline at end of file
diff --git a/src/app/browser/main/tab/data/navbar/update.cpp b/src/app/browser/main/tab/page/navbar/update.cpp
similarity index 73%
rename from src/app/browser/main/tab/data/navbar/update.cpp
rename to src/app/browser/main/tab/page/navbar/update.cpp
index 73f6973e..3a645aaf 100644
--- a/src/app/browser/main/tab/data/navbar/update.cpp
+++ b/src/app/browser/main/tab/page/navbar/update.cpp
@@ -1,11 +1,11 @@
 #include "update.hpp"
 
-using namespace app::browser::main::tab::data::navbar;
+using namespace app::browser::main::tab::page::navbar;
 
 Update::Update()
 {
     set_action_name(
-        "data.update"
+        "page.update"
     );
 
     set_icon_name(
diff --git a/src/app/browser/main/tab/page/navbar/update.hpp b/src/app/browser/main/tab/page/navbar/update.hpp
new file mode 100644
index 00000000..bb53b660
--- /dev/null
+++ b/src/app/browser/main/tab/page/navbar/update.hpp
@@ -0,0 +1,19 @@
+#ifndef APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_UPDATE_HPP
+#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_UPDATE_HPP
+
+#include <glibmm/i18n.h>
+#include <gtkmm/button.h>
+
+namespace app::browser::main::tab::page::navbar
+{
+    class Update : public Gtk::Button
+    {
+        public:
+
+            Update();
+
+            ~Update();
+    };
+}
+
+#endif // APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_UPDATE_HPP
\ No newline at end of file