diff --git a/src/Entity/Browser/Container/Page/Navbar/History.php b/src/Entity/Browser/Container/Page/Navbar/History.php
index 311c69c7..ef6764e9 100644
--- a/src/Entity/Browser/Container/Page/Navbar/History.php
+++ b/src/Entity/Browser/Container/Page/Navbar/History.php
@@ -4,26 +4,28 @@ declare(strict_types=1);
 
 namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar;
 
+use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar;
 use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Back;
 use \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Forward;
 
+use \Yggverse\Yoda\Model\History as Memory;
+
 class History
 {
     public \GtkButtonBox $gtk;
 
     // Dependencies
-    public \Yggverse\Yoda\Model\History $memory;
-
-    public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar $navbar;
+    public Navbar $navbar;
+    public Memory $memory;
 
     // Requirements
-    public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Back $back;
-    public \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History\Forward $forward;
+    public Back $back;
+    public Forward $forward;
 
     public function __construct(
-        \Yggverse\Yoda\Entity\Browser\Container\Page\Navbar $navbar
+        Navbar $navbar
     ) {
-        $this->memory = new \Yggverse\Yoda\Model\History();
+        $this->memory = new Memory();
 
         $this->navbar = $navbar;
 
diff --git a/src/Entity/Browser/Container/Page/Navbar/History/Back.php b/src/Entity/Browser/Container/Page/Navbar/History/Back.php
index 36328725..04d841ac 100644
--- a/src/Entity/Browser/Container/Page/Navbar/History/Back.php
+++ b/src/Entity/Browser/Container/Page/Navbar/History/Back.php
@@ -4,7 +4,9 @@ declare(strict_types=1);
 
 namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History;
 
-class Back extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button
+use \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button;
+
+class Back extends Button
 {
     protected string $_label = 'Back';
 
diff --git a/src/Entity/Browser/Container/Page/Navbar/History/Forward.php b/src/Entity/Browser/Container/Page/Navbar/History/Forward.php
index c063c5bf..eba7bc8b 100644
--- a/src/Entity/Browser/Container/Page/Navbar/History/Forward.php
+++ b/src/Entity/Browser/Container/Page/Navbar/History/Forward.php
@@ -4,7 +4,9 @@ declare(strict_types=1);
 
 namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar\History;
 
-class Forward extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button
+use \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button;
+
+class Forward extends Button
 {
     protected string $_label = 'Forward';