diff --git a/lnbits/core/templates/core/index.html b/lnbits/core/templates/core/index.html
index d0124dc2b..ad098d162 100644
--- a/lnbits/core/templates/core/index.html
+++ b/lnbits/core/templates/core/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "public.html" %}
 
 
 {% block scripts %}
@@ -9,8 +9,8 @@
 {% endblock %}
 
 {% block page %}
-  <div class="row q-col-gutter-md justify-between">
-    <div class="col-12 col-md-7 q-gutter-y-md">
+  <div class="row q-col-gutter-md justify-center">
+    <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
 
       <q-card>
         <q-card-section>
diff --git a/lnbits/extensions/tpos/templates/tpos/_tpos.html b/lnbits/extensions/tpos/templates/tpos/_tpos.html
index 25efdda64..11641c0c3 100644
--- a/lnbits/extensions/tpos/templates/tpos/_tpos.html
+++ b/lnbits/extensions/tpos/templates/tpos/_tpos.html
@@ -4,11 +4,8 @@
   label="About TPoS">
   <q-card>
     <q-card-section>
-                  <p>Thiago's Point of Sale, is a secure, mobile-ready, instant and shareable point of sale terminal (PoS) for merchants. The PoS is linked to your LNbits wallet, but completely air-gapped so users can ONLY create invoices. To share the TPoS, hit the hashtag on the terminal
-                  <br/><br/><small>Created by <a href="https://github.com/talvasconcelos" target="_blank">Tiago Vasconcelos</a>.</small>
+      <p>Thiago's Point of Sale is a secure, mobile-ready, instant and shareable point of sale terminal (PoS) for merchants. The PoS is linked to your LNbits wallet but completely air-gapped so users can ONLY create invoices. To share the TPoS hit the hash on the terminal.</p>
+      <small>Created by <a href="https://github.com/talvasconcelos" target="_blank">Tiago Vasconcelos</a>.</small>
     </q-card-section>
   </q-card>
 </q-expansion-item>
-
-
-
diff --git a/lnbits/extensions/withdraw/templates/withdraw/display.html b/lnbits/extensions/withdraw/templates/withdraw/display.html
index 020878479..ae0ae63ce 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/display.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/display.html
@@ -3,7 +3,7 @@
 
 {% block page %}
   <div class="row q-col-gutter-md justify-center">
-    <div class="col-12 col-sm-6 col-md-4">
+    <div class="col-12 col-sm-6 col-md-5 col-lg-4">
       <q-card class="q-pa-lg">
         <q-card-section class="q-pa-none">
           <div class="text-center q-mb-md">
@@ -22,7 +22,7 @@
         </q-card-section>
       </q-card>
     </div>
-    <div class="col-12 col-sm-6 col-md-4 q-gutter-y-md">
+    <div class="col-12 col-sm-6 col-md-5 col-lg-4 q-gutter-y-md">
       <q-card>
         <q-card-section>
           <h6 class="text-subtitle1 q-mb-sm q-mt-none">LNbits LNURL-withdraw link</h6>
diff --git a/lnbits/extensions/withdraw/views_api.py b/lnbits/extensions/withdraw/views_api.py
index d1d6a6e55..498571f63 100644
--- a/lnbits/extensions/withdraw/views_api.py
+++ b/lnbits/extensions/withdraw/views_api.py
@@ -55,7 +55,7 @@ def api_link_retrieve(link_id):
         "is_unique": {"type": "boolean", "required": True},
     }
 )
-def api_link_create(link_id=None):
+def api_link_create_or_update(link_id=None):
     if g.data["max_withdrawable"] < g.data["min_withdrawable"]:
         return jsonify({"message": "`max_withdrawable` needs to be at least `min_withdrawable`."}), Status.BAD_REQUEST
 
diff --git a/lnbits/static/css/base.css b/lnbits/static/css/base.css
index 5be09bfa4..6d1c71d96 100644
--- a/lnbits/static/css/base.css
+++ b/lnbits/static/css/base.css
@@ -39,5 +39,9 @@
     .q-table--dense .q-table__bottom {
       padding-right: 6px !important; }
 
-video {
-  border-radius: 3px; }
+a.inherit {
+  color: inherit;
+  text-decoration: none; }
+
+  video {
+    border-radius: 3px; }
diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss
index a25bdcc0f..b33c82e79 100644
--- a/lnbits/static/scss/base.scss
+++ b/lnbits/static/scss/base.scss
@@ -66,6 +66,11 @@ body.body--dark .q-field--error {
   }
 }
 
+a.inherit {
+  color: inherit;
+  text-decoration: none;
+}
+
 // QR video
 
 video {
diff --git a/lnbits/templates/public.html b/lnbits/templates/public.html
index 2bb98bad4..98e29aa8c 100644
--- a/lnbits/templates/public.html
+++ b/lnbits/templates/public.html
@@ -4,3 +4,14 @@
 {% block beta %}{% endblock %}
 {% block drawer_toggle %}{% endblock %}
 {% block drawer %}{% endblock %}
+
+
+{% block toolbar_title %}
+  <a href="/" class="inherit">
+    {% if SITE_TITLE != 'LNbits' %}
+      {{ SITE_TITLE }}
+    {% else %}
+      <strong>LN</strong>bits
+    {% endif %}
+  </a>
+{% endblock %}