Merge branch 'dev' into critical/bump-cryptography-openssl

2024-08-30 18:23:09 +00:00 · 2023-02-11 22:10:23 +00:00 · 2023-02-11 22:10:23 +00:00 · 821b602387
commit 821b602387
parent 9d2164a1b3 5fb5fc70b7
94 changed files with 17426 additions and 78999 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,13 +1,20 @@
 # Changelog
 ## --- [4.0.21] - 2023/TBD
 ### New features
-TBD
+- Add better feedback for uploads with a progress bar ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/546))
+- Add ignored exit codes for crash detection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/553))
 ### Bug fixes
-TBD
+- Fix exception related to page data on server start ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/544))
+- Fix logical issue with uploading dynamic files ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/555))
+- Fix backups failing by correctly using tz objects ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/556))
 ### Tweaks
-TBD
+- Cleanup authentication helpers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/545))
+- Optimize file upload progress WS ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/546))
+- Truncate sidebar servers to a max of 10 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/552))
+- Upgrade to FA 6. Add Translations ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/549))
 ### Lang
-TBD
+- Add additional translations to backups page strings ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/543))
+- Add additional missing translations ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/549))
 <br><br>

 ## --- [4.0.20] - 2023/01/29
--- a/app/classes/models/servers.py
+++ b/app/classes/models/servers.py
@ -40,6 +40,7 @@ class Servers(BaseModel):
    show_status = BooleanField(default=1)
    created_by = IntegerField(default=-100)
    shutdown_timeout = IntegerField(default=60)
+    ignored_exits = CharField(default="0")

    class Meta:
        table_name = "servers"
--- a/app/classes/shared/authentication.py
+++ b/app/classes/shared/authentication.py
@ -13,7 +13,6 @@ logger = logging.getLogger(__name__)
 class Authentication:
    def __init__(self, helper):
        self.helper = helper
-        self.secret = "my secret"
        try:
            self.secret = ManagementController.get_crafty_api_key()
            if self.secret == "":
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@ -1013,7 +1013,7 @@ class Helpers:
        for item in file_list:
            if os.path.isdir(os.path.join(folder, item)):
                dir_list.append(item)
-            elif str(item) != "crafty.sqlite":
+            elif str(item) != self.ignored_names:
                unsorted_files.append(item)
        file_list = sorted(dir_list, key=str.casefold) + sorted(
            unsorted_files, key=str.casefold
@ -1054,7 +1054,7 @@ class Helpers:
        for item in file_list:
            if os.path.isdir(os.path.join(folder, item)):
                dir_list.append(item)
-            elif str(item) != "crafty.sqlite":
+            elif str(item) != self.ignored_names:
                unsorted_files.append(item)
        file_list = sorted(dir_list, key=str.casefold) + sorted(
            unsorted_files, key=str.casefold
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@ -12,6 +12,8 @@ import html
 import urllib.request
 import glob

+from zoneinfo import ZoneInfo
+
 # TZLocal is set as a hidden import on win pipeline
 from tzlocal import get_localzone
 from tzlocal.utils import ZoneInfoNotFoundError
@ -136,7 +138,7 @@ class ServerInstance:
            logger.error(
                "Could not capture time zone from system. Falling back to Europe/London"
            )
-            self.tz = "Europe/London"
+            self.tz = ZoneInfo("Europe/London")
        self.server_scheduler = BackgroundScheduler(timezone=str(self.tz))
        self.server_scheduler.start()
        self.backup_thread = threading.Thread(
@ -730,26 +732,26 @@ class ServerInstance:
            self.server_thread.join()

    def stop_server(self):
-        if self.settings["stop_command"]:
-            self.send_command(self.settings["stop_command"])
-            if self.settings["crash_detection"]:
-                # remove crash detection watcher
-                logger.info(f"Removing crash watcher for server {self.name}")
-                try:
-                    self.server_scheduler.remove_job("c_" + str(self.server_id))
-                except:
-                    logger.error(
-                        f"Removing crash watcher for server {self.name} failed. "
-                        f"Assuming it was never started."
-                    )
-        else:
-            # windows will need to be handled separately for Ctrl+C
-            self.process.terminate()
        running = self.check_running()
        if not running:
            logger.info(f"Can't stop server {self.name} if it's not running")
            Console.info(f"Can't stop server {self.name} if it's not running")
            return
+        if self.settings["crash_detection"]:
+            # remove crash detection watcher
+            logger.info(f"Removing crash watcher for server {self.name}")
+            try:
+                self.server_scheduler.remove_job("c_" + str(self.server_id))
+            except:
+                logger.error(
+                    f"Removing crash watcher for server {self.name} failed. "
+                    f"Assuming it was never started."
+                )
+        if self.settings["stop_command"]:
+            self.send_command(self.settings["stop_command"])
+        else:
+            # windows will need to be handled separately for Ctrl+C
+            self.process.terminate()
        i = 0

        # caching the name and pid number
@ -919,7 +921,7 @@ class ServerInstance:
        if running:
            return
        # check the exit code -- This could be a fix for /stop
-        if self.process.returncode == 0:
+        if str(self.process.returncode) in self.settings["ignored_exits"].split(","):
            logger.warning(
                f"Process {self.process.pid} exited with code "
                f"{self.process.returncode}. This is considered a clean exit"
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@ -1585,6 +1585,8 @@ class PanelHandler(BaseHandler):
            crash_detection = int(float(self.get_argument("crash_detection", "0")))
            logs_delete_after = int(float(self.get_argument("logs_delete_after", "0")))
            java_selection = self.get_argument("java_selection", None)
+            # make sure there is no whitespace
+            ignored_exits = self.get_argument("ignored_exits", "").replace(" ", "")
            # subpage = self.get_argument('subpage', None)

            server_id = self.check_server_id()
@ -1669,6 +1671,7 @@ class PanelHandler(BaseHandler):
            server_obj.auto_start = auto_start
            server_obj.crash_detection = crash_detection
            server_obj.logs_delete_after = logs_delete_after
+            server_obj.ignored_exits = ignored_exits
            failed = False
            for servers in self.controller.servers.failed_servers:
                if servers["server_id"] == int(server_id):
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@ -183,6 +183,7 @@ class ServerHandler(BaseHandler):
            "version_data": "version_data_here",  # TODO
            "user_data": exec_user,
            "show_contribute": self.helper.get_setting("show_contribute_link", True),
+            "background": self.controller.cached_login,
            "lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
            "lang_page": Helpers.get_lang_page(
                self.controller.users.get_user_lang_by_id(exec_user["user_id"])
--- a/app/classes/web/status_handler.py
+++ b/app/classes/web/status_handler.py
@ -7,12 +7,12 @@ logger = logging.getLogger(__name__)

 class StatusHandler(BaseHandler):
    def get(self):
-        page_data = {"background": self.controller.cached_login}
-        page_data["lang"] = self.helper.get_setting("language")
-        page_data["lang_page"] = self.helper.get_lang_page(
-            self.helper.get_setting("language")
-        )
-        page_data["servers"] = self.controller.servers.get_all_servers_stats()
+        page_data = {
+            "background": self.controller.cached_login,
+            "lang": self.helper.get_setting("language"),
+            "lang_page": self.helper.get_lang_page(self.helper.get_setting("language")),
+            "servers": self.controller.servers.get_all_servers_stats(),
+        }
        running = 0
        for srv in page_data["servers"]:
            if srv["stats"]["running"]:
--- a/app/classes/web/upload_handler.py
+++ b/app/classes/web/upload_handler.py
@ -52,18 +52,19 @@ class UploadHandler(BaseHandler):
                    f"User with ID {user_id} attempted to upload a file that"
                    f" exceeded the max body size."
                )
-                self.helper.websocket_helper.broadcast_user(
-                    user_id,
-                    "send_start_error",
+
+                return self.finish_json(
+                    413,
                    {
-                        "error": self.helper.translation.translate(
+                        "status": "error",
+                        "error": "TOO LARGE",
+                        "info": self.helper.translation.translate(
                            "error",
                            "fileTooLarge",
                            self.controller.users.get_user_lang_by_id(user_id),
                        ),
                    },
                )
-                return
            self.do_upload = True

            if superuser:
@ -141,48 +142,50 @@ class UploadHandler(BaseHandler):
                    f"User with ID {user_id} attempted to upload a file that"
                    f" exceeded the max body size."
                )
-                self.helper.websocket_helper.broadcast_user(
-                    user_id,
-                    "send_start_error",
+
+                return self.finish_json(
+                    413,
                    {
-                        "error": self.helper.translation.translate(
+                        "status": "error",
+                        "error": "TOO LARGE",
+                        "info": self.helper.translation.translate(
                            "error",
                            "fileTooLarge",
                            self.controller.users.get_user_lang_by_id(user_id),
                        ),
                    },
                )
-                return
            self.do_upload = True

            if not superuser:
-                self.helper.websocket_helper.broadcast_user(
-                    user_id,
-                    "send_start_error",
+                return self.finish_json(
+                    401,
                    {
-                        "error": self.helper.translation.translate(
+                        "status": "error",
+                        "error": "UNAUTHORIZED ACCESS",
+                        "info": self.helper.translation.translate(
                            "error",
                            "superError",
                            self.controller.users.get_user_lang_by_id(user_id),
                        ),
                    },
                )
-                return
            if not self.request.headers.get("X-Content-Type", None).startswith(
                "image/"
            ):
-                self.helper.websocket_helper.broadcast_user(
-                    user_id,
-                    "send_start_error",
+
+                return self.finish_json(
+                    415,
                    {
-                        "error": self.helper.translation.translate(
+                        "status": "error",
+                        "error": "TYPE ERROR",
+                        "info": self.helper.translation.translate(
                            "error",
                            "fileError",
                            self.controller.users.get_user_lang_by_id(user_id),
                        ),
                    },
                )
-                return
            if user_id is None:
                logger.warning("User ID not found in upload handler call")
                Console.warning("User ID not found in upload handler call")
@ -219,18 +222,19 @@ class UploadHandler(BaseHandler):
                    f"User with ID {user_id} attempted to upload a file that"
                    f" exceeded the max body size."
                )
-                self.helper.websocket_helper.broadcast_user(
-                    user_id,
-                    "send_start_error",
+
+                return self.finish_json(
+                    413,
                    {
-                        "error": self.helper.translation.translate(
+                        "status": "error",
+                        "error": "TOO LARGE",
+                        "info": self.helper.translation.translate(
                            "error",
                            "fileTooLarge",
                            self.controller.users.get_user_lang_by_id(user_id),
                        ),
                    },
                )
-                return
            self.do_upload = True

            if superuser:
--- a/app/frontend/static/assets/vendors/fontawesome5/css/all.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/all.css
--- a/app/frontend/static/assets/vendors/fontawesome5/css/all.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/all.min.css
--- a/app/frontend/static/assets/vendors/fontawesome5/css/brands.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/brands.css
@ -1,15 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face {
-  font-family: 'Font Awesome 5 Brands';
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("../webfonts/fa-brands-400.eot");
-  src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
-
-.fab {
-  font-family: 'Font Awesome 5 Brands';
-  font-weight: 400; }
--- a/app/frontend/static/assets/vendors/fontawesome5/css/brands.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/brands.min.css
@ -1,5 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-brands-400.eot);src:url(../webfonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url(../webfonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands";font-weight:400}
--- a/app/frontend/static/assets/vendors/fontawesome5/css/duotone.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/duotone.css
--- a/app/frontend/static/assets/vendors/fontawesome5/css/duotone.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/duotone.min.css
--- a/app/frontend/static/assets/vendors/fontawesome5/css/fontawesome.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/fontawesome.css
--- a/app/frontend/static/assets/vendors/fontawesome5/css/fontawesome.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/fontawesome.min.css
--- a/app/frontend/static/assets/vendors/fontawesome5/css/light.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/light.css
@ -1,15 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 300;
-  font-display: block;
-  src: url("../webfonts/fa-light-300.eot");
-  src: url("../webfonts/fa-light-300.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-light-300.woff2") format("woff2"), url("../webfonts/fa-light-300.woff") format("woff"), url("../webfonts/fa-light-300.ttf") format("truetype"), url("../webfonts/fa-light-300.svg#fontawesome") format("svg"); }
-
-.fal {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 300; }
--- a/app/frontend/static/assets/vendors/fontawesome5/css/light.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/light.min.css
@ -1,5 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:300;font-display:block;src:url(../webfonts/fa-light-300.eot);src:url(../webfonts/fa-light-300.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-light-300.woff2) format("woff2"),url(../webfonts/fa-light-300.woff) format("woff"),url(../webfonts/fa-light-300.ttf) format("truetype"),url(../webfonts/fa-light-300.svg#fontawesome) format("svg")}.fal{font-family:"Font Awesome 5 Pro";font-weight:300}
--- a/app/frontend/static/assets/vendors/fontawesome5/css/regular.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/regular.css
@ -1,15 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("../webfonts/fa-regular-400.eot");
-  src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
-
-.far {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 400; }
--- a/app/frontend/static/assets/vendors/fontawesome5/css/regular.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/regular.min.css
@ -1,5 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.eot);src:url(../webfonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url(../webfonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-family:"Font Awesome 5 Pro";font-weight:400}
--- a/app/frontend/static/assets/vendors/fontawesome5/css/solid.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/solid.css
@ -1,16 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 900;
-  font-display: block;
-  src: url("../webfonts/fa-solid-900.eot");
-  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
-
-.fa,
-.fas {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 900; }
--- a/app/frontend/static/assets/vendors/fontawesome5/css/solid.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/solid.min.css
@ -1,5 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url(../webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url(../webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.fas{font-family:"Font Awesome 5 Pro";font-weight:900}
--- a/app/frontend/static/assets/vendors/fontawesome5/css/svg-with-js.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/svg-with-js.css
@ -1,492 +0,0 @@
-/*!
- * Font Awesome Pro 5.14.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-svg:not(:root).svg-inline--fa {
-  overflow: visible;
-}
-
-.svg-inline--fa {
-  display: inline-block;
-  font-size: inherit;
-  height: 1em;
-  overflow: visible;
-  vertical-align: -.125em;
-}
-
-.svg-inline--fa.fa-lg {
-  vertical-align: -.225em;
-}
-
-.svg-inline--fa.fa-w-1 {
-  width: 0.0625em;
-}
-
-.svg-inline--fa.fa-w-2 {
-  width: 0.125em;
-}
-
-.svg-inline--fa.fa-w-3 {
-  width: 0.1875em;
-}
-
-.svg-inline--fa.fa-w-4 {
-  width: 0.25em;
-}
-
-.svg-inline--fa.fa-w-5 {
-  width: 0.3125em;
-}
-
-.svg-inline--fa.fa-w-6 {
-  width: 0.375em;
-}
-
-.svg-inline--fa.fa-w-7 {
-  width: 0.4375em;
-}
-
-.svg-inline--fa.fa-w-8 {
-  width: 0.5em;
-}
-
-.svg-inline--fa.fa-w-9 {
-  width: 0.5625em;
-}
-
-.svg-inline--fa.fa-w-10 {
-  width: 0.625em;
-}
-
-.svg-inline--fa.fa-w-11 {
-  width: 0.6875em;
-}
-
-.svg-inline--fa.fa-w-12 {
-  width: 0.75em;
-}
-
-.svg-inline--fa.fa-w-13 {
-  width: 0.8125em;
-}
-
-.svg-inline--fa.fa-w-14 {
-  width: 0.875em;
-}
-
-.svg-inline--fa.fa-w-15 {
-  width: 0.9375em;
-}
-
-.svg-inline--fa.fa-w-16 {
-  width: 1em;
-}
-
-.svg-inline--fa.fa-w-17 {
-  width: 1.0625em;
-}
-
-.svg-inline--fa.fa-w-18 {
-  width: 1.125em;
-}
-
-.svg-inline--fa.fa-w-19 {
-  width: 1.1875em;
-}
-
-.svg-inline--fa.fa-w-20 {
-  width: 1.25em;
-}
-
-.svg-inline--fa.fa-pull-left {
-  margin-right: .3em;
-  width: auto;
-}
-
-.svg-inline--fa.fa-pull-right {
-  margin-left: .3em;
-  width: auto;
-}
-
-.svg-inline--fa.fa-border {
-  height: 1.5em;
-}
-
-.svg-inline--fa.fa-li {
-  width: 2em;
-}
-
-.svg-inline--fa.fa-fw {
-  width: 1.25em;
-}
-
-.fa-layers svg.svg-inline--fa {
-  bottom: 0;
-  left: 0;
-  margin: auto;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
-.fa-layers {
-  display: inline-block;
-  height: 1em;
-  position: relative;
-  text-align: center;
-  vertical-align: -.125em;
-  width: 1em;
-}
-
-.fa-layers svg.svg-inline--fa {
-  -webkit-transform-origin: center center;
-  transform-origin: center center;
-}
-
-.fa-layers-text,
-.fa-layers-counter {
-  display: inline-block;
-  position: absolute;
-  text-align: center;
-}
-
-.fa-layers-text {
-  left: 50%;
-  top: 50%;
-  -webkit-transform: translate(-50%, -50%);
-  transform: translate(-50%, -50%);
-  -webkit-transform-origin: center center;
-  transform-origin: center center;
-}
-
-.fa-layers-counter {
-  background-color: #ff253a;
-  border-radius: 1em;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  var(--base-text);
-  height: 1.5em;
-  line-height: 1;
-  max-width: 5em;
-  min-width: 1.5em;
-  overflow: hidden;
-  padding: .25em;
-  right: 0;
-  text-overflow: ellipsis;
-  top: 0;
-  -webkit-transform: scale(0.25);
-  transform: scale(0.25);
-  -webkit-transform-origin: top right;
-  transform-origin: top right;
-}
-
-.fa-layers-bottom-right {
-  bottom: 0;
-  right: 0;
-  top: auto;
-  -webkit-transform: scale(0.25);
-  transform: scale(0.25);
-  -webkit-transform-origin: bottom right;
-  transform-origin: bottom right;
-}
-
-.fa-layers-bottom-left {
-  bottom: 0;
-  left: 0;
-  right: auto;
-  top: auto;
-  -webkit-transform: scale(0.25);
-  transform: scale(0.25);
-  -webkit-transform-origin: bottom left;
-  transform-origin: bottom left;
-}
-
-.fa-layers-top-right {
-  right: 0;
-  top: 0;
-  -webkit-transform: scale(0.25);
-  transform: scale(0.25);
-  -webkit-transform-origin: top right;
-  transform-origin: top right;
-}
-
-.fa-layers-top-left {
-  left: 0;
-  right: auto;
-  top: 0;
-  -webkit-transform: scale(0.25);
-  transform: scale(0.25);
-  -webkit-transform-origin: top left;
-  transform-origin: top left;
-}
-
-.fa-lg {
-  font-size: 1.33333em;
-  line-height: 0.75em;
-  vertical-align: -.0667em;
-}
-
-.fa-xs {
-  font-size: .75em;
-}
-
-.fa-sm {
-  font-size: .875em;
-}
-
-.fa-1x {
-  font-size: 1em;
-}
-
-.fa-2x {
-  font-size: 2em;
-}
-
-.fa-3x {
-  font-size: 3em;
-}
-
-.fa-4x {
-  font-size: 4em;
-}
-
-.fa-5x {
-  font-size: 5em;
-}
-
-.fa-6x {
-  font-size: 6em;
-}
-
-.fa-7x {
-  font-size: 7em;
-}
-
-.fa-8x {
-  font-size: 8em;
-}
-
-.fa-9x {
-  font-size: 9em;
-}
-
-.fa-10x {
-  font-size: 10em;
-}
-
-.fa-fw {
-  text-align: center;
-  width: 1.25em;
-}
-
-.fa-ul {
-  list-style-type: none;
-  margin-left: 2.5em;
-  padding-left: 0;
-}
-
-.fa-ul>li {
-  position: relative;
-}
-
-.fa-li {
-  left: -2em;
-  position: absolute;
-  text-align: center;
-  width: 2em;
-  line-height: inherit;
-}
-
-.fa-border {
-  border: solid 0.08em #eee;
-  border-radius: .1em;
-  padding: .2em .25em .15em;
-}
-
-.fa-pull-left {
-  float: left;
-}
-
-.fa-pull-right {
-  float: right;
-}
-
-.fa.fa-pull-left,
-.fas.fa-pull-left,
-.far.fa-pull-left,
-.fal.fa-pull-left,
-.fab.fa-pull-left {
-  margin-right: .3em;
-}
-
-.fa.fa-pull-right,
-.fas.fa-pull-right,
-.far.fa-pull-right,
-.fal.fa-pull-right,
-.fab.fa-pull-right {
-  margin-left: .3em;
-}
-
-.fa-spin {
-  -webkit-animation: fa-spin 2s infinite linear;
-  animation: fa-spin 2s infinite linear;
-}
-
-.fa-pulse {
-  -webkit-animation: fa-spin 1s infinite steps(8);
-  animation: fa-spin 1s infinite steps(8);
-}
-
-@-webkit-keyframes fa-spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes fa-spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-
-  100% {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-
-.fa-rotate-90 {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
-  -webkit-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-
-.fa-rotate-180 {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
-  -webkit-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
-
-.fa-rotate-270 {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
-  -webkit-transform: rotate(270deg);
-  transform: rotate(270deg);
-}
-
-.fa-flip-horizontal {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
-  -webkit-transform: scale(-1, 1);
-  transform: scale(-1, 1);
-}
-
-.fa-flip-vertical {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
-  -webkit-transform: scale(1, -1);
-  transform: scale(1, -1);
-}
-
-.fa-flip-both,
-.fa-flip-horizontal.fa-flip-vertical {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
-  -webkit-transform: scale(-1, -1);
-  transform: scale(-1, -1);
-}
-
-:root .fa-rotate-90,
-:root .fa-rotate-180,
-:root .fa-rotate-270,
-:root .fa-flip-horizontal,
-:root .fa-flip-vertical,
-:root .fa-flip-both {
-  -webkit-filter: none;
-  filter: none;
-}
-
-.fa-stack {
-  display: inline-block;
-  height: 2em;
-  position: relative;
-  width: 2.5em;
-}
-
-.fa-stack-1x,
-.fa-stack-2x {
-  bottom: 0;
-  left: 0;
-  margin: auto;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
-.svg-inline--fa.fa-stack-1x {
-  height: 1em;
-  width: 1.25em;
-}
-
-.svg-inline--fa.fa-stack-2x {
-  height: 2em;
-  width: 2.5em;
-}
-
-.fa-inverse {
-  var(--base-text);
-}
-
-.sr-only {
-  border: 0;
-  clip: rect(0, 0, 0, 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-  clip: auto;
-  height: auto;
-  margin: 0;
-  overflow: visible;
-  position: static;
-  width: auto;
-}
-
-.svg-inline--fa .fa-primary {
-  fill: var(--fa-primary-color, currentColor);
-  opacity: 1;
-  opacity: var(--fa-primary-opacity, 1);
-}
-
-.svg-inline--fa .fa-secondary {
-  fill: var(--fa-secondary-color, currentColor);
-  opacity: 0.4;
-  opacity: var(--fa-secondary-opacity, 0.4);
-}
-
-.svg-inline--fa.fa-swap-opacity .fa-primary {
-  opacity: 0.4;
-  opacity: var(--fa-secondary-opacity, 0.4);
-}
-
-.svg-inline--fa.fa-swap-opacity .fa-secondary {
-  opacity: 1;
-  opacity: var(--fa-primary-opacity, 1);
-}
-
-.svg-inline--fa mask .fa-primary,
-.svg-inline--fa mask .fa-secondary {
-  fill: black;
-}
-
-.fad.fa-inverse {
-  var(--base-text);
-}
--- a/app/frontend/static/assets/vendors/fontawesome5/css/svg-with-js.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/svg-with-js.min.css
--- a/app/frontend/static/assets/vendors/fontawesome5/css/v4-shims.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome5/css/v4-shims.min.css
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.eot
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.eot
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.svg
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.svg
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.ttf
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.woff
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.woff
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-brands-400.woff2
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.eot
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.eot
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.svg
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.svg
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.ttf
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.woff
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.woff
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-duotone-900.woff2
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.eot
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.eot
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.svg
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.svg
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.ttf
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.woff
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.woff
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-light-300.woff2
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.eot
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.eot
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.svg
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.svg
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.ttf
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.woff
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.woff
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-regular-400.woff2
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.eot
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.eot
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.svg
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.svg
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.ttf
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.woff
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.woff
--- a/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome5/webfonts/fa-solid-900.woff2
--- a/app/frontend/static/assets/vendors/fontawesome6/css/all.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/all.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/all.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/all.min.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/brands.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/brands.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/brands.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/brands.min.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/fontawesome.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/fontawesome.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/fontawesome.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/fontawesome.min.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/regular.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/regular.css
@ -0,0 +1,19 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:root, :host {
+  --fa-style-family-classic: 'Font Awesome 6 Free';
+  --fa-font-regular: normal 400 1em/1 'Font Awesome 6 Free'; }
+
+@font-face {
+  font-family: 'Font Awesome 6 Free';
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype"); }
+
+.far,
+.fa-regular {
+  font-weight: 400; }
--- a/app/frontend/static/assets/vendors/fontawesome6/css/regular.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/regular.min.css
@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-regular:normal 400 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype")}.fa-regular,.far{font-weight:400}
--- a/app/frontend/static/assets/vendors/fontawesome6/css/solid.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/solid.css
@ -0,0 +1,19 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:root, :host {
+  --fa-style-family-classic: 'Font Awesome 6 Free';
+  --fa-font-solid: normal 900 1em/1 'Font Awesome 6 Free'; }
+
+@font-face {
+  font-family: 'Font Awesome 6 Free';
+  font-style: normal;
+  font-weight: 900;
+  font-display: block;
+  src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
+
+.fas,
+.fa-solid {
+  font-weight: 900; }
--- a/app/frontend/static/assets/vendors/fontawesome6/css/solid.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/solid.min.css
@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}
--- a/app/frontend/static/assets/vendors/fontawesome6/css/svg-with-js.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/svg-with-js.css
@ -0,0 +1,635 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:root, :host {
+  --fa-font-solid: normal 900 1em/1 'Font Awesome 6 Solid';
+  --fa-font-regular: normal 400 1em/1 'Font Awesome 6 Regular';
+  --fa-font-light: normal 300 1em/1 'Font Awesome 6 Light';
+  --fa-font-thin: normal 100 1em/1 'Font Awesome 6 Thin';
+  --fa-font-duotone: normal 900 1em/1 'Font Awesome 6 Duotone';
+  --fa-font-sharp-solid: normal 900 1em/1 'Font Awesome 6 Sharp';
+  --fa-font-brands: normal 400 1em/1 'Font Awesome 6 Brands'; }
+
+svg:not(:root).svg-inline--fa, svg:not(:host).svg-inline--fa {
+  overflow: visible;
+  box-sizing: content-box; }
+
+.svg-inline--fa {
+  display: var(--fa-display, inline-block);
+  height: 1em;
+  overflow: visible;
+  vertical-align: -.125em; }
+  .svg-inline--fa.fa-2xs {
+    vertical-align: 0.1em; }
+  .svg-inline--fa.fa-xs {
+    vertical-align: 0em; }
+  .svg-inline--fa.fa-sm {
+    vertical-align: -0.07143em; }
+  .svg-inline--fa.fa-lg {
+    vertical-align: -0.2em; }
+  .svg-inline--fa.fa-xl {
+    vertical-align: -0.25em; }
+  .svg-inline--fa.fa-2xl {
+    vertical-align: -0.3125em; }
+  .svg-inline--fa.fa-pull-left {
+    margin-right: var(--fa-pull-margin, 0.3em);
+    width: auto; }
+  .svg-inline--fa.fa-pull-right {
+    margin-left: var(--fa-pull-margin, 0.3em);
+    width: auto; }
+  .svg-inline--fa.fa-li {
+    width: var(--fa-li-width, 2em);
+    top: 0.25em; }
+  .svg-inline--fa.fa-fw {
+    width: var(--fa-fw-width, 1.25em); }
+
+.fa-layers svg.svg-inline--fa {
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  position: absolute;
+  right: 0;
+  top: 0; }
+
+.fa-layers-text, .fa-layers-counter {
+  display: inline-block;
+  position: absolute;
+  text-align: center; }
+
+.fa-layers {
+  display: inline-block;
+  height: 1em;
+  position: relative;
+  text-align: center;
+  vertical-align: -.125em;
+  width: 1em; }
+  .fa-layers svg.svg-inline--fa {
+    -webkit-transform-origin: center center;
+            transform-origin: center center; }
+
+.fa-layers-text {
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  -webkit-transform-origin: center center;
+          transform-origin: center center; }
+
+.fa-layers-counter {
+  background-color: var(--fa-counter-background-color, #ff253a);
+  border-radius: var(--fa-counter-border-radius, 1em);
+  box-sizing: border-box;
+  color: var(--fa-inverse, #fff);
+  line-height: var(--fa-counter-line-height, 1);
+  max-width: var(--fa-counter-max-width, 5em);
+  min-width: var(--fa-counter-min-width, 1.5em);
+  overflow: hidden;
+  padding: var(--fa-counter-padding, 0.25em 0.5em);
+  right: var(--fa-right, 0);
+  text-overflow: ellipsis;
+  top: var(--fa-top, 0);
+  -webkit-transform: scale(var(--fa-counter-scale, 0.25));
+          transform: scale(var(--fa-counter-scale, 0.25));
+  -webkit-transform-origin: top right;
+          transform-origin: top right; }
+
+.fa-layers-bottom-right {
+  bottom: var(--fa-bottom, 0);
+  right: var(--fa-right, 0);
+  top: auto;
+  -webkit-transform: scale(var(--fa-layers-scale, 0.25));
+          transform: scale(var(--fa-layers-scale, 0.25));
+  -webkit-transform-origin: bottom right;
+          transform-origin: bottom right; }
+
+.fa-layers-bottom-left {
+  bottom: var(--fa-bottom, 0);
+  left: var(--fa-left, 0);
+  right: auto;
+  top: auto;
+  -webkit-transform: scale(var(--fa-layers-scale, 0.25));
+          transform: scale(var(--fa-layers-scale, 0.25));
+  -webkit-transform-origin: bottom left;
+          transform-origin: bottom left; }
+
+.fa-layers-top-right {
+  top: var(--fa-top, 0);
+  right: var(--fa-right, 0);
+  -webkit-transform: scale(var(--fa-layers-scale, 0.25));
+          transform: scale(var(--fa-layers-scale, 0.25));
+  -webkit-transform-origin: top right;
+          transform-origin: top right; }
+
+.fa-layers-top-left {
+  left: var(--fa-left, 0);
+  right: auto;
+  top: var(--fa-top, 0);
+  -webkit-transform: scale(var(--fa-layers-scale, 0.25));
+          transform: scale(var(--fa-layers-scale, 0.25));
+  -webkit-transform-origin: top left;
+          transform-origin: top left; }
+
+.fa-1x {
+  font-size: 1em; }
+
+.fa-2x {
+  font-size: 2em; }
+
+.fa-3x {
+  font-size: 3em; }
+
+.fa-4x {
+  font-size: 4em; }
+
+.fa-5x {
+  font-size: 5em; }
+
+.fa-6x {
+  font-size: 6em; }
+
+.fa-7x {
+  font-size: 7em; }
+
+.fa-8x {
+  font-size: 8em; }
+
+.fa-9x {
+  font-size: 9em; }
+
+.fa-10x {
+  font-size: 10em; }
+
+.fa-2xs {
+  font-size: 0.625em;
+  line-height: 0.1em;
+  vertical-align: 0.225em; }
+
+.fa-xs {
+  font-size: 0.75em;
+  line-height: 0.08333em;
+  vertical-align: 0.125em; }
+
+.fa-sm {
+  font-size: 0.875em;
+  line-height: 0.07143em;
+  vertical-align: 0.05357em; }
+
+.fa-lg {
+  font-size: 1.25em;
+  line-height: 0.05em;
+  vertical-align: -0.075em; }
+
+.fa-xl {
+  font-size: 1.5em;
+  line-height: 0.04167em;
+  vertical-align: -0.125em; }
+
+.fa-2xl {
+  font-size: 2em;
+  line-height: 0.03125em;
+  vertical-align: -0.1875em; }
+
+.fa-fw {
+  text-align: center;
+  width: 1.25em; }
+
+.fa-ul {
+  list-style-type: none;
+  margin-left: var(--fa-li-margin, 2.5em);
+  padding-left: 0; }
+  .fa-ul > li {
+    position: relative; }
+
+.fa-li {
+  left: calc(var(--fa-li-width, 2em) * -1);
+  position: absolute;
+  text-align: center;
+  width: var(--fa-li-width, 2em);
+  line-height: inherit; }
+
+.fa-border {
+  border-color: var(--fa-border-color, #eee);
+  border-radius: var(--fa-border-radius, 0.1em);
+  border-style: var(--fa-border-style, solid);
+  border-width: var(--fa-border-width, 0.08em);
+  padding: var(--fa-border-padding, 0.2em 0.25em 0.15em); }
+
+.fa-pull-left {
+  float: left;
+  margin-right: var(--fa-pull-margin, 0.3em); }
+
+.fa-pull-right {
+  float: right;
+  margin-left: var(--fa-pull-margin, 0.3em); }
+
+.fa-beat {
+  -webkit-animation-name: fa-beat;
+          animation-name: fa-beat;
+  -webkit-animation-delay: var(--fa-animation-delay, 0s);
+          animation-delay: var(--fa-animation-delay, 0s);
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 1s);
+          animation-duration: var(--fa-animation-duration, 1s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, ease-in-out);
+          animation-timing-function: var(--fa-animation-timing, ease-in-out); }
+
+.fa-bounce {
+  -webkit-animation-name: fa-bounce;
+          animation-name: fa-bounce;
+  -webkit-animation-delay: var(--fa-animation-delay, 0s);
+          animation-delay: var(--fa-animation-delay, 0s);
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 1s);
+          animation-duration: var(--fa-animation-duration, 1s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.28, 0.84, 0.42, 1));
+          animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.28, 0.84, 0.42, 1)); }
+
+.fa-fade {
+  -webkit-animation-name: fa-fade;
+          animation-name: fa-fade;
+  -webkit-animation-delay: var(--fa-animation-delay, 0s);
+          animation-delay: var(--fa-animation-delay, 0s);
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 1s);
+          animation-duration: var(--fa-animation-duration, 1s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1));
+          animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1)); }
+
+.fa-beat-fade {
+  -webkit-animation-name: fa-beat-fade;
+          animation-name: fa-beat-fade;
+  -webkit-animation-delay: var(--fa-animation-delay, 0s);
+          animation-delay: var(--fa-animation-delay, 0s);
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 1s);
+          animation-duration: var(--fa-animation-duration, 1s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1));
+          animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1)); }
+
+.fa-flip {
+  -webkit-animation-name: fa-flip;
+          animation-name: fa-flip;
+  -webkit-animation-delay: var(--fa-animation-delay, 0s);
+          animation-delay: var(--fa-animation-delay, 0s);
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 1s);
+          animation-duration: var(--fa-animation-duration, 1s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, ease-in-out);
+          animation-timing-function: var(--fa-animation-timing, ease-in-out); }
+
+.fa-shake {
+  -webkit-animation-name: fa-shake;
+          animation-name: fa-shake;
+  -webkit-animation-delay: var(--fa-animation-delay, 0s);
+          animation-delay: var(--fa-animation-delay, 0s);
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 1s);
+          animation-duration: var(--fa-animation-duration, 1s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, linear);
+          animation-timing-function: var(--fa-animation-timing, linear); }
+
+.fa-spin {
+  -webkit-animation-name: fa-spin;
+          animation-name: fa-spin;
+  -webkit-animation-delay: var(--fa-animation-delay, 0s);
+          animation-delay: var(--fa-animation-delay, 0s);
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 2s);
+          animation-duration: var(--fa-animation-duration, 2s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, linear);
+          animation-timing-function: var(--fa-animation-timing, linear); }
+
+.fa-spin-reverse {
+  --fa-animation-direction: reverse; }
+
+.fa-pulse,
+.fa-spin-pulse {
+  -webkit-animation-name: fa-spin;
+          animation-name: fa-spin;
+  -webkit-animation-direction: var(--fa-animation-direction, normal);
+          animation-direction: var(--fa-animation-direction, normal);
+  -webkit-animation-duration: var(--fa-animation-duration, 1s);
+          animation-duration: var(--fa-animation-duration, 1s);
+  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  -webkit-animation-timing-function: var(--fa-animation-timing, steps(8));
+          animation-timing-function: var(--fa-animation-timing, steps(8)); }
+
+@media (prefers-reduced-motion: reduce) {
+  .fa-beat,
+  .fa-bounce,
+  .fa-fade,
+  .fa-beat-fade,
+  .fa-flip,
+  .fa-pulse,
+  .fa-shake,
+  .fa-spin,
+  .fa-spin-pulse {
+    -webkit-animation-delay: -1ms;
+            animation-delay: -1ms;
+    -webkit-animation-duration: 1ms;
+            animation-duration: 1ms;
+    -webkit-animation-iteration-count: 1;
+            animation-iteration-count: 1;
+    transition-delay: 0s;
+    transition-duration: 0s; } }
+
+@-webkit-keyframes fa-beat {
+  0%, 90% {
+    -webkit-transform: scale(1);
+            transform: scale(1); }
+  45% {
+    -webkit-transform: scale(var(--fa-beat-scale, 1.25));
+            transform: scale(var(--fa-beat-scale, 1.25)); } }
+
+@keyframes fa-beat {
+  0%, 90% {
+    -webkit-transform: scale(1);
+            transform: scale(1); }
+  45% {
+    -webkit-transform: scale(var(--fa-beat-scale, 1.25));
+            transform: scale(var(--fa-beat-scale, 1.25)); } }
+
+@-webkit-keyframes fa-bounce {
+  0% {
+    -webkit-transform: scale(1, 1) translateY(0);
+            transform: scale(1, 1) translateY(0); }
+  10% {
+    -webkit-transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0);
+            transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0); }
+  30% {
+    -webkit-transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em));
+            transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em)); }
+  50% {
+    -webkit-transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0);
+            transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0); }
+  57% {
+    -webkit-transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em));
+            transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em)); }
+  64% {
+    -webkit-transform: scale(1, 1) translateY(0);
+            transform: scale(1, 1) translateY(0); }
+  100% {
+    -webkit-transform: scale(1, 1) translateY(0);
+            transform: scale(1, 1) translateY(0); } }
+
+@keyframes fa-bounce {
+  0% {
+    -webkit-transform: scale(1, 1) translateY(0);
+            transform: scale(1, 1) translateY(0); }
+  10% {
+    -webkit-transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0);
+            transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0); }
+  30% {
+    -webkit-transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em));
+            transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em)); }
+  50% {
+    -webkit-transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0);
+            transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0); }
+  57% {
+    -webkit-transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em));
+            transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em)); }
+  64% {
+    -webkit-transform: scale(1, 1) translateY(0);
+            transform: scale(1, 1) translateY(0); }
+  100% {
+    -webkit-transform: scale(1, 1) translateY(0);
+            transform: scale(1, 1) translateY(0); } }
+
+@-webkit-keyframes fa-fade {
+  50% {
+    opacity: var(--fa-fade-opacity, 0.4); } }
+
+@keyframes fa-fade {
+  50% {
+    opacity: var(--fa-fade-opacity, 0.4); } }
+
+@-webkit-keyframes fa-beat-fade {
+  0%, 100% {
+    opacity: var(--fa-beat-fade-opacity, 0.4);
+    -webkit-transform: scale(1);
+            transform: scale(1); }
+  50% {
+    opacity: 1;
+    -webkit-transform: scale(var(--fa-beat-fade-scale, 1.125));
+            transform: scale(var(--fa-beat-fade-scale, 1.125)); } }
+
+@keyframes fa-beat-fade {
+  0%, 100% {
+    opacity: var(--fa-beat-fade-opacity, 0.4);
+    -webkit-transform: scale(1);
+            transform: scale(1); }
+  50% {
+    opacity: 1;
+    -webkit-transform: scale(var(--fa-beat-fade-scale, 1.125));
+            transform: scale(var(--fa-beat-fade-scale, 1.125)); } }
+
+@-webkit-keyframes fa-flip {
+  50% {
+    -webkit-transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg));
+            transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg)); } }
+
+@keyframes fa-flip {
+  50% {
+    -webkit-transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg));
+            transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg)); } }
+
+@-webkit-keyframes fa-shake {
+  0% {
+    -webkit-transform: rotate(-15deg);
+            transform: rotate(-15deg); }
+  4% {
+    -webkit-transform: rotate(15deg);
+            transform: rotate(15deg); }
+  8%, 24% {
+    -webkit-transform: rotate(-18deg);
+            transform: rotate(-18deg); }
+  12%, 28% {
+    -webkit-transform: rotate(18deg);
+            transform: rotate(18deg); }
+  16% {
+    -webkit-transform: rotate(-22deg);
+            transform: rotate(-22deg); }
+  20% {
+    -webkit-transform: rotate(22deg);
+            transform: rotate(22deg); }
+  32% {
+    -webkit-transform: rotate(-12deg);
+            transform: rotate(-12deg); }
+  36% {
+    -webkit-transform: rotate(12deg);
+            transform: rotate(12deg); }
+  40%, 100% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); } }
+
+@keyframes fa-shake {
+  0% {
+    -webkit-transform: rotate(-15deg);
+            transform: rotate(-15deg); }
+  4% {
+    -webkit-transform: rotate(15deg);
+            transform: rotate(15deg); }
+  8%, 24% {
+    -webkit-transform: rotate(-18deg);
+            transform: rotate(-18deg); }
+  12%, 28% {
+    -webkit-transform: rotate(18deg);
+            transform: rotate(18deg); }
+  16% {
+    -webkit-transform: rotate(-22deg);
+            transform: rotate(-22deg); }
+  20% {
+    -webkit-transform: rotate(22deg);
+            transform: rotate(22deg); }
+  32% {
+    -webkit-transform: rotate(-12deg);
+            transform: rotate(-12deg); }
+  36% {
+    -webkit-transform: rotate(12deg);
+            transform: rotate(12deg); }
+  40%, 100% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); } }
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+.fa-rotate-90 {
+  -webkit-transform: rotate(90deg);
+          transform: rotate(90deg); }
+
+.fa-rotate-180 {
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg); }
+
+.fa-rotate-270 {
+  -webkit-transform: rotate(270deg);
+          transform: rotate(270deg); }
+
+.fa-flip-horizontal {
+  -webkit-transform: scale(-1, 1);
+          transform: scale(-1, 1); }
+
+.fa-flip-vertical {
+  -webkit-transform: scale(1, -1);
+          transform: scale(1, -1); }
+
+.fa-flip-both,
+.fa-flip-horizontal.fa-flip-vertical {
+  -webkit-transform: scale(-1, -1);
+          transform: scale(-1, -1); }
+
+.fa-rotate-by {
+  -webkit-transform: rotate(var(--fa-rotate-angle, none));
+          transform: rotate(var(--fa-rotate-angle, none)); }
+
+.fa-stack {
+  display: inline-block;
+  vertical-align: middle;
+  height: 2em;
+  position: relative;
+  width: 2.5em; }
+
+.fa-stack-1x,
+.fa-stack-2x {
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: var(--fa-stack-z-index, auto); }
+
+.svg-inline--fa.fa-stack-1x {
+  height: 1em;
+  width: 1.25em; }
+
+.svg-inline--fa.fa-stack-2x {
+  height: 2em;
+  width: 2.5em; }
+
+.fa-inverse {
+  color: var(--fa-inverse, #fff); }
+
+.sr-only,
+.fa-sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border-width: 0; }
+
+.sr-only-focusable:not(:focus),
+.fa-sr-only-focusable:not(:focus) {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border-width: 0; }
+
+.svg-inline--fa .fa-primary {
+  fill: var(--fa-primary-color, currentColor);
+  opacity: var(--fa-primary-opacity, 1); }
+
+.svg-inline--fa .fa-secondary {
+  fill: var(--fa-secondary-color, currentColor);
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.svg-inline--fa.fa-swap-opacity .fa-primary {
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.svg-inline--fa.fa-swap-opacity .fa-secondary {
+  opacity: var(--fa-primary-opacity, 1); }
+
+.svg-inline--fa mask .fa-primary,
+.svg-inline--fa mask .fa-secondary {
+  fill: black; }
+
+.fad.fa-inverse,
+.fa-duotone.fa-inverse {
+  color: var(--fa-inverse, #fff); }
--- a/app/frontend/static/assets/vendors/fontawesome6/css/svg-with-js.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/svg-with-js.min.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/v4-font-face.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/v4-font-face.css
@ -0,0 +1,26 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+@font-face {
+  font-family: 'FontAwesome';
+  font-display: block;
+  src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
+
+@font-face {
+  font-family: 'FontAwesome';
+  font-display: block;
+  src: url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.ttf") format("truetype"); }
+
+@font-face {
+  font-family: 'FontAwesome';
+  font-display: block;
+  src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype");
+  unicode-range: U+F003,U+F006,U+F014,U+F016-F017,U+F01A-F01B,U+F01D,U+F022,U+F03E,U+F044,U+F046,U+F05C-F05D,U+F06E,U+F070,U+F087-F088,U+F08A,U+F094,U+F096-F097,U+F09D,U+F0A0,U+F0A2,U+F0A4-F0A7,U+F0C5,U+F0C7,U+F0E5-F0E6,U+F0EB,U+F0F6-F0F8,U+F10C,U+F114-F115,U+F118-F11A,U+F11C-F11D,U+F133,U+F147,U+F14E,U+F150-F152,U+F185-F186,U+F18E,U+F190-F192,U+F196,U+F1C1-F1C9,U+F1D9,U+F1DB,U+F1E3,U+F1EA,U+F1F7,U+F1F9,U+F20A,U+F247-F248,U+F24A,U+F24D,U+F255-F25B,U+F25D,U+F271-F274,U+F278,U+F27B,U+F28C,U+F28E,U+F29C,U+F2B5,U+F2B7,U+F2BA,U+F2BC,U+F2BE,U+F2C0-F2C1,U+F2C3,U+F2D0,U+F2D2,U+F2D4,U+F2DC; }
+
+@font-face {
+  font-family: 'FontAwesome';
+  font-display: block;
+  src: url("../webfonts/fa-v4compatibility.woff2") format("woff2"), url("../webfonts/fa-v4compatibility.ttf") format("truetype");
+  unicode-range: U+F041,U+F047,U+F065-F066,U+F07D-F07E,U+F080,U+F08B,U+F08E,U+F090,U+F09A,U+F0AC,U+F0AE,U+F0B2,U+F0D0,U+F0D6,U+F0E4,U+F0EC,U+F10A-F10B,U+F123,U+F13E,U+F148-F149,U+F14C,U+F156,U+F15E,U+F160-F161,U+F163,U+F175-F178,U+F195,U+F1F8,U+F219,U+F27A; }
--- a/app/frontend/static/assets/vendors/fontawesome6/css/v4-font-face.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/v4-font-face.min.css
@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.ttf) format("truetype")}@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype");unicode-range:u+f003,u+f006,u+f014,u+f016-f017,u+f01a-f01b,u+f01d,u+f022,u+f03e,u+f044,u+f046,u+f05c-f05d,u+f06e,u+f070,u+f087-f088,u+f08a,u+f094,u+f096-f097,u+f09d,u+f0a0,u+f0a2,u+f0a4-f0a7,u+f0c5,u+f0c7,u+f0e5-f0e6,u+f0eb,u+f0f6-f0f8,u+f10c,u+f114-f115,u+f118-f11a,u+f11c-f11d,u+f133,u+f147,u+f14e,u+f150-f152,u+f185-f186,u+f18e,u+f190-f192,u+f196,u+f1c1-f1c9,u+f1d9,u+f1db,u+f1e3,u+f1ea,u+f1f7,u+f1f9,u+f20a,u+f247-f248,u+f24a,u+f24d,u+f255-f25b,u+f25d,u+f271-f274,u+f278,u+f27b,u+f28c,u+f28e,u+f29c,u+f2b5,u+f2b7,u+f2ba,u+f2bc,u+f2be,u+f2c0-f2c1,u+f2c3,u+f2d0,u+f2d2,u+f2d4,u+f2dc}@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-v4compatibility.woff2) format("woff2"),url(../webfonts/fa-v4compatibility.ttf) format("truetype");unicode-range:u+f041,u+f047,u+f065-f066,u+f07d-f07e,u+f080,u+f08b,u+f08e,u+f090,u+f09a,u+f0ac,u+f0ae,u+f0b2,u+f0d0,u+f0d6,u+f0e4,u+f0ec,u+f10a-f10b,u+f123,u+f13e,u+f148-f149,u+f14c,u+f156,u+f15e,u+f160-f161,u+f163,u+f175-f178,u+f195,u+f1f8,u+f219,u+f27a}
--- a/app/frontend/static/assets/vendors/fontawesome6/css/v4-shims.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/v4-shims.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/v4-shims.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/v4-shims.min.css
--- a/app/frontend/static/assets/vendors/fontawesome6/css/v5-font-face.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/v5-font-face.css
@ -0,0 +1,22 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-display: block;
+  font-weight: 400;
+  src: url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.ttf") format("truetype"); }
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-display: block;
+  font-weight: 900;
+  src: url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.ttf") format("truetype"); }
+
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-display: block;
+  font-weight: 400;
+  src: url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.ttf") format("truetype"); }
--- a/app/frontend/static/assets/vendors/fontawesome6/css/v5-font-face.min.css
+++ b/app/frontend/static/assets/vendors/fontawesome6/css/v5-font-face.min.css
@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+@font-face{font-family:"Font Awesome 5 Brands";font-display:block;font-weight:400;src:url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.ttf) format("truetype")}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:900;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:400;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype")}
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-brands-400.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-brands-400.ttf
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-brands-400.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-brands-400.woff2
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-regular-400.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-regular-400.ttf
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-regular-400.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-regular-400.woff2
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-solid-900.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-solid-900.ttf
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-solid-900.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-solid-900.woff2
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-v4compatibility.ttf
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-v4compatibility.ttf
--- a/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-v4compatibility.woff2
+++ b/app/frontend/static/assets/vendors/fontawesome6/webfonts/fa-v4compatibility.woff2
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@ -13,9 +13,9 @@
  <link rel="stylesheet" href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css">
  <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css">
  <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
-  <link rel="stylesheet" href="/static/assets/vendors/fontawesome5/css/all.css">
+  <link rel="stylesheet" href="/static/assets/vendors/fontawesome6/css/all.css">
  <link rel="stylesheet" type="text/css"
-        href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
+    href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
  <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
  <link rel="stylesheet" href="/static/assets/css/crafty.css">

@ -41,14 +41,14 @@
  <link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet">
  <script defer src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js"
-          integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA=="
+    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.min.js"
-          integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g=="
+    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-zoom/1.2.1/chartjs-plugin-zoom.min.js"
-          integrity="sha512-klQv6lz2YR+MecyFYMFRuU2eAl8IPRo6zHnsc9n142TJuJHS8CG0ix4Oq9na9ceeg1u5EkBfZsFcV3U7J51iew=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    integrity="sha512-klQv6lz2YR+MecyFYMFRuU2eAl8IPRo6zHnsc9n142TJuJHS8CG0ix4Oq9na9ceeg1u5EkBfZsFcV3U7J51iew=="
+    crossorigin="anonymous" referrerpolicy="no-referrer"></script>

  <!-- End Bootstrap Toggle -->

@ -82,7 +82,7 @@
        {% include notify.html %}

        <button class="navbar-toggler navbar-toggler-right d-lg-none align-self-center" type="button"
-                data-toggle="offcanvas">
+          data-toggle="offcanvas">
          <span class="mdi mdi-menu"></span>
        </button>
      </div>
@ -174,7 +174,7 @@
  <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
  <script src="/static/assets/js/shared/misc.js"></script>
  <script type="text/javascript"
-          src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"></script>
+    src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/5.4.0/bootbox.min.js"></script>
  <script type="text/javascript" src="/static/assets/js/motd.js"></script>

--- a/app/frontend/templates/blank_base.html
+++ b/app/frontend/templates/blank_base.html
@ -1,60 +1,63 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>{% block title %}{{ _('Default') }}{% end %}</title>
-    <!-- plugins:css -->
-    <link rel="stylesheet" href="/static/assets/vendors/mdi/css/materialdesignicons.min.css">
-    <link rel="stylesheet" href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css">
-    <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css">
-    <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
-    <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
-    <link rel="stylesheet" href="/static/assets/vendors/fontawesome5/css/all.css">
-    <link rel="stylesheet" href="/static/assest/css/crafty.css">
-    <!-- endinject -->
-    <!-- Plugin css for this page -->
-    <!-- End Plugin css for this page -->
-    <!-- Layout styles -->
-    <link rel="stylesheet" href="/static/assets/css/dark/style.css">
-    <!-- End Layout styles -->
-    <link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
-    <link rel="alternate icon" href="/static/assets/images/favicon.png" />
-  </head>
-  <body class="dark-theme">
-    <div class="container-scroller">
-      <div class="container-fluid page-body-wrapper full-page-wrapper">
-        <div class="content-wrapper d-flex align-items-center auth auth-bg-1 theme-one">
-          <div class="row w-100">
-            <div class="mx-auto">
+
+<head>
+  <!-- Required meta tags -->
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <title>{% block title %}{{ _('Default') }}{% end %}</title>
+  <!-- plugins:css -->
+  <link rel="stylesheet" href="/static/assets/vendors/mdi/css/materialdesignicons.min.css">
+  <link rel="stylesheet" href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css">
+  <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css">
+  <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
+  <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
+  <link rel="stylesheet" href="/static/assets/vendors/fontawesome6/css/all.css">
+  <link rel="stylesheet" href="/static/assest/css/crafty.css">
+  <!-- endinject -->
+  <!-- Plugin css for this page -->
+  <!-- End Plugin css for this page -->
+  <!-- Layout styles -->
+  <link rel="stylesheet" href="/static/assets/css/dark/style.css">
+  <!-- End Layout styles -->
+  <link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
+  <link rel="alternate icon" href="/static/assets/images/favicon.png" />
+</head>
+
+<body class="dark-theme">
+  <div class="container-scroller">
+    <div class="container-fluid page-body-wrapper full-page-wrapper">
+      <div class="content-wrapper d-flex align-items-center auth auth-bg-1 theme-one">
+        <div class="row w-100">
+          <div class="mx-auto">

            {% block content %}
            {% end %}

-            </div>
          </div>
        </div>
-        <!-- content-wrapper ends -->
      </div>
-      <!-- page-body-wrapper ends -->
+      <!-- content-wrapper ends -->
    </div>
-    <!-- container-scroller -->
-    <!-- plugins:js -->
-    <script src="/static/assets/vendors/js/vendor.bundle.base.js"></script>
-    <!-- endinject -->
-    <!-- inject:js -->
-    <script src="/static/assets/js/shared/off-canvas.js"></script>
-    <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
-    <script src="/static/assets/js/shared/misc.js"></script>
-    <script src="/static/assets/js/shared/settings.js"></script>
-    <script src="/static/assets/js/shared/todolist.js"></script>
-    <!-- endinject -->
-    
-    {% block js %}
-    <!-- Custom js for this page -->
-    <!-- End custom js for this page -->
-    {% end %}
-    
-  </body>
+    <!-- page-body-wrapper ends -->
+  </div>
+  <!-- container-scroller -->
+  <!-- plugins:js -->
+  <script src="/static/assets/vendors/js/vendor.bundle.base.js"></script>
+  <!-- endinject -->
+  <!-- inject:js -->
+  <script src="/static/assets/js/shared/off-canvas.js"></script>
+  <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
+  <script src="/static/assets/js/shared/misc.js"></script>
+  <script src="/static/assets/js/shared/settings.js"></script>
+  <script src="/static/assets/js/shared/todolist.js"></script>
+  <!-- endinject -->
+
+  {% block js %}
+  <!-- Custom js for this page -->
+  <!-- End custom js for this page -->
+  {% end %}
+
+</body>
+
 </html>
--- a/app/frontend/templates/main_menu.html
+++ b/app/frontend/templates/main_menu.html
@ -68,20 +68,20 @@

    <li class="nav-item">
      <a class="nav-link" href="/panel/dashboard">
-        <i class="fas fa-chart-network"></i>&nbsp;
+        <i class="fa-solid fa-diagram-project"></i>&nbsp;
        <span class="menu-title">{{ translate('sidebar', 'dashboard', data['lang']) }}</span>
      </a>
    </li>

    <li class="nav-item">
      <a class="nav-link" data-toggle="collapse" href="#page-layouts" aria-expanded="false"
-         aria-controls="page-layouts">
+        aria-controls="page-layouts">
        <i class="fas fa-server"></i> &nbsp;
        <span class="menu-title">{{ translate('sidebar', 'servers', data['lang']) }}</span>
        <i class="menu-arrow"></i>
      </a>
      <div class="collapse" id="page-layouts">
-        <ul class="nav flex-column sub-menu">
+        <ul class="nav flex-column sub-menu" id="sidebar-servers">
          {% if data['crafty_permissions']['Server_Creation'] in data['user_crafty_permissions'] %}
          <li class="nav-item">
            <a class="nav-link" href="/server/step1"><i class="fas fa-plus-circle"></i> &nbsp; {{ translate('sidebar',
@ -138,4 +138,9 @@

  </ul>
 </nav>
+<script>
+  $(document).ready(function () {
+    $('#sidebar-servers li:gt(10)').remove();
+  })
+</script>
 <!-- partial -->
--- a/app/frontend/templates/panel/config_json.html
+++ b/app/frontend/templates/panel/config_json.html
@ -6,7 +6,8 @@
 {% block title %}Crafty Controller - {{ translate('panelConfig', 'pageTitle', data['lang']) }}{% end %}

 {% block content %}
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/css/bootstrap-select.min.css">
+<link rel="stylesheet"
+  href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/css/bootstrap-select.min.css">


 <div class="content-wrapper">
@ -50,62 +51,68 @@
            {% for item in data['config-json'].items() %}
            {% if item[0] == "reset_secrets_on_next_boot" %}
            <div class="form-group" style="background: rgba(243, 21, 6, 0.3); outline: 1px solid red; padding: 10px;">
-            {% else %}
-            <div class="form-group">
-            {% end %}
-              <label class="form" for="{{item[0]}}">{{item[0]}}
-                <small class="text-muted ml-1">
-                </small> </label><br />
-              {% if item[0] == 'language' %}
-              <select name="{{item[0]}}" class="form-control">
-                {% for lang in data['availables_languages'] %}
-                {% if lang == item[1] %}
-                <option selected>{{lang}}</option>
-                {% else %}
-                <option>{{lang}}</option>
+              {% else %}
+              <div class="form-group">
                {% end %}
-                {% end %}
-              </select>
-              {% elif item[0] == 'disabled_language_files' %}
-              <div class="input-group">
-                <button type="button" class="btn btn-outline-default custom-picker" onclick="$('option', $('#lang_select')).each(function(element) {
-                $(this).removeAttr('selected').prop('selected', false); $('.selectpicker').selectpicker('refresh')
-            });">Enable all Languages</button>
-                <select id="lang_select" class="form-control selectpicker show-tick" data-icon-base="fas" data-tick-icon="fa-check" multiple data-style="custom-picker">
-                  {% for lang in data['all_languages'] %}
-                  {% if lang in item[1] %}
+                <label class="form" for="{{item[0]}}">{{item[0]}}
+                  <small class="text-muted ml-1">
+                  </small> </label><br />
+                {% if item[0] == 'language' %}
+                <select name="{{item[0]}}" class="form-control">
+                  {% for lang in data['availables_languages'] %}
+                  {% if lang == item[1] %}
                  <option selected>{{lang}}</option>
                  {% else %}
                  <option>{{lang}}</option>
                  {% end %}
                  {% end %}
                </select>
-                <textarea id="disabled_lang" name="{{item[0]}}" class="form-control list hidden" rows="{{ len(data['all_languages']) }}" value="{{','.join(item[1])}}" hidden>{{','.join(item[1])}}</textarea>
+                {% elif item[0] == 'disabled_language_files' %}
+                <div class="input-group">
+                  <button type="button" class="btn btn-outline-default custom-picker" onclick="$('option', $('#lang_select')).each(function(element) {
+                $(this).removeAttr('selected').prop('selected', false); $('.selectpicker').selectpicker('refresh')
+            });">Enable all Languages</button>
+                  <select id="lang_select" class="form-control selectpicker show-tick" data-icon-base="fas"
+                    data-tick-icon="fa-check" multiple data-style="custom-picker">
+                    {% for lang in data['all_languages'] %}
+                    {% if lang in item[1] %}
+                    <option selected>{{lang}}</option>
+                    {% else %}
+                    <option>{{lang}}</option>
+                    {% end %}
+                    {% end %}
+                  </select>
+                  <textarea id="disabled_lang" name="{{item[0]}}" class="form-control list hidden"
+                    rows="{{ len(data['all_languages']) }}" value="{{','.join(item[1])}}"
+                    hidden>{{','.join(item[1])}}</textarea>
+                </div>
+                {% elif isinstance(item[1], list) %}
+                <textarea value="{{','.join(item[1])}}" type="text" name="{{item[0]}}"
+                  class="form-control list">{{','.join(item[1])}}</textarea>
+                {% elif isinstance(item[1], bool) %}
+                <div style="margin-left: 30px;">
+                  {% if item[1] == True %}
+                  <input type="radio" class="form-check-input" name="{{item[0]}}" id="True" value="True" checked>
+                   <label for="True">True</label><br>
+                  <input type="radio" class="form-check-input" name="{{item[0]}}" id="False" value="False">
+                   <label for="False">False</label>
+                  {% else %}
+                  <input type="radio" class="form-check-input" name="{{item[0]}}" id="True" value="True">
+                   <label for="True">True</label><br>
+                  <input type="radio" class="form-check-input" name="{{item[0]}}" id="False" value="False" checked>
+                   <label for="False">False</label>
+                  {% end %}
+                </div>
+                {% elif isinstance(item[1], int) %}
+                <input type="number" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}"
+                  step="1" min="0" required>
+                {% else %}
+                <input type="text" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}"
+                  step="2" min="0" required>
+                {% end %}
              </div>
-              {% elif isinstance(item[1], list) %}
-              <textarea value="{{','.join(item[1])}}" type="text" name="{{item[0]}}" class="form-control list">{{','.join(item[1])}}</textarea>
-              {% elif isinstance(item[1], bool) %}
-              <div style="margin-left: 30px;">
-              {% if item[1] == True %}
-                <input type="radio" class="form-check-input" name="{{item[0]}}" id="True" value="True" checked>
-                 <label for="True">True</label><br>
-                <input type="radio" class="form-check-input" name="{{item[0]}}" id="False" value="False">
-                 <label for="False">False</label>
-              {% else %}
-                <input type="radio" class="form-check-input" name="{{item[0]}}" id="True" value="True">
-                 <label for="True">True</label><br>
-                <input type="radio" class="form-check-input" name="{{item[0]}}" id="False" value="False" checked>
-                 <label for="False">False</label>
              {% end %}
-              </div>
-              {% elif isinstance(item[1], int) %}
-              <input type="number" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}" step="1" min="0" required>
-              {% else %}
-              <input type="text" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}" step="2" min="0" required>
-              {% end %}
-            </div>
-            {% end %}
-            <button class="btn btn-success" type="submit">Submit</button>&nbsp;<span id="submit-status"></span>
+              <button class="btn btn-success" type="submit">Submit</button>&nbsp;<span id="submit-status"></span>
          </form>
        </div>
      </div>
@ -276,44 +283,6 @@
      },
    });
  })
-
-  var file;
-  function sendFile() {
-    file = $("#file")[0].files[0]
-    document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
-    let xmlHttpRequest = new XMLHttpRequest();
-    let token = getCookie("_xsrf")
-    let fileName = file.name
-    let target = '/upload'
-    let mimeType = file.type
-    let size = file.size
-    let type = 'background'
-
-    xmlHttpRequest.open('POST', target, true);
-    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
-    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
-    xmlHttpRequest.setRequestHeader('X-Content-Length', size);
-    xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
-    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
-    xmlHttpRequest.setRequestHeader('X-FileName', fileName);
-    xmlHttpRequest.addEventListener('load', (event) => {
-      if (event.target.responseText == 'success') {
-        console.log('Upload for file', file.name, 'was successful!')
-        document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
-        setTimeout(function () {
-          window.location.reload();
-        }, 2000);
-      }
-      else {
-        alert('Upload failed with response: ' + event.target.responseText);
-        doUpload = false;
-      }
-    }, false);
-    xmlHttpRequest.addEventListener('error', (e) => {
-      console.error('Error while uploading file', file.name + '.', 'Event:', e)
-    }, false);
-    xmlHttpRequest.send(file);
-  }
 </script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/js/bootstrap-select.min.js">
 </script>
--- a/app/frontend/templates/panel/credits.html
+++ b/app/frontend/templates/panel/credits.html
@ -24,7 +24,8 @@

  <div class="card">
    <div class="card-header header-sm d-flex justify-content-between align-items-center">
-      <h4 class="card-title"><i class="far fa-code"></i> &nbsp;{{ translate('credits', 'developmentTeam', data['lang'])
+      <h4 class="card-title"><i class="fa-solid fa-code-merge"></i> &nbsp;{{ translate('credits', 'developmentTeam',
+        data['lang'])
        }}</h4>
    </div>
    <div class="card-body">
@ -184,7 +185,8 @@

  <div class="card">
    <div class="card-header header-sm d-flex justify-content-between align-items-center">
-      <h4 class="card-title"><i class="far fa-server"></i> &nbsp;{{ translate('credits', 'retiredStaff', data['lang'])
+      <h4 class="card-title"><i class="fa-solid fa-thumbtack"></i> &nbsp;{{ translate('credits', 'retiredStaff',
+        data['lang'])
        }}</h4>
    </div>

@ -320,7 +322,7 @@
    <div class="col-lg-6 grid-margin stretch-card">
      <div class="card">
        <div class="card-header header-sm d-flex justify-content-between align-items-center">
-          <h4 class="card-title"><i class="far fa-language"></i> {{ translate('credits', 'translationTitle',
+          <h4 class="card-title"><i class="fa fa-language"></i> {{ translate('credits', 'translationTitle',
            data['lang']) }}</h4>
        </div>
        <div class="card-body">
@ -342,11 +344,13 @@
                <td class="pb-0">
                  <div class="row">
                    {% for language in data['translations'][person] %}
-                      {% if language['status'] %}
-                        <span class="btn btn-sm btn-inverse-success mr-2" style="margin-bottom: 12px;">{{ language['name'] }}</span>
-                      {% else %}
-                        <span class="btn btn-sm btn-inverse-secondary mr-2" style="margin-bottom: 12px;">{{ language['name'] }}</span>
-                      {% end %}
+                    {% if language['status'] %}
+                    <span class="btn btn-sm btn-inverse-success mr-2" style="margin-bottom: 12px;">{{ language['name']
+                      }}</span>
+                    {% else %}
+                    <span class="btn btn-sm btn-inverse-secondary mr-2" style="margin-bottom: 12px;">{{ language['name']
+                      }}</span>
+                    {% end %}
                    {% end %}
                  </div>
                </td>
@ -373,4 +377,4 @@
  });
 </script>

-{% end %}
+{% end %}
--- a/app/frontend/templates/panel/custom_login.html
+++ b/app/frontend/templates/panel/custom_login.html
@ -56,11 +56,11 @@
                        <input type="hidden" value="import_zip" name="create_type">
                        <div class="col form-group">
                          <span id="upload_input"><input type="file" class="form-control-file" id="file" name="file"
-                                   multiple="false" required></span>
+                              multiple="false" required></span>
                        </div>
                        <div class="col form-group">
                          <button type="button" class="btn btn-info" id="upload-button" onclick="sendFile()"
-                                  disabled>UPLOAD</button>
+                            disabled>UPLOAD</button>
                        </div>
                      </form>
                      <hr>
@ -74,7 +74,7 @@
                            <label for="photo" class="col-sm-6 col-form-label">Selected Background Image</label>
                            <div class="col-sm-6">
                              <select class="form-select form-control form-control-lg select-css form-control-plaintext"
-                                      id="photo" name="photo" form="photo_form" onchange="updateBackgroundPreview()">
+                                id="photo" name="photo" form="photo_form" onchange="updateBackgroundPreview()">
                                {% for image in data["backgrounds"] %}
                                <option value="{{image}}">{{image}}</option>
                                {% end %}
@ -84,8 +84,8 @@
                          <div id="photo_loading" class="form-group" hidden>
                            <div class="progress">
                              <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
-                                   aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i
-                                   class="fa-solid fa-spinner"></i></div>
+                                aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i
+                                  class="fa-solid fa-spinner"></i></div>
                            </div>
                          </div>
                          <div class="form-group row">
@ -94,12 +94,12 @@
                            <label class="col-sm-1" id="opacityValue">{{ data['login_opacity'] }}%</label>
                            <div class="range col-sm-8">
                              <input type="range" class="form-control-range" id="modal_opacity" name="modal_opacity"
-                                     onchange="previewOpacity()" min="0" max="100" value="{{ data['login_opacity'] }}">
+                                onchange="previewOpacity()" min="0" max="100" value="{{ data['login_opacity'] }}">
                            </div>
                          </div>
                          <div id="login_preview" style="position: relative;">
                            <img id="bg-preview" src="../../static/assets/images/auth/{{ data['background'] }}"
-                                 class="img-fluid" alt="Responsive image">
+                              class="img-fluid" alt="Responsive image">
                            <div id="login-form-preview">
                              <div id="login-form-background" class="auto-form-wrapper login-modal">
                                <div class="text-center auto-form-logo">
@ -164,19 +164,19 @@

                                <div id="login_form_data">
                                  <input type="hidden" name="_xsrf"
-                                         value="2|1d603267|809fb6bd82f677d440e484dde7c3a310|1671726040" disabled>
+                                    value="2|1d603267|809fb6bd82f677d440e484dde7c3a310|1671726040" disabled>
                                  <div class="form-group">
                                    <label class="label">Username</label>
                                    <div class="input-group">
                                      <input type="text" class="form-control login-text-input login-input"
-                                             placeholder="Username" name="username" id="username" required="true" disabled>
+                                        placeholder="Username" name="username" id="username" required="true" disabled>
                                    </div>
                                  </div>
                                  <div class="form-group">
                                    <label class="label">Password</label>
                                    <div class="input-group">
                                      <input type="password" class="form-control login-text-input login-input"
-                                             placeholder="Password" name="password" id="password" required="true" disabled>
+                                        placeholder="Password" name="password" id="password" required="true" disabled>
                                    </div>
                                  </div>
                                  <div class="form-group">
@ -196,7 +196,7 @@
                                  </div>
                                  <div class="text-block text-center my-3">
                                    <span class="text-small font-weight-semibold"><a
-                                         href="https://craftycontrol.com/">Crafty Control
+                                        href="https://craftycontrol.com/">Crafty Control
                                        4.0.20</a> </span>
                                  </div>
                                </div>
@ -352,7 +352,7 @@
  var file;
  function sendFile() {
    file = $("#file")[0].files[0]
-    document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
+    document.getElementById("upload_input").innerHTML = '<div class="progress"><div id="upload-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
    let xmlHttpRequest = new XMLHttpRequest();
    let token = getCookie("_xsrf")
    let fileName = file.name
@ -361,6 +361,15 @@
    let size = file.size
    let type = 'background'

+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar`).css('width', percent + '%');
+        $(`#upload-progress-bar`).html(percent + '%');
+      }
+    });
+
    xmlHttpRequest.open('POST', target, true);
    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
@ -377,7 +386,15 @@
        }, 2000);
      }
      else {
-        alert('Upload failed with response: ' + event.target.responseText);
+        let response_text = JSON.parse(event.target.responseText);
+        var x = document.querySelector('.bootbox');
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
        doUpload = false;
      }
    }, false);
--- a/app/frontend/templates/panel/parts/crafty_config_list.html
+++ b/app/frontend/templates/panel/parts/crafty_config_list.html
@ -1,14 +1,17 @@
 <ul class="nav nav-tabs col-md-12 tab-simple-styled" role="tablist" style="margin-top: 0;">
    <li class="nav-item term-nav-item">
-        <a class="nav-link {% if data['active_link'] == 'panel_config' %}active{% end %}" href="/panel/panel_config" role="tab" aria-selected="false">
-            <i class="fas fa-file-signature"></i>Panel Config</a>
+        <a class="nav-link {% if data['active_link'] == 'panel_config' %}active{% end %}" href="/panel/panel_config"
+            role="tab" aria-selected="false">
+            <i class="fa-solid fa-wrench"></i>{{ translate('panelConfig', 'pageTitle', data['lang']) }}</a>
    </li>
    <li class="nav-item term-nav-item">
-        <a class="nav-link {% if data['active_link'] == 'config_json' %}active{% end %}" href="/panel/config_json" role="tab" aria-selected="false">
-            <i class="fas fa-file-signature"></i>Config.json</a>
+        <a class="nav-link {% if data['active_link'] == 'config_json' %}active{% end %}" href="/panel/config_json"
+            role="tab" aria-selected="false">
+            <i class="fa-solid fa-code"></i>{{ translate('panelConfig', 'json', data['lang']) }}</a>
    </li>
    <li class="nav-item term-nav-item">
-        <a class="nav-link {% if data['active_link'] == 'custom_login' %}active{% end %}" href="/panel/custom_login" role="tab" aria-selected="false">
-            <i class="fas fa-file-signature"></i>Custom Login</a>
+        <a class="nav-link {% if data['active_link'] == 'custom_login' %}active{% end %}" href="/panel/custom_login"
+            role="tab" aria-selected="false">
+            <i class="fa fa-palette"></i>{{ translate('panelConfig', 'custom', data['lang']) }}</a>
    </li>
 </ul>
--- a/app/frontend/templates/panel/parts/m_server_controls_list.html
+++ b/app/frontend/templates/panel/parts/m_server_controls_list.html
@ -5,11 +5,11 @@
        </button>
        <div class="dropdown-menu col-md-12" aria-labelledby="dropdownMenuButton">
            {% if data['permissions']['Terminal'] in data['user_permissions'] %}
-            <a class="dropdown-item {% if data['active_link'] == 'term' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=term" role="tab" aria-selected="false"><i class="fas fa-file-signature"></i> {{ translate('serverDetails', 'terminal', data['lang']) }}</a>
+            <a class="dropdown-item {% if data['active_link'] == 'term' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=term" role="tab" aria-selected="false"><i class="fa-solid fa-terminal"></i> {{ translate('serverDetails', 'terminal', data['lang']) }}</a>
            {% end %}
            <!--Bedrock servers don't have logs so we'll only show it if we know it's not a bedrock server.-->
            {% if data['permissions']['Logs'] in data['user_permissions'] and data['server_data']['type'] != 'minecraft-bedrock'%}
-            <a class="dropdown-item {% if data['active_link'] == 'logs' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=logs" role="tab" aria-selected="false"><i class="fas fa-file-signature"></i> {{ translate('serverDetails', 'logs', data['lang']) }}</a>
+            <a class="dropdown-item {% if data['active_link'] == 'logs' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=logs" role="tab" aria-selected="false"><i class="fa-solid fa-book-open-reader"></i> {{ translate('serverDetails', 'logs', data['lang']) }}</a>
            {% end %}
            {% if data['permissions']['Schedule'] in data['user_permissions'] %}
            <a class="dropdown-item {% if data['active_link'] == 'schedules' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=schedules" role="tab" aria-selected="false"><i class="fas fa-clock"></i> {{ translate('serverDetails', 'schedule', data['lang']) }}</a>
@ -30,7 +30,7 @@
            {% if data['permissions']['Players'] in data['user_permissions'] and data['server_data']['type'] != 'minecraft-bedrock' %}
            <a class="dropdown-item {% if data['active_link'] == 'admin_controls' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=admin_controls" role="tab" aria-selected="true"><i class="fas fa-users"></i> {{ translate('serverDetails', 'playerControls', data['lang']) }}</a>
            {% end %}
-            <a class="dropdown-item {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true"><i class='fas fa-chart-area'></i>{{ translate('serverDetails', 'metrics', data['lang']) }}</a>
+            <a class="dropdown-item {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true"><i class="fa-solid fa-chart-line"></i> {{ translate('serverDetails', 'metrics', data['lang']) }}</a>
        </div>
    </div>
 </div>
--- a/app/frontend/templates/panel/parts/server_controls_list.html
+++ b/app/frontend/templates/panel/parts/server_controls_list.html
@ -2,14 +2,14 @@
    {% if data['permissions']['Terminal'] in data['user_permissions'] %}
    <li class="nav-item term-nav-item">
        <a class="nav-link {% if data['active_link'] == 'term' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=term" role="tab" aria-selected="false">
-        <i class="fas fa-file-signature"></i>{{ translate('serverDetails', 'terminal', data['lang']) }}</a>
+        <i class="fa-solid fa-terminal"></i>{{ translate('serverDetails', 'terminal', data['lang']) }}</a>
    </li>
    {% end %}
    <!--Bedrock servers don't have logs so we'll only show it if we know it's not a bedrock server.-->
    {% if data['permissions']['Logs'] in data['user_permissions'] and data['server_data']['type'] != 'minecraft-bedrock'%}
    <li class="nav-item term-nav-item">
        <a class="nav-link {% if data['active_link'] == 'logs' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=logs" role="tab" aria-selected="false">
-        <i class="fas fa-file-signature"></i>{{ translate('serverDetails', 'logs', data['lang']) }}</a>
+        <i class="fa-solid fa-book-open-reader"></i>{{ translate('serverDetails', 'logs', data['lang']) }}</a>
    </li>
    {% end %}
    {% if data['permissions']['Schedule'] in data['user_permissions'] %}
@ -51,6 +51,6 @@
    {% end %}
    <li class="nav-item term-nav-item">
        <a class="nav-link {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true">
-        <i class='fas fa-chart-area'></i>{{ translate('serverDetails', 'metrics', data['lang']) }}</a>
+            <i class="fa-solid fa-chart-line"></i>{{ translate('serverDetails', 'metrics', data['lang']) }}</a>
    </li>
 </ul>
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@ -110,15 +110,15 @@
                <div class="form-group">
                  <label for="command-check" class="form-check-label ml-4 mb-4"></label>
                  {% if data['backup_config']['before'] %}
-                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check" checked>Run
-                  Command Before Backup
+                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check" checked>{{
+                  translate('serverBackups', 'before', data['lang']) }}
                  <br>
                  <input type="text" class="form-control" name="backup_before" id="backup_before"
                    value="{{ data['backup_config']['before'] }}" placeholder="We enter the / for you"
                    style="display: inline-block;">
                  {% else %}
-                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check">Run Command
-                  Before Backup
+                  <input type="checkbox" class="form-check-input" id="before-check" name="before-check">{{
+                  translate('serverBackups', 'before', data['lang']) }}
                  <br>
                  <input type="text" class="form-control" name="backup_before" id="backup_before" value=""
                    placeholder="We enter the / for you." style="display: none;">
@ -127,15 +127,15 @@
                <div class="form-group">
                  <label for="command-check" class="form-check-label ml-4 mb-4"></label>
                  {% if data['backup_config']['after'] %}
-                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check" checked>Run
-                  Command After Backup
+                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check" checked>{{
+                  translate('serverBackups', 'after', data['lang']) }}
                  <br>
                  <input type="text" class="form-control" name="backup_after" id="backup_after"
                    value="{{ data['backup_config']['after'] }}" placeholder="We enter the / for you"
                    style="display: inline-block;">
                  {% else %}
-                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check">Run Command
-                  Before Backup
+                  <input type="checkbox" class="form-check-input" id="after-check" name="after-check">{{
+                  translate('serverBackups', 'after', data['lang']) }}
                  <br>
                  <input type="text" class="form-control" name="backup_after" id="backup_after" value=""
                    placeholder="We enter the / for you." style="display: none;">
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@ -184,6 +184,15 @@
                      value="{{ data['server_stats']['server_id']['shutdown_timeout']  }}" step="2" max="300" min="60"
                      required>
                  </div>
+                  <div class="form-group">
+                    <label for="ignored_exits">{{ translate('serverConfig', 'ignoredExits', data['lang']) }}
+                      <small class="text-muted ml-1"> - {{ translate('serverConfig', 'ignoredExitsExplain',
+                        data['lang'])
+                        }}
+                      </small> </label>
+                    <input type="text" class="form-control" name="ignored_exits" id="ignored_exits"
+                      value="{{ data['server_stats']['server_id']['ignored_exits']  }}">
+                  </div>

                  <div class="form-group">
                    <label for="logs_delete_after">{{ translate('serverConfig', 'removeOldLogsAfter', data['lang']) }}
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@ -705,6 +705,15 @@
    let mimeType = file.type
    let size = file.size

+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar-${i + 1}`).css('width', percent + '%');
+        $(`#upload-progress-bar-${i + 1}`).html(percent + '%');
+      }
+    });
+
    xmlHttpRequest.open('POST', target, true);
    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
@ -721,10 +730,19 @@
      if (event.target.responseText == 'success') {
        console.log('Upload for file', file.name, 'was successful!');
        let caught = false;
+        try {
+          if (document.getElementById(path).classList.contains("clicked")) {
+            var expanded = true;
+          }
+        } catch {
+          var expanded = false;
+        }
+
        try {
          var par_el = document.getElementById(path + "ul");
          var items = par_el.children;
-        } catch {
+        } catch (err) {
+          console.log(err)
          caught = true;
          var par_el = document.getElementById("files-tree");
          var items = par_el.children;
@ -739,9 +757,9 @@
          }
        }
        if (!flag) {
-          if (caught) {
+          if (caught && expanded == false) {
            $(par_el).append('<li id=' + '"' + full_path.toString() + 'li' + '"' + 'class="d-block tree-ctx-item tree-file tree-item" data-path=' + '"' + full_path.toString() + '"' + ' data-name=' + '"' + name.toString() + '"' + ' onclick="clickOnFile(event)" ><span style="margin-right: 6px;"><i class="far fa-file"></i></span>' + name + '</li>');
-          } else {
+          } else if (expanded == true) {
            $(par_el).append('<li id=' + '"' + full_path.toString() + 'li' + '"' + 'class="tree-ctx-item tree-file tree-item" data-path=' + '"' + full_path.toString() + '"' + ' data-name=' + '"' + name.toString() + '"' + ' onclick="clickOnFile(event)" ><span style="margin-right: 6px;"><i class="far fa-file"></i></span>' + name + '</li>');
          }
          setTreeViewContext();
@ -751,7 +769,22 @@
        $(`#upload-progress-bar-${i + 1}`).html('<i style="color: black;" class="fas fa-box-check"></i>')
      }
      else {
-        alert('Upload failed with response: ' + event.target.responseText);
+        let response_text = JSON.parse(event.target.responseText);
+        var x = document.querySelector('.bootbox');
+        if (x) {
+          x.remove()
+        }
+        var x = document.querySelector('.modal-content');
+        if (x) {
+          x.remove()
+        }
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
        doUpload = false;
      }
    }, false);
@ -788,7 +821,7 @@
              var height = files.files.length * 50;

              var waitMessage = '<p class="text-center mb-0">' +
-                '<i class="fa fa-spin fa-cog"></i>' +
+                '<i class="fa fa-spin fa-cog"></i>&nbsp;' +
                "{{ translate('serverFiles', 'waitUpload', data['lang']) }}" + '<br>' +
                '<strong>' + "{{ translate('serverFiles', 'stayHere', data['lang']) }}" + '</strong>' +
                '</p>' +
@ -826,7 +859,7 @@

                await sendFile(files.files[i], path, serverId, nFiles - i - 1, i, (progress) => {
                  $(`#upload-progress-bar-${i + 1}`).attr('aria-valuenow', progress)
-                  $(`#upload-progress-bar-${i + 1}`).css('width', progress + '%')
+                  $(`#upload-progress-bar-${i + 1}`).css('width', progress + '%');
                });
              }
              hideUploadBox();
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@ -13,7 +13,7 @@
  <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css">
  <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
  <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
-  <link rel="stylesheet" href="/static/assets/vendors/fontawesome5/css/all.css">
+  <link rel="stylesheet" href="/static/assets/vendors/fontawesome6/css/all.css">
  <!-- endinject -->
  <!-- Plugin css for this page -->
  <!-- End Plugin css for this page -->
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@ -346,11 +346,12 @@

                <div class="col-sm-12">
                  <div class="form-group">
-                    <label for="server">Server Upload </label><br>
+                    <label for="server">{{ translate('serverWizard', 'serverUpload', data['lang']) }}</label><br>
                    <span id="upload_input">
                      <input type="file" multiple="false" class="form-control" id="file" name="file" required
                        style="width: 70%;">
-                      <button type="button" class="btn btn-info" onclick="sendFile()">UPLOAD</button>
+                      <button type="button" class="btn btn-info" onclick="sendFile()">{{ translate('serverWizard',
+                        'uploadButton', data['lang']) }}</button>
                    </span>
                  </div>
                </div>
@ -562,7 +563,7 @@
  var file;
  function sendFile() {
    file = $("#file")[0].files[0]
-    document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
+    document.getElementById("upload_input").innerHTML = '<div class="progress"><div id="upload-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
    let xmlHttpRequest = new XMLHttpRequest();
    let token = getCookie("_xsrf")
    let fileName = encodeURIComponent(file.name)
@ -571,6 +572,15 @@
    let size = file.size
    let type = 'server_import'

+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar`).css('width', percent + '%');
+        $(`#upload-progress-bar`).html(percent + '%');
+      }
+    });
+
    xmlHttpRequest.open('POST', target, true);
    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
@ -585,7 +595,15 @@
        document.getElementById("lower_half").style.visibility = "visible";
      }
      else {
-        alert('Upload failed with response: ' + event.target.responseText);
+        let response_text = JSON.parse(event.target.responseText);
+        var x = document.querySelector('.bootbox');
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
        doUpload = false;
      }
    }, false);
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@ -456,11 +456,12 @@

                <div class="col-sm-12">
                  <div class="form-group">
-                    <label for="server">Server Upload </label><br>
+                    <label for="server">{{ translate('serverWizard', 'serverUpload', data['lang']) }}</label><br>
                    <span id="upload_input">
                      <input type="file" multiple="false" class="form-control" id="file" name="file" required
                        style="width: 70%;">
-                      <button type="button" class="btn btn-info" onclick="sendFile()">UPLOAD</button>
+                      <button type="button" class="btn btn-info" onclick="sendFile()">{{ translate('serverWizard',
+                        'uploadButton', data['lang']) }}</button>
                    </span>
                  </div>
                </div>
@ -804,7 +805,7 @@
    var file;
    function sendFile() {
      file = $("#file")[0].files[0]
-      document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
+      document.getElementById("upload_input").innerHTML = '<div class="progress"><div id="upload-progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
      let xmlHttpRequest = new XMLHttpRequest();
      let token = getCookie("_xsrf")
      let fileName = file.name
@ -813,6 +814,15 @@
      let size = file.size
      let type = 'server_import'

+      xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+        if (e.loaded <= size) {
+          var percent = Math.round(e.loaded / size * 100);
+          $(`#upload-progress-bar`).css('width', percent + '%');
+          $(`#upload-progress-bar`).html(percent + '%');
+        }
+      });
+
      xmlHttpRequest.open('POST', target, true);
      xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
      xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
@ -827,7 +837,15 @@
          document.getElementById("lower_half").style.visibility = "visible";
        }
        else {
-          alert('Upload failed with response: ' + event.target.responseText);
+          let response_text = JSON.parse(event.target.responseText);
+          var x = document.querySelector('.bootbox');
+          console.log(JSON.parse(event.target.responseText).info)
+          bootbox.alert({
+            message: JSON.parse(event.target.responseText).info,
+            callback: function () {
+              window.location.reload();
+            }
+          });
          doUpload = false;
        }
      }, false);
--- a/app/migrations/20220223_ignored_exits.py
+++ b/app/migrations/20220223_ignored_exits.py
@ -0,0 +1,16 @@
+# Generated by database migrator
+import peewee
+
+
+def migrate(migrator, database, **kwargs):
+    migrator.add_columns("servers", ignored_exits=peewee.CharField(default="0"))
+    """
+    Write your migrations here.
+    """
+
+
+def rollback(migrator, database, **kwargs):
+    migrator.drop_columns("servers", ["ignored_exits"])
+    """
+    Write your rollback migrations here.
+    """
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@ -222,6 +222,8 @@
        "newRole": "Add New Role",
        "newUser": "Add New User",
        "pageTitle": "Panel Config",
+        "json": "Config.json",
+        "custom": "Customize Crafty",
        "role": "Role",
        "roles": "Roles",
        "roleUsers": "Role Users",
@ -297,7 +299,9 @@
        "shutdown": "Shutdown server for duration of backup",
        "size": "Size",
        "storageLocation": "Storage Location",
-        "storageLocationDesc": "Where do you want to store backups?"
+        "storageLocationDesc": "Where do you want to store backups?",
+        "before": "Run command before backup",
+        "after": "Run command after backup"
    },
    "serverConfig": {
        "bePatientDelete": "Please be patient while we remove your server from the Crafty panel. This screen will close in a few moments.",
@ -352,7 +356,9 @@
        "timeoutExplain1": "How long Crafty will wait for your server to shutdown after executing the",
        "timeoutExplain2": "command before it forces the process down.",
        "statsHint1": "The port your server is running on should go here. This is just how Crafty opens a connection to your server for stats.",
-        "statsHint2": "This does not change the port of your server. You must still change the port in your server config file."
+        "statsHint2": "This does not change the port of your server. You must still change the port in your server config file.",
+        "ignoredExits": "Ignored Crash Exit Codes",
+        "ignoredExitsExplain": "Exit codes Crafty's Crash detection should ignore as a normal 'stop' (separated by commas)"
    },
    "serverConfigHelp": {
        "desc": "Here is where you can change the configuration of your server",
@ -548,7 +554,9 @@
        "serverType": "Server Type",
        "serverSelect": "Server Select",
        "serverVersion": "Server Version",
+        "serverUpload": "Upload Zipped Server",
        "sizeInGB": "Size in GB",
+        "uploadButton": "Upload",
        "zipPath": "Server Path"
    },
    "sidebar": {