diff --git a/src/common/layouts/BaseLayoutElement/BaseLayoutElement.ts b/src/common/layouts/BaseLayoutElement/BaseLayoutElement.ts
index 3a36f40..2144a1d 100644
--- a/src/common/layouts/BaseLayoutElement/BaseLayoutElement.ts
+++ b/src/common/layouts/BaseLayoutElement/BaseLayoutElement.ts
@@ -19,7 +19,6 @@ class BaseLayoutElement extends HTMLElement {
     };
 
     setElement = (newTag: string) => {
-        console.log(this.innerHTML);
         this.slotted.innerHTML = `<${newTag}></${newTag}>`;
     };
 }
diff --git a/src/core/services/router-service/RouterService.ts b/src/core/services/router-service/RouterService.ts
index 206973e..569973c 100644
--- a/src/core/services/router-service/RouterService.ts
+++ b/src/core/services/router-service/RouterService.ts
@@ -4,6 +4,9 @@ import { update } from "core/utils";
 class RouterService {
     private historyStack: Array<RouteState> = [];
     private _routes: Array<RouteState> = [];
+    private domEvents: any = {
+        routechanged: new Event("routechanged"),
+    };
     constructor(private mainRoot: Element) {}
 
     get routerState() {
@@ -14,6 +17,15 @@ class RouterService {
         return this.historyStack[historyLen - 1];
     }
 
+    get emptyState() {
+        const historyLen = this.historyStack?.length;
+        if (historyLen < 2) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     setRoutes = (routes: Array<any>) => {
         if (!Array.isArray(this._routes)) this._routes = [];
         routes.forEach((route) => {
@@ -31,72 +43,67 @@ class RouterService {
 
     update() {
         if (!this._routes) return;
+        window.dispatchEvent(this.domEvents.routechanged);
         const path = window.location.pathname;
         const _mainRoot = this.mainRoot;
-        for (const route of this._routes) {
-            if (path == route.path) {
-                if (route.middleware && typeof route.middleware == "function") {
-                    if (route.middleware()) return;
-                }
-                let changed: boolean = false;
-                if (_mainRoot?.childNodes.length > 0) {
-                    _mainRoot?.childNodes?.forEach?.(
-                        (child: BaseLayoutElement) => {
-                            if (
-                                route.layout &&
-                                route.layout.toUpperCase() === child.tagName &&
-                                !child.compareTags(
-                                    route.component.toUpperCase()
-                                )
-                            ) {
-                                changed = true;
-                                child.setElement(route.component);
-                            } else if (
-                                route.layout &&
-                                route.layout.toUpperCase() !== child.tagName
-                            ) {
-                                changed = true;
-                                const _newElement = document.createElement(
-                                    route.layout
-                                );
-                                _mainRoot.replaceChild(_newElement, child);
-                                (_newElement as BaseLayoutElement).setElement(
-                                    route.component
-                                );
-                            } else if (
-                                !route.layout &&
-                                child.tagName !== route.component
-                            ) {
-                                const _newElement = document.createElement(
-                                    route.component
-                                );
-                                changed = true;
-                                _mainRoot.replaceChild(_newElement, child);
-                            }
-                        }
-                    );
-                } else {
-                    if (route.layout) {
+        const route = this.routerState;
+        if (path == route?.path || route?.path == "/not-found") {
+            if (route.middleware && typeof route.middleware == "function") {
+                if (route.middleware()) return;
+            }
+            let changed: boolean = false;
+            if (_mainRoot?.childNodes.length > 0) {
+                _mainRoot?.childNodes?.forEach?.((child: BaseLayoutElement) => {
+                    if (
+                        route.layout &&
+                        route.layout.toUpperCase() === child.tagName &&
+                        !child.compareTags(route.component.toUpperCase())
+                    ) {
+                        changed = true;
+                        child.setElement(route.component);
+                    } else if (
+                        route.layout &&
+                        route.layout.toUpperCase() !== child.tagName
+                    ) {
                         changed = true;
                         const _newElement = document.createElement(
                             route.layout
                         );
-                        _mainRoot.appendChild(_newElement);
+                        _mainRoot.replaceChild(_newElement, child);
                         (_newElement as BaseLayoutElement).setElement(
                             route.component
                         );
-                    } else {
+                    } else if (
+                        !route.layout &&
+                        child.tagName !== route.component
+                    ) {
                         const _newElement = document.createElement(
                             route.component
                         );
                         changed = true;
-                        _mainRoot.appendChild(_newElement);
+                        _mainRoot.replaceChild(_newElement, child);
                     }
+                });
+            } else {
+                if (route.layout) {
+                    changed = true;
+                    const _newElement = document.createElement(route.layout);
+                    _mainRoot.appendChild(_newElement);
+                    (_newElement as BaseLayoutElement).setElement(
+                        route.component
+                    );
+                } else {
+                    const _newElement = document.createElement(route.component);
+                    changed = true;
+                    _mainRoot.appendChild(_newElement);
                 }
-                return;
             }
+            return;
+        } else {
+            const newRoute = this.findByPath();
+            this.historyStack.push(newRoute);
+            this.update();
         }
-        _mainRoot.innerHTML = "404 - Not found";
     }
 
     goTo(path: string) {
@@ -130,18 +137,33 @@ class RouterService {
     @update
     init() {
         window.addEventListener("popstate", () => {
+            this.historyStack.pop();
             this.update();
         });
     }
+
+    findByPath() {
+        const path = window.location.pathname;
+        const _index = this._routes.findIndex((route) => route.path === path);
+        const _indexOfEmpty = this._routes.findIndex(
+            (route) => route.path === "/not-found"
+        );
+        if (_index === -1 && _indexOfEmpty !== -1) {
+            return this._routes[_indexOfEmpty];
+        } else if (_index === -1 && _indexOfEmpty === -1) {
+            return new RouteState("/not-found", "not-found");
+        }
+        return this._routes[_index];
+    }
 }
 
 class RouteState {
     constructor(
         public path: string,
         public component: string,
-        public data: any,
-        public layout: string,
-        public middleware: any
+        public data?: any,
+        public layout?: string,
+        public middleware?: any
     ) {}
 }
 
diff --git a/src/pages/register-page/RegisterPageElement.ts b/src/pages/register-page/RegisterPageElement.ts
index fb12534..f164f15 100644
--- a/src/pages/register-page/RegisterPageElement.ts
+++ b/src/pages/register-page/RegisterPageElement.ts
@@ -34,14 +34,11 @@ class RegisterPageElement extends HTMLElement {
             const response = await this.appMain.authStore.userLogin(
                 this.values
             );
-            console.log(response);
 
             if (response?.token) {
                 this.appMain.routerService.goTo("/");
             }
-        } catch (err) {
-            console.log(err);
-        }
+        } catch (err) {}
     };
 
     validate(): boolean {