diff --git a/src/common/pages/BasePageElement/BasePageElement.ts b/src/common/pages/BasePageElement/BasePageElement.ts
index 4318497..81ac3a2 100644
--- a/src/common/pages/BasePageElement/BasePageElement.ts
+++ b/src/common/pages/BasePageElement/BasePageElement.ts
@@ -1,5 +1,45 @@
+import { attr } from "@github/catalyst";
+import { html, render } from "@github/jtml";
 import { BaseElement } from "common/";
+import { isTrue } from "core/utils";
 
-class BasePageElement extends BaseElement {}
+class BasePageElement extends BaseElement {
+    public pageTitle: string = "";
+    @attr hidetitle: string;
+    @attr customtitle: string;
+    constructor(options: OptionType) {
+        super();
+        if (options?.title) {
+            this.pageTitle = options?.title;
+        }
+        this.connectedCallback = this.connectedCallback.bind(this);
+        this.disconnectedCallback = this.disconnectedCallback.bind(this);
+    }
+
+    public renderTitle = () => {
+        if (!isTrue(this.hidetitle)) {
+            return html`<div class="page --title">
+                ${this.customtitle ? this.customtitle : this.pageTitle}
+            </div>`;
+        }
+        return html``;
+    };
+
+    update = (): void => {
+        const _render = () => html` ${this.renderTitle()} ${this.render()} `;
+        render(_render(), this);
+        this.bindEvents();
+        this.updateCallback();
+    };
+
+    connectedCallback() {
+        this.appMain.setTitle(this.pageTitle);
+        super.connectedCallback();
+    }
+}
 
 export default BasePageElement;
+
+export type OptionType = {
+    title?: string;
+};
diff --git a/src/components/app-form/AppFormElement.ts b/src/components/app-form/AppFormElement.ts
index 498f59e..a22c6b4 100644
--- a/src/components/app-form/AppFormElement.ts
+++ b/src/components/app-form/AppFormElement.ts
@@ -23,12 +23,6 @@ class AppFormElement extends BaseComponentElement {
         this.update();
     };
 
-    public keyUp = (e) => {
-        if (e.keyCode === 13) {
-            this.onSubmit(e);
-        }
-    };
-
     public onSubmit = (e) => {
         e.preventDefault();
         if (!this.valid) {
diff --git a/src/components/app-link/AppLinkElement.ts b/src/components/app-link/AppLinkElement.ts
index 5bde65b..af08f85 100644
--- a/src/components/app-link/AppLinkElement.ts
+++ b/src/components/app-link/AppLinkElement.ts
@@ -44,7 +44,10 @@ class AppLinkElement extends BaseComponentElement {
     };
 
     get disabled(): boolean {
-        return isTrue(this.goBack) && this.routerService.emptyState;
+        if (isTrue(this.goBack)) {
+            return this.routerService.emptyState;
+        }
+        return false;
     }
 
     render = (): TemplateResult => {
@@ -56,7 +59,7 @@ class AppLinkElement extends BaseComponentElement {
                   >${this.title}</a
               >`
             : html`<a
-                  class="btn btn-link btn-disabled"
+                  class="btn btn-link"
                   data-target="app-link.main"
                   data-action="click:app-link#goTo"
                   href="${this.to}"
diff --git a/src/components/app-main/AppMainElement.ts b/src/components/app-main/AppMainElement.ts
index 92c4311..4e3c3b6 100644
--- a/src/components/app-main/AppMainElement.ts
+++ b/src/components/app-main/AppMainElement.ts
@@ -126,6 +126,11 @@ class AppMainElement extends HTMLElement {
         this.dispatchEvent(this.domEvents.walletupdate);
     };
 
+    public setTitle = (title: string): void => {
+        if (!title) title = __CONFIG__.appName;
+        window.document.title = title;
+    };
+
     private createAppModal = () => {
         const _appModal = document.createElement("app-modal");
         _appModal.setAttribute("data-target", "app-main.appModal");
diff --git a/src/components/app-pagination/AppPaginationElement.ts b/src/components/app-pagination/AppPaginationElement.ts
index ba686bb..44dde30 100644
--- a/src/components/app-pagination/AppPaginationElement.ts
+++ b/src/components/app-pagination/AppPaginationElement.ts
@@ -120,7 +120,7 @@ class AppPaginationElement extends BaseComponentElement {
                 return html`
                     <div>
                         <button
-                            class="btn btn-blue btn-squared ${page <= 1
+                            class="btn btn-primary btn-squared ${page <= 1
                                 ? "disabled"
                                 : ""}"
                             data-action="click:app-pagination#pageBack"
@@ -128,7 +128,8 @@ class AppPaginationElement extends BaseComponentElement {
                             Prev
                         </button>
                         <button
-                            class="btn btn-blue btn-squared ${page >= pageRange
+                            class="btn btn-primary btn-squared ${page >=
+                            pageRange
                                 ? "disabled"
                                 : ""}"
                             data-action="click:app-pagination#pageNext"
diff --git a/src/components/input-field/InputFieldElement.ts b/src/components/input-field/InputFieldElement.ts
index 593b3c0..88f7542 100644
--- a/src/components/input-field/InputFieldElement.ts
+++ b/src/components/input-field/InputFieldElement.ts
@@ -105,7 +105,6 @@ class InputFieldElement extends BaseComponentElement {
                 data-target="input-field.inp"
                 data-action="
                     input:input-field#inputChange
-                    keyup:app-form#keyUp
                     blur:input-field#validateDisplay
                 "
             />`;
diff --git a/src/pages/history-page/HistoryPageElement.ts b/src/pages/history-page/HistoryPageElement.ts
index 2430032..1466d42 100644
--- a/src/pages/history-page/HistoryPageElement.ts
+++ b/src/pages/history-page/HistoryPageElement.ts
@@ -9,7 +9,9 @@ class HistoryPageElement extends BasePageElement {
     private transactionsService: TransactionsService;
     @target pagination: AppPaginationElement;
     constructor() {
-        super();
+        super({
+            title: "Transaction History",
+        });
     }
 
     elementConnected = (): void => {
diff --git a/src/pages/home-page/HomePageElement.ts b/src/pages/home-page/HomePageElement.ts
index 1ec1ef0..6102743 100644
--- a/src/pages/home-page/HomePageElement.ts
+++ b/src/pages/home-page/HomePageElement.ts
@@ -8,7 +8,9 @@ import { BasePageElement } from "common/";
 class HomePageElement extends BasePageElement {
     private pingService: PingService;
     constructor() {
-        super();
+        super({
+            title: "Home",
+        });
     }
 
     elementConnected = (): void => {
diff --git a/src/pages/login-page/LoginPageElement.ts b/src/pages/login-page/LoginPageElement.ts
index 383a5bd..7b0e0e4 100644
--- a/src/pages/login-page/LoginPageElement.ts
+++ b/src/pages/login-page/LoginPageElement.ts
@@ -11,7 +11,9 @@ class LoginPageElement extends BasePageElement {
     @target appForm: AppFormElement;
     authService: AuthService;
     constructor() {
-        super();
+        super({
+            title: "Login",
+        });
     }
     elementConnected = (): void => {
         this.authService = new AuthService(this.appMain.appService);
diff --git a/src/pages/logout-page/LogoutPageElement.ts b/src/pages/logout-page/LogoutPageElement.ts
index e849e07..154e903 100644
--- a/src/pages/logout-page/LogoutPageElement.ts
+++ b/src/pages/logout-page/LogoutPageElement.ts
@@ -6,7 +6,9 @@ import { BasePageElement } from "common/";
 class LogoutPageElement extends BasePageElement {
     authService: AuthService;
     constructor() {
-        super();
+        super({
+            title: "Logout",
+        });
     }
     elementConnected = (): void => {
         this.authService = new AuthService(this.appMain.appService);
diff --git a/src/pages/not-found/NotFoundElement.ts b/src/pages/not-found/NotFoundElement.ts
index a2850aa..b4edf79 100644
--- a/src/pages/not-found/NotFoundElement.ts
+++ b/src/pages/not-found/NotFoundElement.ts
@@ -5,7 +5,9 @@ import { BasePageElement } from "common/";
 @controller
 class NotFoundElement extends BasePageElement {
     constructor() {
-        super();
+        super({
+            title: "404 - Not Found",
+        });
     }
     elementConnected = (): void => {
         this.update();
diff --git a/src/pages/register-page/RegisterPageElement.ts b/src/pages/register-page/RegisterPageElement.ts
index 668a3b5..d353875 100644
--- a/src/pages/register-page/RegisterPageElement.ts
+++ b/src/pages/register-page/RegisterPageElement.ts
@@ -9,7 +9,9 @@ class RegisterPageElement extends BasePageElement {
     @targets inputs: Array<InputFieldElement>;
     authService: AuthService;
     constructor() {
-        super();
+        super({
+            title: "Register",
+        });
     }
     elementConnected = (): void => {
         this.authService = new AuthService(this.appMain.appService);
diff --git a/src/pages/wallet-create/WalletCreateElement.ts b/src/pages/wallet-create/WalletCreateElement.ts
index aedd472..f1e2082 100644
--- a/src/pages/wallet-create/WalletCreateElement.ts
+++ b/src/pages/wallet-create/WalletCreateElement.ts
@@ -12,7 +12,9 @@ class WalletCreateElement extends BasePageElement {
     authService: AuthService;
     errorMessage: string;
     constructor() {
-        super();
+        super({
+            title: "New Wallet",
+        });
     }
     elementConnected = (): void => {
         this.walletService = new WalletService(this.appMain?.appService);
diff --git a/src/pages/wallet-list/WalletListElement.ts b/src/pages/wallet-list/WalletListElement.ts
index c73965c..e9aed95 100644
--- a/src/pages/wallet-list/WalletListElement.ts
+++ b/src/pages/wallet-list/WalletListElement.ts
@@ -12,7 +12,9 @@ class WalletListElement extends BasePageElement {
     authService: AuthService;
     errorMessage: string;
     constructor() {
-        super();
+        super({
+            title: "Wallet List",
+        });
     }
     elementConnected = (): void => {
         this.walletService = new WalletService(this.appMain?.appService);