diff --git a/appname/assets.py b/appname/assets.py
index 9a83b343..bab331cd 100755
--- a/appname/assets.py
+++ b/appname/assets.py
@@ -1,7 +1,7 @@
 from flask_assets import Bundle
 
 common_css = Bundle(
-    'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css',
+    'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css',
     'css/vendor/helper.css',
     'css/main.css',
     'css/overrides.css',
@@ -10,9 +10,8 @@
 )
 
 common_js = Bundle(
-    'https://code.jquery.com/jquery-3.2.1.slim.min.js',
-    'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js',
-    'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js',
+    'https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js',
+    'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js',
     Bundle(
         'js/main.js',
         filters='jsmin'
@@ -33,19 +32,15 @@
 )
 
 tabler_css = Bundle(
-    'https://rawcdn.githack.com/Sumukh/Ignite/70bf953851a356e785528b56ca105042074a3d5a/appname/static/tabler/css/dashboard.css',
+    'https://cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css',
+    'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/css/tabler-vendors.min.css',
     'css/overrides.css',
     filters='cssmin',
     output='public/css/tabler.css'
 )
 
 tabler_js = Bundle(
-    'tabler/js/vendors/jquery-3.2.1.min.js',
-    'tabler/js/vendors/bootstrap.bundle.min.js',
-    'tabler/js/vendors/circle-progress.min.js',
-    'tabler/js/vendors/selectize.min.js',
-    'tabler/js/vendors/jquery.tablesorter.min.js',
-    'tabler/js/core.js',
+    'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/js/tabler.min.js',
     output='public/js/tabler.js'
 )
 
@@ -55,14 +50,10 @@
 )
 
 tabler_plugins_js = Bundle(
-    'tabler/js/vendors/chart.bundle.min.js',
-    'tabler/js/vendors/jquery.sparkline.min.js',
-    'tabler/js/vendors/jquery-jvectormap-2.0.3.min.js',
-    'tabler/js/vendors/jquery-jvectormap-de-merc.js',
-    'tabler/js/vendors/jquery-jvectormap-world-mill.js',
-    'tabler/js/plugins/charts-c3/js/d3.v3.min.js',
-    'tabler/js/plugins/charts-c3/js/c3.min.js',
-    'tabler/js/plugins/input-mask/js/jquery.mask.min.js',
+    'https://cdn.jsdelivr.net/npm/apexcharts',
+    'https://cdn.jsdelivr.net/npm/choices.js@9.0.1/public/assets/scripts/choices.min.js',
+    'https://cdn.jsdelivr.net/npm/litepicker/dist/litepicker.js',
+    'https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.complete.min.js',
     # Other Plugins as needed.
     output='public/js/tabler-plugins.js'
 )
diff --git a/appname/templates/auth/invite.html b/appname/templates/auth/invite.html
index f71acefc..70a10fc0 100644
--- a/appname/templates/auth/invite.html
+++ b/appname/templates/auth/invite.html
@@ -4,34 +4,36 @@
 {% block title %}appname Signup{% endblock %}
 
 {% block body %}
-<div class="page-single">
-    <div class="container">
-        <div class="row">
-            <div class="col col-login mx-auto">
-                <div class="text-center mb-6">
-                    <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" alt="Tabler">
-                    <h2> appname </h2>
-                </div>
-                <form role="form" class="card" action="{{ url_for('auth.signup', invite_secret=invite.invite_secret) }}" method="post">
-
-                    <div class="card-body p-6">
-                        <div class="card-title">Join {{ invite.team.name }} on appname </div>
-                        <p>You've been invited to appname. Complete the signup below to join {{ invite.team.name }}.</p>
-                        {{ form.hidden_tag() }}
-                        {{ render_field(form.email, value=invite.invite_email) }}
-                        {{ render_field(form.password) }}
-                        {{ render_field(form.confirm) }}
-                        {{ render_field(form.invite_secret, value=invite.invite_secret, label_hidden=true) }}
+<div class="page page-center">
+    <div class="container container-tight py-4">
+      <div class="text-center mb-4">
+        <a href="." class="navbar-brand navbar-brand-autodark">
+            {{ render_flashes() }}
+            <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" >
+        </a>
+      </div>
+      <div class="card card-md">
+        <div class="card-body">
+          <h2 class="h2 text-center mb-4">Join {{ invite.team.name }} on appname</h2>
+          <form role="form"  action="{{ url_for('auth.signup', invite_secret=invite.invite_secret) }}" method="post">
+                <p>You've been invited to appname. Complete the signup below to join {{ invite.team.name }}.</p>
 
-                        <div class="form-footer">
-                            <button type="submit" class="btn btn-primary btn-block">Sign Up</button>
-                        </div>
-                    </form>
+                {{ form.hidden_tag() }}
+                {{ render_field(form.email, value=invite.invite_email) }}
+                {{ render_field(form.password) }}
+                {{ render_field(form.confirm) }}
+                {{ render_field(form.invite_secret, value=invite.invite_secret, label_hidden=true) }}
+                <div class="form-footer">
+                    <button type="submit" class="btn btn-primary w-100">Sign up</button>
                 </div>
-            </div>
+            </form>
         </div>
+      </div>
     </div>
+  </div>
 </div>
+
+
 {% include 'tabler/_footer.html' with context %}
 
 {% endblock %}
diff --git a/appname/templates/auth/login.html b/appname/templates/auth/login.html
index d5eeb5c7..5b545f78 100644
--- a/appname/templates/auth/login.html
+++ b/appname/templates/auth/login.html
@@ -5,45 +5,43 @@
 {% block title %}appname Login Example{% endblock %}
 
 {% block body %}
-<div class="page-single">
-    <div class="container">
-        <div class="row">
-            <div class="col col-login mx-auto">
-                <div class="text-center mb-6">
-                    {{ render_flashes() }}
-                    <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" alt="Tabler">
+<div class="page page-center">
+    <div class="container container-tight py-4">
+      <div class="text-center mb-4">
+        <a href="." class="navbar-brand navbar-brand-autodark">
+            {{ render_flashes() }}
+            <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" >
+        </a>
+      </div>
+      <div class="card card-md">
+        <div class="card-body">
+          <h2 class="h2 text-center mb-4">Login to your account</h2>
+          <form role="form"  action="{{ url_for('auth.login') }}" method="post">
+                {{ form.hidden_tag() }}
+                {{ render_field(form.email, placeholder='test@example.com') }}
+                {{ render_field(form.password, placeholder='Password') }}
+                <small class="float-right mb-2">
+                    <a href="{{ url_for('auth.request_password_reset') }}"> Help! I forgot my password </a>
+                </small>
+                <div class="form-footer">
+                    <button type="submit" class="btn btn-primary w-100">Sign in</button>
                 </div>
-                <form role="form" class="card" action="{{ url_for('auth.login') }}" method="post">
-
-                    <div class="card-body p-6">
-                        <div class="card-title">Login to your account</div>
-                        {{ form.hidden_tag() }}
-                        {{ render_field(form.email, placeholder='test@example.com') }}
-                        {{ render_field(form.password, placeholder='Password') }}
-                        <small class="float-right mb-2">
-                            <a href="{{ url_for('auth.request_password_reset') }}"> Help! I forgot my password </a>
-                        </small>
-                        <div class="form-footer">
-                            <button type="submit" class="btn btn-primary btn-block">Login</button>
-                        </div>
-                </form>
-                <div class="text-center text-muted">
-                    <hr class="thin" />
-                </div>
-                {% if features.oauth %}
-                    <div class="text-center mt-4 mb-4">
-                        <a href="{{ url_for('google.login') }}" class="btn btn-primary btn-block">
-                            <i class="fa fa-google"></i> Login with Google
-                        </a>
-                    </div>
-                {% endif %}
-                <div class="text-center text-muted mt-3">
-                    Don't have an account yet? <a href="{{ url_for('auth.signup') }}" class="btn btn-primary btn-block">Sign Up</a>
-                </div>
-            </div>
+            </form>
         </div>
+        {% if features.oauth %}
+        <div class="hr-text">or</div>
+        <div class="text-center mt-4 mb-4">
+            <a href="{{ url_for('google.login') }}" class="btn btn-primary btn-block">
+                <i class="fa fa-google"></i> Login with Google
+            </a>
+        </div>
+        {% endif %}
+      </div>
+      <div class="text-center text-secondary mt-3">
+        Don't have an account yet? <a href="{{ url_for('auth.signup') }}">Sign Up</a>
     </div>
-</div>
+    </div>
+  </div>
 </div>
 {% include 'tabler/_footer.html' with context %}
 
diff --git a/appname/templates/auth/oauth_only_login.html b/appname/templates/auth/oauth_only_login.html
index 42f1a6f8..737f487d 100644
--- a/appname/templates/auth/oauth_only_login.html
+++ b/appname/templates/auth/oauth_only_login.html
@@ -15,25 +15,44 @@
                 </div>
                 <div class="card">
                     <div class="text-center mt-4 mb-4">
-                        {% if features.oauth %}
-                            <a href="{{ url_for('google.login') }}" class="btn btn-primary btn-block">
-                                <i class="fa fa-google"></i> Login with Google
-                            </a>
-                        {% else %}
-                            It is not possible to login to appname right now because OAuth Login has not been configured.
-                        {% endif %}
                     </div>
                 </div>
-                {% if constants.ALLOW_SIGNUPS %}
-                    <div class="text-center text-muted mt-3">
-                        Don't have an account yet? <a href="{{ url_for('auth.signup') }}" class="btn btn-primary btn-block">Sign Up</a>
-                    </div>
-                {% endif %}
 
             </div>
         </div>
     </div>
 </div>
+
+<div class="page page-center">
+    <div class="container container-tight py-4">
+      <div class="text-center mb-4">
+        <a href="." class="navbar-brand navbar-brand-autodark">
+            {{ render_flashes() }}
+            <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" >
+        </a>
+      </div>
+      <div class="card card-md">
+        <div class="card-body">
+          <h2 class="h2 text-center mb-4">Log in to appname</h2>
+
+          {% if features.oauth %}
+          <a href="{{ url_for('google.login') }}" class="btn btn-primary w-100">
+              <i class="fa fa-google"></i> Login with Google
+          </a>
+            {% else %}
+                It is not possible to login to appname right now because OAuth Login has not been configured.
+            {% endif %}
+            {% if constants.ALLOW_SIGNUPS %}
+            <div class="text-center text-muted mt-3">
+                Don't have an account yet? <a href="{{ url_for('auth.signup') }}" class="btn btn-primary w-100">Sign Up</a>
+            </div>
+            {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
 {% include 'tabler/_footer.html' with context %}
 
 {% endblock %}
diff --git a/appname/templates/auth/reauth.html b/appname/templates/auth/reauth.html
index 6a2b2c8e..e3b73c96 100644
--- a/appname/templates/auth/reauth.html
+++ b/appname/templates/auth/reauth.html
@@ -4,17 +4,25 @@
 {% block title %}appname Login Example{% endblock %}
 
 {% block body %}
-<div class="page-single">
-    <div class="container">
-      <div class="row">
-        <div class="col col-login mx-auto">
-          <div class="card-body p-6">
-            <div class="card-title">Confirm your login in order to procceed</div>
-            <form role="form" action="{{ url_for('auth.login') }}" method="post">
-                {{ form.hidden_tag() }} {{ render_field(form.email) }} {{ render_field(form.password) }}
-                <button type="submit" class="btn btn-primary">Submit</button>
-            </form>
-          </div>
+<div class="page page-center">
+  <div class="container container-tight py-4">
+    <div class="text-center mb-4">
+      <a href="." class="navbar-brand navbar-brand-autodark">
+          {{ render_flashes() }}
+          <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" >
+      </a>
+    </div>
+    <div class="card card-md">
+      <div class="card-body">
+        <h2 class="h2 text-center mb-4">Login to your account</h2>
+        <form role="form"  action="{{ url_for('auth.login') }}" method="post">
+          {{ form.hidden_tag() }}
+          {{ render_field(form.email) }}
+          {{ render_field(form.password) }}
+              <div class="form-footer">
+                  <button type="submit" class="btn btn-primary w-100">Submit</button>
+              </div>
+          </form>
       </div>
     </div>
   </div>
diff --git a/appname/templates/auth/request_password_reset.html b/appname/templates/auth/request_password_reset.html
index a4cb0d55..3e28e729 100644
--- a/appname/templates/auth/request_password_reset.html
+++ b/appname/templates/auth/request_password_reset.html
@@ -1,38 +1,39 @@
 {% extends "tabler/minimal_base.html" %}
 {% from "helpers/_formhelpers.html" import render_field %}
 
-{% block title %}appname Login Example{% endblock %}
+{% block title %}appname Reset Password{% endblock %}
 
 {% block body %}
-<div class="page-single">
-    <div class="container">
-        <div class="row">
-            <div class="col col-login mx-auto">
-                <div class="text-center mb-6">
-                    {{ render_flashes() }}
-                    <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" alt="Tabler">
-                </div>
-
-                <form role="form" class="card" action="{{ url_for('auth.request_password_reset') }}" method="post">
-
-                    <div class="card-body p-6">
-                        <div class="card-title">Reset your password </div>
-                        {{ form.hidden_tag() }}
-                        {{ render_field(form.email, placeholder='test@example.com') }}
-                        <div class="form-footer">
-                            <button type="submit" class="btn btn-primary btn-block">Send Reset Link</button>
-                        </div>
-                        <small class="float-right mt-2">
-                            <a href="{{ url_for('auth.login') }}"> Actually, I remember my password now </a>
-                        </small>
-
-                    </div>
-                </form>
-
+<div class="page page-center">
+    <div class="container container-tight py-4">
+      <div class="text-center mb-4">
+        <a href="." class="navbar-brand navbar-brand-autodark">
+            {{ render_flashes() }}
+            <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" >
+        </a>
+      </div>
+      <div class="card card-md">
+        <div class="card-body">
+          <h2 class="h2 text-center mb-4">Reset your password</h2>
+          <form role="form" action="{{ url_for('auth.request_password_reset') }}" method="post">
+
+            {{ form.hidden_tag() }}
+            {{ render_field(form.email, placeholder='test@example.com') }}
+
+            <div class="form-footer mt-2">
+                <button type="submit" class="btn btn-primary w-100">Send Reset Link</button>
             </div>
-        </div>
+        </form>
+      </div>
+
+    </div>
+    <div class="text-center text-secondary mt-3">
+        Actually, I remember my password now? <a href="{{ url_for('auth.login') }}">Log in</a>
     </div>
+  </div>
 </div>
+
+
 {% include 'tabler/_footer.html' with context %}
 
 {% endblock %}
diff --git a/appname/templates/auth/reset_password.html b/appname/templates/auth/reset_password.html
index d2a2793a..bb1e1b87 100644
--- a/appname/templates/auth/reset_password.html
+++ b/appname/templates/auth/reset_password.html
@@ -4,31 +4,33 @@
 {% block title %}appname Reset Password{% endblock %}
 
 {% block body %}
-<div class="page-single">
-    <div class="container">
-        <div class="row">
-            <div class="col col-login mx-auto">
-                <div class="text-center mb-6">
-                    {{ render_flashes() }}
-                    <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" alt="Tabler">
-                </div>
-
-                <form role="form" class="card" action="{{ url_for('auth.request_password_reset') }}" method="post">
-
-                    <div class="card-body p-6">
-                        <div class="card-title">Reset your password </div>
-                        {{ form.hidden_tag() }}
-                        {{ render_field(form.password) }}
-                        {{ render_field(form.confirm) }}
-                        <div class="form-footer">
-                            <button type="submit" class="btn btn-primary btn-block">Reset</button>
-                        </div>
-                    </div>
-                </form>
 
-            </div>
+<div class="page page-center">
+    <div class="container container-tight py-4">
+      <div class="text-center mb-4">
+        <a href="." class="navbar-brand navbar-brand-autodark">
+            {{ render_flashes() }}
+            <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" >
+        </a>
+      </div>
+      <div class="card card-md">
+        <div class="card-body">
+          <h2 class="h2 text-center mb-4">Login to your account</h2>
+          <form role="form"  action="{{ url_for('auth.request_password_reset') }}" method="post">
+                {{ form.hidden_tag() }}
+                {{ render_field(form.password) }}
+                {{ render_field(form.confirm) }}
+                <div class="form-footer">
+                    <button type="submit" class="btn btn-primary w-100">Reset</button>
+                </div>
+            </form>
         </div>
+      </div>
+      <div class="text-center text-secondary mt-3">
+        Need to create a new account? <a href="{{ url_for('auth.signup') }}">Sign Up</a>
+    </div>
     </div>
+  </div>
 </div>
 {% include 'tabler/_footer.html' with context %}
 
diff --git a/appname/templates/auth/signup.html b/appname/templates/auth/signup.html
index e6852187..fbb5074d 100644
--- a/appname/templates/auth/signup.html
+++ b/appname/templates/auth/signup.html
@@ -4,53 +4,51 @@
 {% block title %}appname Signup{% endblock %}
 
 {% block body %}
-<div class="page-single">
-    <div class="container">
-        <div class="row">
-            <div class="col col-login mx-auto">
-                <div class="text-center mb-6">
-                    <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" alt="Tabler">
-                </div>
-                <div class="card">
-                    <div class="card-body">
-                        {% if constants.ALLOW_PASSWORD_LOGIN %}
-                            <form role="form" action="{{ url_for('auth.signup', invite_secret=invite_secret) }}" method="post">
-                                <div class="card-title">Sign up for appname</div>
-                                {{ form.hidden_tag() }}
-                                {{ render_field(form.email) }}
-                                {{ render_field(form.password) }}
-                                {{ render_field(form.confirm) }}
-
-                                <div class="form-footer">
-                                    <button type="submit" class="btn btn-primary btn-block">Sign Up</button>
-                                </div>
-                            </form>
-                            <div class="text-center text-muted">
-                                <hr class="thin" />
-                            </div>
-                        {% endif %}
-
-                        {% if features.oauth %}
-                            <div class="text-center mt-4 mb-4">
-                                <a href="{{ url_for('google.login') }}" class="btn btn-primary btn-block">
-                                    <i class="fa fa-google"></i> Signup with Google
-                                </a>
-                            </div>
-                        {% elif not features.oauth and not constants.ALLOW_PASSWORD_LOGIN %}
-                            <div class="text-center mt-2 mb-4">
-                                OAuth Signup is not configured
-                            </div>
-                        {% endif %}
-
-                        <div class="text-center text-muted">
-                            <a href="{{ url_for('auth.login') }}">Already have an account? </a>
-                        </div>
-                    </div>
-                </div>
+
+<div class="page page-center">
+    <div class="container container-tight py-4">
+      <div class="text-center mb-4">
+        <a href="." class="navbar-brand navbar-brand-autodark">
+            {{ render_flashes() }}
+            <img src="{{ url_for('static', filename='public/ignite/ignite-logo@2x.png') }}" class="h-6" >
+        </a>
+      </div>
+      <div class="card card-md">
+        <div class="card-body">
+          <h2 class="h2 text-center mb-4">Sign up for appname</h2>
+          {% if constants.ALLOW_PASSWORD_LOGIN %}
+          <form role="form" action="{{ url_for('auth.signup', invite_secret=invite_secret) }}" method="post">
+              {{ form.hidden_tag() }}
+              {{ render_field(form.email, placeholder="yourname@example.com") }}
+              {{ render_field(form.password, placeholder="at least six digits") }}
+              {{ render_field(form.confirm) }}
+
+              <div class="form-footer">
+                  <button type="submit" class="btn btn-primary w-100">Sign Up</button>
+              </div>
+          </form>
+        {% endif %}
+        {% if features.oauth %}
+            <div class="text-center mt-4 mb-4">
+                <a href="{{ url_for('google.login') }}" class="btn btn-primary w-100">
+                    <i class="fa fa-google"></i> Signup with Google
+                </a>
+            </div>
+        {% elif not features.oauth and not constants.ALLOW_PASSWORD_LOGIN %}
+            <div class="text-center mt-2 mb-4">
+                OAuth Signup is not configured
             </div>
+        {% endif %}
+
         </div>
     </div>
+    <div class="text-center text-secondary mt-3">
+        Already have account? <a href="{{ url_for('auth.login') }}" tabindex="-1">Sign in</a>
+      </div>
+
+  </div>
 </div>
+
 {% include 'tabler/_footer.html' with context %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/appname/templates/helpers/_formhelpers.html b/appname/templates/helpers/_formhelpers.html
index ece3d975..7cf10b3e 100644
--- a/appname/templates/helpers/_formhelpers.html
+++ b/appname/templates/helpers/_formhelpers.html
@@ -1,7 +1,7 @@
 {% macro render_field(field, class="form-control", label_hidden=false) %}
-    <div class="form-group">
+    <div class="mb-2">
         {% if not label_hidden %}
-            {{ field.label }}
+        <label class="form-label">{{ field.label }}</label>
             {% if field.errors %}
                 {% for e in field.errors %}
                     <p class="help-block text-danger">{{ e }}</p>
diff --git a/appname/templates/lander/index.html b/appname/templates/lander/index.html
index 1fd786b5..9d0f3171 100644
--- a/appname/templates/lander/index.html
+++ b/appname/templates/lander/index.html
@@ -13,20 +13,20 @@
 	<div class="hero-bg {{bg_color_class}}"></div>
 	<header class="header">
 		<div class="container nav-header">
-			<a href="https://github.com/sumukh/ignite" target="_blank" class="logo">
+			<a href="https://github.com/sumukh/ignite" target="_blank" class="text-decoration-none link logo">
 				<img src="{{ url_for('static', filename='public/ignite/ignite-icon.svg') }}" class="logo-icon h-6" alt="Ignite">
 				ignite
 			</a>
 			<div class="links">
-				<a href="#pricing">Pricing</a>
-				<a href="{{ url_for('auth.signup') }}">Demo</a>
+				<a href="#pricing" class="text-decoration-none">Pricing</a>
+				<a href="{{ url_for('auth.signup') }}" class="text-decoration-none">Demo</a>
 			</div>
 		</div>
 	</header>
 
 
 	<div class="container">
-		<div class="row hero-content">
+		<div class="row position-relative">
 			<div class="col-sm">
 				<div class="hero-header">
 					<h1 class="hero-title">Batteries Included</h1>
@@ -35,8 +35,8 @@ <h1 class="hero-title">Batteries Included</h1>
 					</p>
 
 					<div class="hero-cta">
-						<a href="{{ url_for('auth.signup') }}" class="btn btn-outline-light btn-outline hero-cta-btn">Demo</a>
-						<a href="#pricing" class="btn btn-light hero-cta-btn">Download</a>
+						<a href="{{ url_for('auth.signup') }}" class="btn btn-outline-light btn-outline hero-cta-btn" class="text-decoration-none">Demo</a>
+						<a href="#pricing" class="btn btn-light hero-cta-btn" class="text-decoration-none">Download</a>
 					</div>
 				</div>
 			</div>
diff --git a/appname/templates/tabler/401.html b/appname/templates/tabler/401.html
index cf0a4028..bdb68472 100644
--- a/appname/templates/tabler/401.html
+++ b/appname/templates/tabler/401.html
@@ -6,15 +6,23 @@
 {% endblock %}
 
 {% block body %}
-<div class="page-content">
-    <div class="container text-center">
-        <div class="display-1 text-muted mb-5"><i class="si si-exclamation"></i> 401</div>
-        <h1 class="h2 mb-3">Oops.. You just found an error page..</h1>
-        <p class="h4 text-muted font-weight-normal mb-7">We are sorry but you are not authorized to access this page&hellip;</p>
-        <a class="btn btn-primary" href="javascript:history.back()">
-        <i class="fe fe-arrow-left mr-2"></i>Go back
-        </a>
+<div class="page page-center">
+    <div class="container-tight py-4">
+      <div class="empty">
+        <div class="empty-header">401</div>
+        <p class="empty-title">Oops… You just found an error page</p>
+        <p class="empty-subtitle text-secondary">
+          We are sorry but the page you are looking for was not found
+        </p>
+        <div class="empty-action">
+          <a href="javascript:history.back()" class="btn btn-primary">
+            <!-- Download SVG icon from http://tabler-icons.io/i/arrow-left -->
+            <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l14 0" /><path d="M5 12l6 6" /><path d="M5 12l6 -6" /></svg>
+            Take me home
+          </a>
+        </div>
+      </div>
     </div>
-</div>
+  </div>
 {% endblock %}
 
diff --git a/appname/templates/tabler/minimal_base.html b/appname/templates/tabler/minimal_base.html
index eccc1674..49ff347c 100644
--- a/appname/templates/tabler/minimal_base.html
+++ b/appname/templates/tabler/minimal_base.html
@@ -21,7 +21,16 @@
         {% endassets %}
 
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
-        <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
+        <style>
+            @import url('https://rsms.me/inter/inter.css');
+            :root {
+                --tblr-font-sans-serif: 'Inter Var', -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif;
+            }
+            body {
+                font-feature-settings: "cv03", "cv04", "cv11";
+            }
+          </style>
+
         <link rel="shortcut icon" type="image/png" href="{{ url_for('static', filename='public/ignite/ignite-icon.png') }}">
         <link rel="icon" type="image/png" href="{{ url_for('static', filename='public/ignite/ignite-icon.png') }}">
         {% block css %}
@@ -32,11 +41,9 @@
         {% endblock %}
     </head>
 
-    <body>
-        <div class="page">
-            {% block body %}
-            {% endblock %}
-        </div>
+    <body class="d-flex flex-column">
+        {% block body %}
+        {% endblock %}
     </body>
     {% assets "tabler_js" %}
         <script type="text/javascript" src="{{ ASSET_URL }}"></script>