diff --git a/app/Domain/Canvas/Controllers/EditCanvasComment.php b/app/Domain/Canvas/Controllers/EditCanvasComment.php
index fe6c339a83..6e088e2dbf 100644
--- a/app/Domain/Canvas/Controllers/EditCanvasComment.php
+++ b/app/Domain/Canvas/Controllers/EditCanvasComment.php
@@ -258,6 +258,7 @@ public function post($params)
                 return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas' . '/editCanvasComment/' . $_GET['id']);
             }
 
+            $this->tpl->assign('id', $_GET['id']);
             $this->tpl->assign('canvasTypes', $this->canvasRepo->getCanvasTypes());
             $this->tpl->assign('canvasItem', $this->canvasRepo->getSingleCanvasItem($_GET['id']));
             return $this->tpl->displayPartial(static::CANVAS_NAME . 'canvas.canvasComment');
diff --git a/app/Domain/Canvas/Controllers/ShowCanvas.php b/app/Domain/Canvas/Controllers/ShowCanvas.php
index d1d8caeffc..cdb55325bc 100644
--- a/app/Domain/Canvas/Controllers/ShowCanvas.php
+++ b/app/Domain/Canvas/Controllers/ShowCanvas.php
@@ -255,6 +255,12 @@ public function run()
                 }
             }
 
+            $filter['status'] = $_GET['filter_status'] ?? (session('filter_status') ?? 'all');
+            session(['filter_status' => $filter['status']]);
+            $filter['relates'] = $_GET['filter_relates'] ?? (session('filter_relates') ?? 'all');
+            session(['filter_relates' => $filter['relates']]);
+
+            $this->tpl->assign('filter', $filter);
             $this->tpl->assign('currentCanvas', $currentCanvasId);
             $this->tpl->assign('canvasIcon', $this->canvasRepo->getIcon());
             $this->tpl->assign('canvasTypes', $this->canvasRepo->getCanvasTypes());
diff --git a/app/Domain/Goalcanvas/Controllers/Dashboard.php b/app/Domain/Goalcanvas/Controllers/Dashboard.php
index b2f70629a9..d1ba321dee 100644
--- a/app/Domain/Goalcanvas/Controllers/Dashboard.php
+++ b/app/Domain/Goalcanvas/Controllers/Dashboard.php
@@ -39,8 +39,7 @@ public function init(
         ) {
             $this->projectService = $projectService;
             $this->goalService = $goalService;
-            $canvasName = Str::studly(static::CANVAS_NAME) . 'canvas';
-            $repoName = app()->getNamespace() . "Domain\\$canvasName\\Repositories\\$canvasName";
+            $repoName = app()->getNamespace() . "Domain\\goalcanvas\\Repositories\\goalcanvas";
             $this->canvasRepo = app()->make($repoName);
         }
 
@@ -305,6 +304,12 @@ public function run()
                 }
             }
 
+            $filter['status'] = $_GET['filter_status'] ?? (session("filter_status") ?? 'all');
+            session(["filter_status" => $filter['status']]);
+            $filter['relates'] = $_GET['filter_relates'] ?? (session("filter_relates") ?? 'all');
+            session(["filter_relates" => $filter['relates']]);
+
+            $this->tpl->assign('filter', $filter);
             $this->tpl->assign('currentCanvas', $currentCanvasId);
             $this->tpl->assign('goalStats', $goalAnalytics);
             $this->tpl->assign('canvasIcon', $this->canvasRepo->getIcon());
diff --git a/app/Domain/Goalcanvas/Controllers/DelCanvas.php b/app/Domain/Goalcanvas/Controllers/DelCanvas.php
index 151d33af9c..c5aac1087c 100644
--- a/app/Domain/Goalcanvas/Controllers/DelCanvas.php
+++ b/app/Domain/Goalcanvas/Controllers/DelCanvas.php
@@ -1,16 +1,68 @@
 <?php
 
 /**
- * Controller / Delete Canvas
+ * delCanvas class - Generic canvas controller / Delete Canvas
  */
 
 namespace Leantime\Domain\Goalcanvas\Controllers {
 
+    use Leantime\Core\Controller;
+    use Leantime\Domain\Auth\Models\Roles;
+    use Leantime\Domain\Auth\Services\Auth;
+    use Illuminate\Support\Str;
+    use Leantime\Core\Frontcontroller;
+
     /**
      *
      */
-    class DelCanvas extends \Leantime\Domain\Canvas\Controllers\DelCanvas
+    class DelCanvas extends Controller
     {
+        /**
+         * Constant that must be redefined
+         */
         protected const CANVAS_NAME = 'goal';
+
+        private mixed $canvasRepo;
+
+        /**
+         * init - initialize private variables
+         */
+        public function init()
+        {
+            $repoName = app()->getNamespace() . "Domain\\goalcanvas\\Repositories\\goalcanvas";
+            $this->canvasRepo = app()->make($repoName);
+        }
+
+        /**
+         * run - display template and edit data
+         *
+         * @access public
+         */
+        public function run()
+        {
+
+            Auth::authOrRedirect([Roles::$owner, Roles::$admin, Roles::$manager, Roles::$editor]);
+
+            if (isset($_POST['del']) && isset($_GET['id'])) {
+                $id = (int)($_GET['id']);
+                $this->canvasRepo->deleteCanvas($id);
+
+                $allCanvas = $this->canvasRepo->getAllCanvas(session("currentProject"));
+                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $allCanvas[0]['id'] ?? -1]);
+
+                $this->tpl->setNotification($this->language->__('notification.board_deleted'), 'success', strtoupper(static::CANVAS_NAME) . 'canvas_deleted');
+
+                $allCanvas = $this->canvasRepo->getAllCanvas(session("currentProject"));
+
+                //Create default canvas.
+                if (!$allCanvas || count($allCanvas) == 0) {
+                    return Frontcontroller::redirect(BASE_URL . '/strategy/showBoards');
+                } else {
+                    return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas');
+                }
+            }
+
+            return $this->tpl->displayPartial(static::CANVAS_NAME . 'canvas.delCanvas');
+        }
     }
 }
diff --git a/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php b/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php
index 81e5e8b9c0..b1a56ca705 100644
--- a/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php
+++ b/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php
@@ -1,17 +1,56 @@
 <?php
 
 /**
- * Controller / Delete Canvas Item
+ * delCanvasItem class - Generic canvas controller / Delete Canvas Item
  */
 
 namespace Leantime\Domain\Goalcanvas\Controllers {
 
+    use Leantime\Core\Controller;
+    use Leantime\Domain\Auth\Models\Roles;
+    use Leantime\Domain\Auth\Services\Auth;
+    use Illuminate\Support\Str;
+    use Leantime\Core\Frontcontroller;
+
     /**
      *
      */
-    class DelCanvasItem extends \Leantime\Domain\Canvas\Controllers\DelCanvasItem
+    class DelCanvasItem extends Controller
     {
+        /**
+         * Constant that must be redefined
+         */
         protected const CANVAS_NAME = 'goal';
-    }
 
+        private mixed $canvasRepo;
+
+        /**
+         * init - initialize private variables
+         */
+        public function init()
+        {
+            $repoName = app()->getNamespace() . "Domain\\goalcanvas\\Repositories\\goalcanvas";
+            $this->canvasRepo = app()->make($repoName);
+        }
+
+        /**
+         * run - display template and edit data
+         *
+         * @access public
+         */
+        public function run()
+        {
+            Auth::authOrRedirect([Roles::$owner, Roles::$admin, Roles::$manager, Roles::$editor]);
+
+            if (isset($_POST['del']) && isset($_GET['id'])) {
+                $id = (int)($_GET['id']);
+                $this->canvasRepo->delCanvasItem($id);
+
+                $this->tpl->setNotification($this->language->__('notification.element_deleted'), 'success', strtoupper(static::CANVAS_NAME) . 'canvasitem_deleted');
+                return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas');
+            }
+
+            return $this->tpl->displayPartial(static::CANVAS_NAME . 'canvas.delCanvasItem');
+        }
+    }
 }
diff --git a/app/Domain/Goalcanvas/Controllers/EditCanvasComment.php b/app/Domain/Goalcanvas/Controllers/EditCanvasComment.php
index 54e4f61917..18826e22e0 100644
--- a/app/Domain/Goalcanvas/Controllers/EditCanvasComment.php
+++ b/app/Domain/Goalcanvas/Controllers/EditCanvasComment.php
@@ -1,17 +1,285 @@
 <?php
 
 /**
- * Controller / Edit Comments
+ * editCanvasComment class - Generic canvas controller / Edit Comments
  */
 
 namespace Leantime\Domain\Goalcanvas\Controllers {
 
+    use Leantime\Core\Controller;
+    use Leantime\Domain\Tickets\Repositories\Tickets as TicketRepository;
+    use Leantime\Domain\Comments\Repositories\Comments as CommentRepository;
+    use Leantime\Domain\Sprints\Services\Sprints as SprintService;
+    use Leantime\Domain\Tickets\Services\Tickets as TicketService;
+    use Leantime\Domain\Projects\Services\Projects as ProjectService;
+    use Leantime\Domain\Notifications\Models\Notification as NotificationModel;
+    use Illuminate\Support\Str;
+    use Leantime\Core\Frontcontroller;
+
     /**
      *
      */
-    class EditCanvasComment extends \Leantime\Domain\Canvas\Controllers\EditCanvasComment
+    class EditCanvasComment extends Controller
     {
+        /**
+         * Constant that must be redefined
+         */
         protected const CANVAS_NAME = 'goal';
-    }
 
+        private TicketRepository $ticketRepo;
+        private CommentRepository $commentsRepo;
+        private SprintService $sprintService;
+        private TicketService $ticketService;
+        private ProjectService $projectService;
+        private object $canvasRepo;
+
+        /**
+         * init - initialize private variables
+         *
+         * @access public
+         *
+         */
+        public function init(
+            TicketRepository $ticketRepo,
+            CommentRepository $commentsRepo,
+            SprintService $sprintService,
+            TicketService $ticketService,
+            ProjectService $projectService
+        ) {
+            $this->ticketRepo = $ticketRepo;
+            $this->commentsRepo = $commentsRepo;
+            $this->sprintService = $sprintService;
+            $this->ticketService = $ticketService;
+            $this->projectService = $projectService;
+
+            $repoName = app()->getNamespace() . "Domain\\goalcanvas\\Repositories\\goalcanvas";
+            $this->canvasRepo = app()->make($repoName);
+        }
+
+        /**
+         * get - handle get requests
+         *
+         * @access public
+         *
+         */
+        public function get($params)
+        {
+
+            $canvasTypes = $this->canvasRepo->getCanvasTypes();
+            if (isset($params['id'])) {
+                // Delete comment
+                if (isset($params['delComment']) === true) {
+                    $commentId = (int)($params['delComment']);
+                    $this->commentsRepo->deleteComment($commentId);
+                    $this->tpl->setNotification($this->language->__('notifications.comment_deleted'), 'success', strtoupper(static::CANVAS_NAME) . 'canvascomment_deleted');
+                }
+
+                $canvasItem = $this->canvasRepo->getSingleCanvasItem($params['id']);
+
+                $comments = $this->commentsRepo->getComments(static::CANVAS_NAME . 'canvasitem', $canvasItem['id']);
+                $this->tpl->assign('numComments', $this->commentsRepo->countComments(static::CANVAS_NAME . 'canvasitem', $canvasItem['id']));
+            } else {
+                if (isset($params['type'])) {
+                    $type = strip_tags($params['type']);
+                } else {
+                    $type = array_key_first($canvasTypes);
+                }
+
+                $canvasItem = array(
+                    'id' => '',
+                    'box' => $type,
+                    'description' => '',
+                    'status' => array_key_first($this->canvasRepo->getStatusList()),
+                    'relates' => array_key_first($this->canvasRepo->GetRelatesList()),
+                    'assumptions' => '',
+                    'data' => '',
+                    'conclusion' => '',
+                    'milestoneHeadline' => '',
+                    'milestoneId' => '',
+                );
+
+                $comments = [];
+            }
+
+            $this->tpl->assign('comments', $comments);
+
+            $this->tpl->assign('canvasTypes', $canvasTypes);
+            $this->tpl->assign('canvasItem', $canvasItem);
+            return $this->tpl->displayPartial(static::CANVAS_NAME . 'canvas.canvasComment');
+        }
+
+        /**
+         * post - handle post requests
+         *
+         * @access public
+         *
+         */
+        public function post($params)
+        {
+
+            if (isset($params['changeItem'])) {
+                if (isset($params['itemId']) && $params['itemId'] != '') {
+                    if (isset($params['description']) && !empty($params['description'])) {
+                        $currentCanvasId = (int)session("current" . strtoupper(static::CANVAS_NAME) . "Canvas");
+
+                        $canvasItem = array(
+                            'box' => $params['box'],
+                            'author' => session("userdata.id"),
+                            'description' => $params['description'],
+                            'status' => $params['status'],
+                            'relates' => $params['relates'],
+                            'assumptions' => $params['assumptions'],
+                            'data' => $params['data'],
+                            'conclusion' => $params['conclusion'],
+                            'itemId' => $params['itemId'],
+                            'id' => $params['itemId'],
+                            'canvasId' => $currentCanvasId,
+                            'milestoneId' => $params['milestoneId'],
+                            'dependentMilstone' => '',
+                        );
+
+                        $this->canvasRepo->editCanvasComment($canvasItem);
+
+                        $comments = $this->commentsRepo->getComments(static::CANVAS_NAME . 'canvasitem', $params['itemId']);
+                        $this->tpl->assign('numComments', $this->commentsRepo->countComments(
+                            static::CANVAS_NAME . 'canvasitem',
+                            $params['itemId']
+                        ));
+                        $this->tpl->assign('comments', $comments);
+
+                        $this->tpl->setNotification($this->language->__('notifications.canvas_item_updates'), 'success', strtoupper(static::CANVAS_NAME) . 'canvasitem_updated');
+
+
+                        $notification = app()->make(NotificationModel::class);
+                        $notification->url = array(
+                            "url" => BASE_URL . '/' . static::CANVAS_NAME . 'canvas' . '/editCanvasComment/' . (int)$params['itemId'],
+                            "text" => $this->language->__('email_notifications.canvas_item_update_cta'),
+                        );
+                        $notification->entity = $canvasItem;
+                        $notification->module = static::CANVAS_NAME . 'canvas';
+                        $notification->projectId = session("currentProject");
+                        $notification->subject = $this->language->__('email_notifications.canvas_board_edited');
+                        $notification->authorId = session("userdata.id");
+                        $notification->message = sprintf(
+                            $this->language->__('email_notifications.canvas_item_update_message'),
+                            session("userdata.name"),
+                            $canvasItem['description']
+                        );
+
+                        $this->projectService->notifyProjectUsers($notification);
+
+                        return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas' . '/editCanvasComment/' . $params['itemId']);
+                    } else {
+                        $this->tpl->setNotification($this->language->__('notification.please_enter_element_title'), 'error');
+                    }
+                } else {
+                    if (isset($_POST['description']) && !empty($_POST['description'])) {
+                        $currentCanvasId = (int)session("current" . strtoupper(static::CANVAS_NAME) . "Canvas");
+
+                        $canvasItem = array(
+                            'box' => $params['box'],
+                            'author' => session("userdata.id"),
+                            'description' => $params['description'],
+                            'status' => $params['status'],
+                            'relates' => $params['relates'],
+                            'assumptions' => $params['assumptions'],
+                            'data' => $params['data'],
+                            'conclusion' => $params['conclusion'],
+                            'canvasId' => $currentCanvasId,
+                        );
+
+                        $id = $this->canvasRepo->addCanvasItem($canvasItem);
+
+                        $canvasItem['id'] = $id;
+
+                        $canvasTypes = $this->canvasRepo->getCanvasTypes();
+
+                        $this->tpl->setNotification($canvasTypes[$params['box']] . ' successfully created', 'success', strtoupper(static::CANVAS_NAME) . 'canvasitem_created');
+
+
+                        $notification = app()->make(NotificationModel::class);
+                        $notification->url = array(
+                            "url" => BASE_URL . '/' . static::CANVAS_NAME . 'canvas' . '/editCanvasComment/' . (int)$params['itemId'],
+                            "text" => $this->language->__('email_notifications.canvas_item_update_cta'),
+                        );
+                        $notification->entity = $canvasItem;
+                        $notification->module = static::CANVAS_NAME . 'canvas';
+                        $notification->projectId = session("currentProject");
+                        $notification->subject = $this->language->__('email_notifications.canvas_board_item_created');
+                        $notification->authorId = session("userdata.id");
+                        $notification->message = sprintf(
+                            $this->language->__('email_notifications.canvas_item_created_message'),
+                            session("userdata.name"),
+                            $canvasItem['description']
+                        );
+
+                        $this->projectService->notifyProjectUsers($notification);
+
+                        $this->tpl->setNotification($this->language->__('notification.element_created'), 'success', strtoupper(static::CANVAS_NAME) . 'canvasitem_created');
+
+                        return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas' . '/editCanvasComment/' . $id);
+                    } else {
+                        $this->tpl->setNotification($this->language->__('notification.please_enter_element_title'), 'error');
+                    }
+                }
+            }
+
+            if (isset($params['comment']) === true) {
+                $values = array(
+                    'text' => $params['text'],
+                    'date' => date('Y-m-d H:i:s'),
+                    'userId' => (session("userdata.id")),
+                    'moduleId' => $_GET['id'],
+                    'commentParent' => ($params['father']),
+                );
+
+                $message = $this->commentsRepo->addComment($values, static::CANVAS_NAME . 'canvasitem');
+                $this->tpl->setNotification($this->language->__('notifications.comment_create_success'), 'success', strtoupper(static::CANVAS_NAME) . 'canvasitemcomment_created');
+
+                $notification = app()->make(NotificationModel::class);
+                $notification->url = array(
+                    "url" => BASE_URL . '/' . static::CANVAS_NAME . 'canvas' . '/editCanvasComment/' . (int)$_GET['id'],
+                    "text" => $this->language->__('email_notifications.canvas_item_update_cta'),
+                );
+                $notification->entity = $values;
+                $notification->module = static::CANVAS_NAME . 'canvas';
+                $notification->projectId = session("currentProject");
+                $notification->subject = $this->language->__('email_notifications.canvas_board_comment_created');
+                $notification->authorId = session("userdata.id");
+                $notification->message = sprintf(
+                    $this->language->__('email_notifications.canvas_item__comment_created_message'),
+                    session("userdata.name")
+                );
+
+                $this->projectService->notifyProjectUsers($notification);
+
+
+                return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas' . '/editCanvasComment/' . $_GET['id']);
+            }
+
+            $this->tpl->assign('canvasTypes', $this->canvasRepo->getCanvasTypes());
+            $this->tpl->assign('canvasItem', $this->canvasRepo->getSingleCanvasItem($_GET['id']));
+            return $this->tpl->displayPartial(static::CANVAS_NAME . 'canvas.canvasComment');
+        }
+
+        /**
+         * put - handle put requests
+         *
+         * @access public
+         *
+         */
+        public function put($params)
+        {
+        }
+
+        /**
+         * delete - handle delete requests
+         *
+         * @access public
+         *
+         */
+        public function delete($params)
+        {
+        }
+    }
 }
diff --git a/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php b/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php
index bff0b2bc8c..5c59614114 100644
--- a/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php
+++ b/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php
@@ -116,6 +116,8 @@ public function get($params): Response
                 $comments = [];
             }
 
+            $this->tpl->assign('id', $canvasItem['id']??"");
+            $this->tpl->assign('canvasId', $canvasItem['canvasId']);
             $this->tpl->assign('comments', $comments);
 
 
@@ -123,6 +125,7 @@ public function get($params): Response
             $allProjectMilestones = $this->ticketService->getAllMilestones(["sprint" => '', "type" => "milestone", "currentProject" => session("currentProject")]);
             $this->tpl->assign('milestones', $allProjectMilestones);
 
+
             $this->tpl->assign('currentCanvas', $canvasItem['canvasId']);
             $this->tpl->assign('canvasItem', $canvasItem);
             $this->tpl->assign('canvasIcon', $this->canvasRepo->getIcon());
@@ -283,8 +286,7 @@ public function post($params): Response
                             'metricType' =>  $params['metricType'],
                             'assignedTo' => $params['assignedTo'] ?? '',
                         );
-
-                        $id = $this->canvasRepo->addCanvasItem($canvasItem);
+                        $id = $this->canvasRepo->addCanvasItem($canvasItem);                        
                         $canvasTypes = $this->canvasRepo->getCanvasTypes();
 
                         $this->tpl->setNotification($canvasTypes[$params['box']]['title'] . ' successfully created', 'success', "goal_item_created");
diff --git a/app/Domain/Goalcanvas/Controllers/ShowCanvas.php b/app/Domain/Goalcanvas/Controllers/ShowCanvas.php
index 5fda1347a2..8ab9fa51df 100644
--- a/app/Domain/Goalcanvas/Controllers/ShowCanvas.php
+++ b/app/Domain/Goalcanvas/Controllers/ShowCanvas.php
@@ -36,8 +36,7 @@ public function init(Projects $projectService, Goalcanvas $goalService)
         {
             $this->projectService = $projectService;
             $this->goalService = $goalService;
-            $canvasName = Str::studly(static::CANVAS_NAME) . 'canvas';
-            $repoName = app()->getNamespace() . "Domain\\$canvasName\\Repositories\\$canvasName";
+            $repoName = app()->getNamespace() . "Domain\\goalcanvas\\Repositories\\goalcanvas";
             $this->canvasRepo = app()->make($repoName);
         }
 
diff --git a/app/Domain/Goalcanvas/Templates/bigRockDialog.blade.php b/app/Domain/Goalcanvas/Templates/bigRockDialog.blade.php
index 8dd5e8618e..1388cf0b08 100644
--- a/app/Domain/Goalcanvas/Templates/bigRockDialog.blade.php
+++ b/app/Domain/Goalcanvas/Templates/bigRockDialog.blade.php
@@ -1,19 +1,19 @@
 <h4 class="widgettitle title-light">
     <i class="fa-solid fa-mountain"></i>
-    {{ empty($bigRock["title"]) ? __('label.create_new_goalboard') : __('label.goalboard') }} {{  $bigRock["title"] }}</h4>
+    {{ empty($bigRock['title']) ? __('label.create_new_goalboard') : __('label.goalboard') }} {{ $bigRock['title'] }}
+</h4>
 
-{!!  $tpl->displayNotification();  !!}
-
-<form class="formModal" method="post" action="{{ BASE_URL }}/goalcanvas/bigRock/{{ !empty($bigRock['id']) ? $bigRock['id'] : '' }}">
+<form class="formModal" method="post"
+    action="{{ BASE_URL }}/goalcanvas/bigRock/{{ !empty($bigRock['id']) ? $bigRock['id'] : '' }}">
 
     <br />
     <label>{{ __('label.goal_description') }}</label>
-    <input type="text" name="title" id="wikiTitle" value="{{ $bigRock['title']}}" style="width:100%;"/><br />
+    <input type="text" name="title" id="wikiTitle" value="{{ $bigRock['title'] }}" style="width:100%;" /><br />
 
     <br />
     <div class="row">
         <div class="col-md-6">
-            <input type="submit" value="{{ __('buttons.save') }}" id="saveBtn"/>
+            <input type="submit" value="{{ __('buttons.save') }}" id="saveBtn" />
         </div>
         <div class="col-md-6 align-right padding-top-sm">
 
@@ -23,26 +23,25 @@
 </form>
 
 <script>
-    jQuery(document).ready(function(){
+    jQuery(document).ready(function() {
 
         @if (isset($_GET['closeModal']))
             jQuery.nmTop().close();
         @endif
 
-       if(jQuery("#wikiTitle").val().length >= 2) {
-           jQuery("#saveBtn").removeAttr("disabled");
-       }else{
-           jQuery("#saveBtn").attr("disabled", "disabled");
-       }
+        if (jQuery("#wikiTitle").val().length >= 2) {
+            jQuery("#saveBtn").removeAttr("disabled");
+        } else {
+            jQuery("#saveBtn").attr("disabled", "disabled");
+        }
 
-        jQuery("#wikiTitle").keypress(function(){
+        jQuery("#wikiTitle").keypress(function() {
 
-            if(jQuery("#wikiTitle").val().length >= 2) {
+            if (jQuery("#wikiTitle").val().length >= 2) {
                 jQuery("#saveBtn").removeAttr("disabled");
-            }else{
+            } else {
                 jQuery("#saveBtn").attr("disabled", "disabled");
             }
         })
     });
 </script>
-
diff --git a/app/Domain/Goalcanvas/Templates/canvasComment.blade.php b/app/Domain/Goalcanvas/Templates/canvasComment.blade.php
new file mode 100644
index 0000000000..013455dc03
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/canvasComment.blade.php
@@ -0,0 +1,65 @@
+@extends($layout)
+@section('content')
+
+@php
+
+/**
+* canvasComment.inc template - Generic template for comments
+*
+*/
+
+
+
+@endphp
+
+<script type="text/javascript">
+    window.onload = function() {
+        if (!window.jQuery) {
+            //It's not a modal
+            location.href = "{{ BASE_URL }} /goalcanvas/showCanvas?showModal={{ $canvasItem['id'] }}";
+        }
+    }
+</script>
+
+<div class="showDialogOnLoad" style="display:none;">
+
+    <h4 class="widgettitle title-light" style="padding-bottom: 0">
+        <i class="fas {{ $canvasTypes[$canvasItem['box']]['icon'] }}"></i>
+        {{ $canvasTypes[$canvasItem['box']]['title'] }}
+    </h4>
+    <hr style="margin-top: 5px; margin-bottom: 15px;">
+
+    <h5 style="padding-left: 40px"><strong>{{ $canvasItem['description'] }}</strong></h5>
+
+    @if ($id !== '')
+    <br />
+    <input type="hidden" name="comment" value="1" />
+    <h4 class="widgettitle title-light">
+        <span class="fa fa-comments"></span>{{ __('subtitles.discussion') }}
+    </h4>
+    @php
+    $tpl->assign("formUrl", "/goalcanvas/editCanvasComment/" . $id . "");
+    $tpl->displaySubmodule('comments-generalComment');
+    @endphp
+    @endif
+</div>
+
+
+<script type="text/javascript">
+    jQuery(document).ready(function() {
+
+        leantime.editorController.initSimpleEditor();
+
+        @if(!$login::userIsAtLeast($roles::$editor))
+            leantime.authController.makeInputReadonly(".nyroModalCont");
+
+        @endif;
+
+        @if($login::userHasRole([$roles::$commenter]))
+            leantime.commentsController.enableCommenterForms();
+        @endif;
+
+    })
+</script>
+
+@endsection
diff --git a/app/Domain/Goalcanvas/Templates/canvasComment.tpl.php b/app/Domain/Goalcanvas/Templates/canvasComment.tpl.php
deleted file mode 100644
index de9180cf57..0000000000
--- a/app/Domain/Goalcanvas/Templates/canvasComment.tpl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Comments
- */
-
-foreach ($__data as $var => $val) {
-    $$var = $val; // necessary for blade refactor
-}
-echo $tpl->viewFactory->make(
-    $tpl->getTemplatePath('canvas', 'canvasComment'),
-    array_merge($__data, ['canvasName' => 'goal'])
-)->render();
diff --git a/app/Domain/Goalcanvas/Templates/canvasDialog.blade.php b/app/Domain/Goalcanvas/Templates/canvasDialog.blade.php
new file mode 100644
index 0000000000..4409efab0f
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/canvasDialog.blade.php
@@ -0,0 +1,167 @@
+@extends($layout)
+@section('content')
+    <script type="text/javascript">
+        window.onload = function() {
+            if (!window.jQuery) {
+                //It's not a modal
+                location.href = "{{ BASE_URL }}/goalcanvas/showCanvas?showModal={{ $canvasItem['id'] }}";
+            }
+        }
+    </script>
+
+    <div style="width:1000px">
+
+        <h1><i class="fas {{ $canvasTypes[$canvasItem['box']]['icon'] }}"></i>
+            {{ $canvasTypes[$canvasItem['box']]['title'] }}</h1>
+
+
+        <form class="formModal" method="post" action="{{ BASE_URL . "/goalcanvas/editCanvasItem/$id" }}">
+
+            <input type="hidden" value="{{ $currentCanvas }}" name="canvasId">
+            <input type="hidden" value="{{ $canvasItem['box'] }}" name="box" id="box">
+            <input type="hidden" value="{{ $id }}" name="itemId" id="itemId">
+            <input type="hidden" name="milestoneId" value="{{ $canvasItem['milestoneId'] ?? '' }}">
+            <input type="hidden" name="changeItem" value="1">
+
+            <div class="col-md-8">
+                <label>{{ __('label.what_is_your_goal') }}</label>
+                <input type="text" name="title" value="{{ $canvasItem['title'] }}" style="width:100%"><br>
+
+                @if (!empty($relatesLabels))
+                    <label>{{ __('label.relates') }}</label>
+                    <select name="relates" style="width: 50%" id="relatesCanvas">
+                    </select><br>
+                @else
+                    <input type="hidden" name="relates"
+                        value="{{ $canvasItem['relates'] ?? array_key_first($hiddenRelatesLabels) }}">
+                @endif
+                <br>
+                <h4 class="widgettitle title-light" style="margin-bottom:0px;"><i class="fa-solid fa-ranking-star"></i>
+                    {{ __('Metrics') }}</h4>
+
+                @dispatchEvent('beforeMeasureGoalContainer', $canvasItem)
+                <div id="measureGoalContainer">
+                    <label>{{ __('text.what_metric_will_you_be_using') }}</label>
+                    <input type="text" name="description" value="{{ $canvasItem['description'] }}"
+                        style="width:100%"><br>
+                </div>
+
+                <div class="row">
+                    <div class="col-md-3">
+                        <label>{{ __('label.starting_value') }}</label>
+                        <input type="number" step="0.01" name="startValue" value="{{ $canvasItem['startValue'] }}"
+                            style="width:105px">
+                    </div>
+                    <div class="col-md-3">
+                        <label>{{ __('label.current_value') }}</label>
+                        <input type="number" step="0.01" name="currentValue" id="currentValueField"
+                            value="{{ $canvasItem['currentValue'] }}"
+                            @if ($canvasItem['setting'] == 'linkAndReport') readonly data-tippy-content="Current value calculated from child goals" @endif
+                            style="width:105px">
+                    </div>
+                    <div class="col-md-3">
+                        <label>{{ __('label.goal_value') }}</label>
+                        <input type="number" step="0.01" name="endValue" value="{{ $canvasItem['endValue'] }}"
+                            style="width:105px">
+                    </div>
+                    <div class="col-md-3">
+                        <label>{{ __('label.type') }}</label>
+                        <select name="metricType">
+                            <option value="number" @if ($canvasItem['metricType'] == 'number') selected @endif>
+                                {{ __('label.number') }}</option>
+                            <option value="percent" @if ($canvasItem['metricType'] == 'percent') selected @endif>
+                                {{ __('label.percent') }}</option>
+                            <option value="currency" @if ($canvasItem['metricType'] == 'currency') selected @endif>
+                                {{ __('language.currency') }}</option>
+                        </select>
+                    </div>
+                </div>
+
+                <br>
+                @if ($login::userIsAtLeast($roles::$editor))
+                    <input type="submit" value="{{ __('buttons.save') }}" id="primaryCanvasSubmitButton">
+                    <button type="submit" class="btn btn-primary" id="saveAndClose" value="closeModal"
+                        onclick="leantime.goalCanvasController.setCloseModal();">{{ __('buttons.save_and_close') }}</button>
+                @endif
+
+                @if ($id !== '')
+                    <br /><br /><br />
+                    <input type="hidden" name="comment" value="1" />
+                    <h4 class="widgettitle title-light"><span
+                            class="fa fa-comments"></span>{{ $tpl->__('subtitles.discussion') }}</h4>
+                    @php
+                        $tpl->assign('formUrl', '/goalcanvas/editCanvasItem/' . $id . '');
+                        $tpl->displaySubmodule('comments-generalComment');
+                    @endphp
+                @endif
+            </div>
+
+            @if ($id != '')
+                <a href="{{ BASE_URL . "goalcanvas/delCanvasItem/$id" }}" class="formModal delete right">
+                    <i class='fa fa-trash-can'></i> {{ __('links.delete') }}
+                </a>
+            @endif
+
+        </form>
+
+
+    </div>
+
+    <script type="text/javascript">
+        jQuery(document).ready(function() {
+
+            leantime.dateController.initDateRangePicker(".startDate", ".endDate");
+
+            @if (!empty($statusLabels))
+                new SlimSelect({
+                    select: '#statusCanvas',
+                    showSearch: false,
+                    valuesUseText: false,
+                    data: [
+                        @foreach ($statusLabels as $key => $data)
+                            @if ($data['active'])
+                                {
+                                    innerHTML: '<i class="fas fa-fw {{ $data['icon'] }}"></i>&nbsp;{{ $data['title'] }}',
+                                    text: "{{ $data['title'] }}",
+                                    value: "{{ $key }}",
+                                    selected: {{ $canvasItem['status'] == $key ? 'true' : 'false' }}
+                                },
+                            @endif
+                        @endforeach
+                    ]
+                });
+            @endif
+
+            @if (!empty($relatesLabels))
+                new SlimSelect({
+                    select: '#relatesCanvas',
+                    showSearch: false,
+                    valuesUseText: false,
+                    data: [
+                        @foreach ($relatesLabels as $key => $data)
+                            @if ($data['active'])
+                                {
+                                    innerHTML: '<i class="fas fa-fw {{ $data['icon'] }}"></i>&nbsp;{{ $data['title'] }}',
+                                    text: "{{ $data['title'] }}",
+                                    value: "{{ $key }}",
+                                    selected: {{ $canvasItem['relates'] == $key ? 'true' : 'false' }}
+                                },
+                            @endif
+                        @endforeach
+                    ]
+                });
+            @endif
+
+            leantime.editorController.initSimpleEditor();
+
+            @if (!$login::userIsAtLeast($roles::$editor))
+                leantime.authController.makeInputReadonly(".nyroModalCont");
+            @endif
+
+            @if ($login::userHasRole([$roles::$commenter]))
+                leantime.commentsController.enableCommenterForms();
+            @endif
+
+        });
+    </script>
+@endsection
diff --git a/app/Domain/Goalcanvas/Templates/canvasDialog.tpl.php b/app/Domain/Goalcanvas/Templates/canvasDialog.tpl.php
deleted file mode 100644
index 20cc318ca3..0000000000
--- a/app/Domain/Goalcanvas/Templates/canvasDialog.tpl.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-
-/**
- * Dialog
- */
-
-foreach ($__data as $var => $val) {
-    $$var = $val; // necessary for blade refactor
-}
-$canvasName = 'goal';
-
-
-/**
- * canvasDialog.inc template - Generic template for comments
- *
- * Required variables:
- * - $canvasName   Name of current canvas
- */
-defined('RESTRICTED') or die('Restricted access');
-
-$canvasItem = $tpl->get('canvasItem');
-$canvasTypes = $tpl->get('canvasTypes');
-$hiddenStatusLabels = $tpl->get('statusLabels');
-$statusLabels = $statusLabels ?? $hiddenStatusLabels;
-$hiddenRelatesLabels = $tpl->get('relatesLabels');
-$relatesLabels = $relatesLabels ?? $hiddenRelatesLabels;
-$dataLabels = $tpl->get('dataLabels');
-
-$id = "";
-if (isset($canvasItem['id']) && $canvasItem['id'] != '') {
-    $id = $canvasItem['id'];
-}
-
-$currentCanvas = $tpl->get('currentCanvas');
-
-if (isset($_GET['canvasId'])) {
-    $currentCanvas = (int)$_GET['canvasId'];
-}
-?>
-
-<script type="text/javascript">
-    window.onload = function() {
-        if (!window.jQuery) {
-            //It's not a modal
-            location.href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?showModal=<?php echo $canvasItem['id']; ?>";
-        }
-    }
-</script>
-
-<div style="width:1000px">
-
-    <h1><i class="fas <?=$canvasTypes[$canvasItem['box']]['icon']; ?>"></i> <?=$canvasTypes[$canvasItem['box']]['title']; ?></h1>
-
-    <?php echo $tpl->displayNotification(); ?>
-
-    <form class="formModal" method="post" action="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasItem/<?php echo $id;?>">
-
-        <input type="hidden" value="<?php echo $currentCanvas ?>" name="canvasId" />
-        <input type="hidden" value="<?php $tpl->e($canvasItem['box']) ?>" name="box" id="box"/>
-        <input type="hidden" value="<?php echo $id ?>" name="itemId" id="itemId"/>
-        <input type="hidden" name="milestoneId" value="<?php echo $canvasItem['milestoneId'] ?? '' ?>" />
-        <input type="hidden" name="changeItem" value="1" />
-
-        <div class="row">
-            <div class="col-md-8">
-
-
-                <label><?=$tpl->__("label.what_is_your_goal") ?></label>
-                <input type="text" name="title" value="<?php $tpl->e($canvasItem['title']) ?>"  style="width:100%" /><br />
-
-                <?php if (!empty($relatesLabels)) { ?>
-                    <label><?=$tpl->__("label.relates") ?></label>
-                    <select name="relates"  style="width: 50%" id="relatesCanvas">
-                    </select><br />
-                <?php } else { ?>
-                    <input type="hidden" name="relates" value="<?php echo $canvasItem['relates'] ?? array_key_first(
-                        $hiddenRelatesLabels
-                    ) ?>" />
-                <?php } ?>
-                <br />
-                <h4 class="widgettitle title-light" style="margin-bottom:0px;"><i class="fa-solid fa-ranking-star"></i> <?=$tpl->__("Metrics") ?></h4>
-
-
-                <?php $tpl->dispatchTplEvent('beforeMeasureGoalContainer', $canvasItem); ?>
-                <div id="measureGoalContainer">
-                    <label>How will you measure this objective. What metric will you be using.</label>
-                    <input type="text" name="description" value="<?=$canvasItem['description'] ?>" style="width:100%"/><br />
-                </div>
-
-                <div class="row">
-                    <div class="col-md-3">
-                        <label>Starting Value</label>
-                        <input type="number" step="0.01" name="startValue" value="<?=$canvasItem['startValue'] ?>" style="width:105px"/>
-                    </div>
-                    <div class="col-md-3">
-                        <label>Current Value</label>
-                        <input type="number" step="0.01" name="currentValue" id="currentValueField" value="<?=$canvasItem['currentValue'] ?>"
-                            <?php if ($canvasItem['setting'] == 'linkAndReport') {
-                                echo "readonly='readonly'";
-                            }?>
-                            <?php if ($canvasItem['setting'] == 'linkAndReport') {
-                                echo "data-tippy-content='Current value calculated from child goals'";
-                            }?>
-                               style="width:105px"/>
-                    </div>
-                    <div class="col-md-3">
-                        <label>Goal Value</label>
-                        <input type="number" step="0.01" name="endValue" value="<?=$canvasItem['endValue'] ?>" style="width:105px"/>
-                    </div>
-                    <div class="col-md-3">
-                        <label>Type</label>
-                        <select name="metricType">
-                            <option value="number" <?php if ($canvasItem['metricType'] == 'number') {
-                                echo"selected";
-                                                   } ?>>Number</option>
-                            <option value="percent" <?php if ($canvasItem['metricType'] == 'percent') {
-                                echo"selected";
-                                                    } ?>>% Percent</option>
-                            <option value="currency" <?php if ($canvasItem['metricType'] == 'currency') {
-                                echo"selected";
-                                                     } ?>><?=$tpl->__('language.currency') ?></option>
-                        </select>
-                    </div>
-                </div>
-
-                <br />
-                <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                    <input type="submit" value="<?=$tpl->__("buttons.save") ?>" id="primaryCanvasSubmitButton"/>
-                    <button type="submit"  class="btn btn-primary" id="saveAndClose" value="closeModal" onclick="leantime.goalCanvasController.setCloseModal();"><?=$tpl->__("buttons.save_and_close") ?></button>
-                <?php } ?>
-
-
-
-                <?php if ($id !== '') { ?>
-                    <br /><br /><br />
-                    <input type="hidden" name="comment" value="1" />
-                    <h4 class="widgettitle title-light"><span class="fa fa-comments"></span><?php echo $tpl->__('subtitles.discussion'); ?></h4>
-                    <?php
-                    $tpl->assign("formUrl", "/strategyPro/editCanvasItem/" . $id . "");
-                    $tpl->displaySubmodule('comments-generalComment');?>
-                <?php } ?>
-            </div>
-
-            <div class="col-md-4">
-
-
-                <?php if (!empty($statusLabels)) { ?>
-                    <label><?=$tpl->__("label.status") ?></label>
-                    <select name="status" style="width: 50%" id="statusCanvas">
-                    </select><br /><br />
-                <?php } else { ?>
-                    <input type="hidden" name="status" value="<?php echo $canvasItem['status'] ?? array_key_first(
-                        $hiddenStatusLabels
-                    ) ?>" />
-                <?php } ?>
-
-
-
-
-
-
-
-
-                <h4 class="widgettitle title-light" style="margin-bottom:0px;"><i class="fa-solid fa-calendar"></i> Dates</h4>
-
-                <label>Start Date</label>
-                <input type="text" autocomplete="off" value="<?=format($canvasItem['startDate'])->date(); ?>" name="startDate" class="startDate"/>
-
-                <label>End Date</label>
-                <input type="text" autocomplete="off" value="<?=format($canvasItem['endDate'])->date(); ?>" name="endDate" class="endDate"/>
-
-
-                <?php if ($id !== '') { ?>
-                    <br /><br />
-                    <h4 class="widgettitle title-light"><span class="fa fa-link"></span> <?=$tpl->__("headlines.linked_milestone") ?> <i class="fa fa-question-circle-o helperTooltip" data-tippy-content="<?=$tpl->__("tooltip.link_milestones_tooltip") ?>"></i></h4>
-
-
-
-                        <?php if ($canvasItem['milestoneId'] == '') {?>
-                                <center>
-                                    <h4><?=$tpl->__("headlines.no_milestone_link") ?></h4>
-                                    <div class="row" id="milestoneSelectors">
-                                        <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                                            <div class="col-md-12">
-                                                <a href="javascript:void(0);" onclick="leantime.<?=$canvasName ?>CanvasController.toggleMilestoneSelectors('new');"><?=$tpl->__("links.create_link_milestone") ?></a>
-                                                <?php if (count($tpl->get('milestones')) > 0) { ?>
-                                                    | <a href="javascript:void(0);" onclick="leantime.<?=$canvasName ?>CanvasController.toggleMilestoneSelectors('existing');"><?=$tpl->__("links.link_existing_milestone") ?></a>
-                                                <?php } ?>
-                                            </div>
-                                        <?php } ?>
-                                    </div>
-                                    <div class="row" id="newMilestone" style="display:none;">
-                                        <div class="col-md-12">
-                                            <input type="text" width="50%" name="newMilestone"></textarea><br />
-                                            <input type="hidden" name="type" value="milestone" />
-                                            <input type="hidden" name="<?=$canvasName ?>canvasitemid" value="<?php echo $id; ?> " />
-                                            <input type="button" value="<?=$tpl->__("buttons.save") ?>" onclick="jQuery('#primaryCanvasSubmitButton').click()" class="btn btn-primary" />
-                                            <input type="button" value="<?=$tpl->__("buttons.cancel") ?>" onclick="leantime.<?=$canvasName ?>CanvasController.toggleMilestoneSelectors('hide')" class="btn btn-primary" />
-                                        </div>
-                                    </div>
-
-                                    <div class="row" id="existingMilestone" style="display:none;">
-                                        <div class="col-md-12">
-                                            <select data-placeholder="<?=$tpl->__("input.placeholders.filter_by_milestone") ?>" name="existingMilestone"  class="user-select">
-                                                <option value=""></option>
-                                                <?php foreach ($tpl->get('milestones') as $milestoneRow) { ?>
-                                                    <?php echo"<option value='" . $milestoneRow->id . "'";
-
-                                                    if (isset($searchCriteria['milestone']) && ($searchCriteria['milestone'] == $milestoneRow->id)) {
-                                                        echo" selected='selected' ";
-                                                    }
-
-                                                    echo">" . $milestoneRow->headline . "</option>"; ?>
-                                                    <?php
-                                                }     ?>
-                                            </select>
-                                            <input type="hidden" name="type" value="milestone" />
-                                            <input type="hidden" name="<?=$canvasName ?>canvasitemid" value="<?php echo $id; ?> " />
-                                            <input type="button" value="<?=$tpl->__("buttons.save") ?>" onclick="jQuery('#primaryCanvasSubmitButton').click()" class="btn btn-primary" />
-                                            <input type="button" value="<?=$tpl->__("buttons.cancel") ?>" onclick="leantime.<?=$canvasName ?>CanvasController.toggleMilestoneSelectors('hide')" class="btn btn-primary" />
-                                        </div>
-                                    </div>
-
-                                </center>
-
-                        <?php } else { ?>
-
-
-                                <div hx-trigger="load"
-                                     hx-indicator=".htmx-indicator"
-                                     hx-get="<?=BASE_URL ?>/hx/tickets/milestones/showCard?milestoneId=<?=$canvasItem['milestoneId'] ?>">
-                                    <div class="htmx-indicator">
-                                        <?=$tpl->__("label.loading_milestone") ?>
-                                    </div>
-                                </div>
-                                <a href="<?=CURRENT_URL ?>?removeMilestone=<?php echo $canvasItem['milestoneId'];?>" class="<?=$canvasName ?>CanvasModal delete formModal"><i class="fa fa-close"></i> <?=$tpl->__("links.remove") ?></a>
-
-
-                        <?php } ?>
-
-
-
-                <?php } ?>
-
-            </div>
-        </div>
-
-        <?php if ($id != '') {?>
-            <a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/delCanvasItem/<?php echo $id;?>" class="formModal delete right"><i class='fa fa-trash-can'></i> <?php echo $tpl->__("links.delete") ?></a>
-        <?php } ?>
-
-    </form>
-
-
-</div>
-
-<script type="text/javascript">
-    jQuery(document).ready(function(){
-
-        leantime.dateController.initDateRangePicker(".startDate", ".endDate");
-
-
-        <?php if (!empty($statusLabels)) { ?>
-        new SlimSelect({
-            select: '#statusCanvas',
-            showSearch: false,
-            valuesUseText: false,
-            data: [
-                <?php foreach ($statusLabels as $key => $data) { ?>
-                    <?php if ($data['active']) { ?>
-                { innerHTML: '<?php echo "<i class=\"fas fa-fw " . $data["icon"] . "\"></i>&nbsp;" . $data['title']; ?>',
-                    text: "<?=$data['title'] ?>", value: "<?=$key ?>", selected: <?php echo $canvasItem['status'] == $key ? 'true' : 'false'; ?>},
-                    <?php } ?>
-                <?php } ?>
-            ]
-        });
-        <?php } ?>
-
-        <?php if (!empty($relatesLabels)) { ?>
-        new SlimSelect({
-            select: '#relatesCanvas',
-            showSearch: false,
-            valuesUseText: false,
-            data: [
-                <?php foreach ($relatesLabels as $key => $data) { ?>
-                    <?php if ($data['active']) { ?>
-                { innerHTML: '<?php echo "<i class=\"fas fa-fw " . $data["icon"] . "\"></i>&nbsp;" . $data['title']; ?>',
-                    text: "<?=$data['title'] ?>", value: "<?=$key ?>", selected: <?php echo $canvasItem['relates'] == $key ? 'true' : 'false'; ?>},
-                    <?php } ?>
-                <?php } ?>
-            ]
-        });
-        <?php } ?>
-
-        leantime.editorController.initSimpleEditor();
-
-        <?php if (!$login::userIsAtLeast($roles::$editor)) { ?>
-        leantime.authController.makeInputReadonly(".nyroModalCont");
-
-        <?php } ?>
-
-        <?php if ($login::userHasRole([$roles::$commenter])) { ?>
-        leantime.commentsController.enableCommenterForms();
-        <?php }?>
-
-    })
-</script>
diff --git a/app/Domain/Goalcanvas/Templates/dashboard.blade.php b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
new file mode 100644
index 0000000000..90e1a10977
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
@@ -0,0 +1,368 @@
+@extends($layout)
+@section('content')
+
+@php
+
+use Leantime\Domain\Comments\Repositories\Comments;
+use Leantime\Domain\Goalcanvas\Services\Goalcanvas;
+
+
+$elementName = 'goal';
+
+/**
+ * showCanvasTop.inc template - Top part of the main canvas page
+ *
+ * Required variables:
+ * - goal      Name of current canvas
+ */
+
+$canvasTitle = '';
+
+//get canvas title
+foreach ($allCanvas as $canvasRow) {
+    if ($canvasRow["id"] == $currentCanvas) {
+        $canvasTitle = $canvasRow["title"];
+        $canvasId = $canvasRow["id"];
+        break;
+    }
+}
+
+@endphp
+
+<style>
+    .canvas-row { margin-left: 0px; margin-right: 0px;}
+    .canvas-title-only { border-radius: var(--box-radius-small); }
+    h4.canvas-element-title-empty { background: white !important; border-color: white !important; }
+    div.canvas-element-center-middle { text-align: center; }
+</style>
+
+<div class="pageheader">
+    <div class="pageicon"><span class='fa {{ $canvasIcon }}'></span></div>
+    <div class="pagetitle">
+        <h5>{{ session("currentProjectClient") . " // " . session("currentProjectName") }}</h5>
+
+        <h1>{{ __("headline.goal.dashboardboard") }} //
+            @if (count($allCanvas) > 0)
+                <span class="dropdown dropdownWrapper">
+                    <a href="javascript:void(0);" class="dropdown-toggle header-title-dropdown" data-toggle="dropdown">All Goal Groups&nbsp;<i class="fa fa-caret-down"></i></a>
+
+                    <ul class="dropdown-menu canvasSelector">
+                        @if ($login::userIsAtLeast($roles::$editor))
+                            <li><a href="#/goalcanvas/bigRock">{{ __("links.icon.create_new_board") }}</a></li>
+                        @endif
+                        <li class="border"></li>
+                        @foreach ($allCanvas as $canvasRow)
+                            <li><a href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">{{ $tpl->escape($canvasRow['title']) }}</a></li>
+                        @endforeach
+                    </ul>
+                </span>
+            @endif
+        </h1>
+    </div>
+</div><!--pageheader-->
+
+<div class="maincontent">
+
+<div class="row" style="margin-bottom:20px; ">
+    <div class="col-md-4">
+        <div class="bigNumberBox" style="padding: 29px 15px;">
+            <h2>Progress: {{ round($goalStats['avgPercentComplete']) }}%</h2>
+
+            <div class="progress" style="margin-top:5px;">
+                <div class="progress-bar progress-bar-success" role="progressbar"
+                     aria-valuenow="{{ round($goalStats['avgPercentComplete']) }}" aria-valuemin="0" aria-valuemax="100"
+                     style="width: {{ $goalStats['avgPercentComplete'] }}%">
+                    <span class="sr-only">{{ sprintf(__("text.percent_complete"), round($goalStats['avgPercentComplete'])) }}</span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-2"></div>
+    <div class="col-md-2">
+        <div class="bigNumberBox priority-border-4">
+            <h2>On Track</h2>
+            <span class="content">{{ $goalStats['goalsOnTrack'] }}</span>
+        </div>
+    </div>
+    <div class="col-md-2">
+        <div class="bigNumberBox priority-border-3">
+            <h2>At Risk</h2>
+            <span class="content">{{ $goalStats['goalsAtRisk'] }}</span>
+        </div>
+    </div>
+    <div class="col-md-2">
+        <div class="bigNumberBox priority-border-1">
+            <h2>Miss</h2>
+            <span class="content">{{ $goalStats['goalsMiss'] }}</span>
+        </div>
+    </div>
+</div>
+
+<div class="maincontentinner">
+    <div class="row">
+        <div class="col-md-6"></div>
+    </div>
+    @if (count($allCanvas) > 0)
+        @foreach ($allCanvas as $canvasRow)
+            <div class="row">
+                <div class="col-md-12">
+                    <a href='#/goalcanvas/editCanvasItem?type=goal&canvasId={{ $canvasRow["id"] }}' class='btn btn-primary pull-right'><i class="fa fa-plus"></i> Create New Goal</a>
+
+                    <h5 class='subtitle'><a href='{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow["id"] }}'>{{ $tpl->escape($canvasRow["title"]) }}</a></h5>
+                </div>
+            </div>
+            <div class="row" style="border-bottom:1px solid var(--main-border-color); margin-bottom:20px">
+                @php
+                $canvasSvc = app()->make(Goalcanvas::class);
+                $canvasItems = $canvasSvc->getCanvasItemsById($canvasRow["id"]);
+                @endphp
+                <div id="sortableCanvasKanban-{{ $canvasRow['id'] }}" class="sortableTicketList disabled col-md-12" style="padding-top:15px;">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="row">
+                                @if (!is_countable($canvasItems) || count($canvasItems) == 0)
+                                    <div class='col-md-12'>No goals on this board yet. Open the <a href='{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow["id"] }}'>board</a> to start adding goals</div>
+                                @endif
+                                @foreach ($canvasItems as $row)
+                                    @php
+                                    $filterStatus = $filter['status'] ?? 'all';
+                                    $filterRelates = $filter['relates'] ?? 'all';
+                                    @endphp
+                                    @if ($row['box'] === $elementName && ($filterStatus == 'all' || $filterStatus == $row['status']) && ($filterRelates == 'all' || $filterRelates == $row['relates']))
+                                        @php
+                                        $comments = app()->make(Comments::class);
+                                        $nbcomments = $comments->countComments(moduleId: $row['id']);
+                                        @endphp
+                                        <div class="col-md-4">
+                                            <div class="ticketBox" id="item_{{ $row["id"] }}">
+                                                <div class="row">
+                                                    <div class="col-md-12">
+                                                        <div class="inlineDropDownContainer" style="float:right;">
+                                                            @if ($login::userIsAtLeast($roles::$editor))
+                                                                <a href="javascript:void(0)" class="dropdown-toggle ticketDropDown" data-toggle="dropdown">
+                                                                    <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                                                </a>
+                                                            @endif
+                                                            @if ($login::userIsAtLeast($roles::$editor))
+                                                                &nbsp;&nbsp;&nbsp;
+                                                                <ul class="dropdown-menu">
+                                                                    <li class="nav-header">{{ __("subtitles.edit") }}</li>
+                                                                    <li><a href="#/goalcanvas/editCanvasItem/{{ $row["id"] }}" class="goalCanvasModal" data="item_{{ $row["id"] }}">{{ __("links.edit_canvas_item") }}</a></li>
+                                                                    <li><a href="#/goalcanvas/delCanvasItem/{{ $row["id"] }}" class="delete goalCanvasModal" data="item_{{ $row["id"] }}">{{ __("links.delete_canvas_item") }}</a></li>
+                                                                </ul>
+                                                            @endif
+                                                        </div>
+
+                                                        <h4>
+                                                            <strong>Goal:</strong>
+                                                            <a href="#/goalcanvas/editCanvasItem/{{ $row['id'] }}" class="goalCanvasModal" data="item_{{ $row['id'] }}">
+                                                                {{ $tpl->e($row["title"]) }}
+                                                            </a>
+                                                        </h4>
+                                                        <br />
+                                                        <strong>Metric:</strong> {{ $tpl->escape($row["description"]) }}
+                                                        <br /><br />
+
+                                                        @php
+                                                        $percentDone = $row["goalProgress"];
+                                                        $metricTypeFront = '';
+                                                        $metricTypeBack = '';
+                                                        if ($row["metricType"] == "percent") {
+                                                            $metricTypeBack = '%';
+                                                        } elseif ($row["metricType"] == "currency") {
+                                                            $metricTypeFront = __("language.currency");
+                                                        }
+                                                        @endphp
+
+                                                        <div class="row">
+                                                            <div class="col-md-4"></div>
+                                                            <div class="col-md4 center">
+                                                                <small>{{ sprintf(__("text.percent_complete"), $percentDone) }}</small>
+                                                            </div>
+                                                            <div class="col-md-4"></div>
+                                                        </div>
+                                                        <div class="progress" style="margin-bottom:0px;">
+                                                            <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ $percentDone }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ $percentDone }}%">
+                                                                <span class="sr-only">{{ sprintf(__("text.percent_complete"), $percentDone) }}</span>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row" style="padding-bottom:0px;">
+                                                            <div class="col-md-4">
+                                                                <small>Start:<br />{{ $metricTypeFront . $row["startValue"] . $metricTypeBack }}</small>
+                                                            </div>
+                                                            <div class="col-md-4 center">
+                                                                <small>{{ __('label.current') }}:<br />{{ $metricTypeFront . $row["currentValue"] . $metricTypeBack }}</small>
+                                                            </div>
+                                                            <div class="col-md-4" style="text-align:right">
+                                                                <small>{{ __('label.goal') }}:<br />{{ $metricTypeFront . $row["endValue"] . $metricTypeBack }}</small>
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="clearfix" style="padding-bottom: 8px;"></div>
+
+                                                        @if (!empty($statusLabels))
+                                                            <div class="dropdown ticketDropdown statusDropdown colorized show firstDropdown">
+                                                                <a class="dropdown-toggle f-left status label-{{ $row['status'] != "" ? $statusLabels[$row['status']]['dropdown'] : "" }}" href="javascript:void(0);" role="button" id="statusDropdownMenuLink{{ $row['id'] }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                                    <span class="text">{{ $row['status'] != "" ? $statusLabels[$row['status']]['title'] : "" }}</span> <i class="fa fa-caret-down" aria-hidden="true"></i>
+                                                                </a>
+                                                                <ul class="dropdown-menu" aria-labelledby="statusDropdownMenuLink{{ $row['id'] }}">
+                                                                    <li class="nav-header border">{{ __("dropdown.choose_status") }}</li>
+                                                                    @foreach ($statusLabels as $key => $data)
+                                                                        @if ($data['active'] || true)
+                                                                            <li class='dropdown-item'>
+                                                                                <a href="javascript:void(0);" class="label-{{ $data['dropdown'] }}" data-label='{{ $data["title"] }}' data-value="{{ $row['id'] . "/" . $key }}" id="ticketStatusChange{{ $row['id'] . $key }}">{{ $data['title'] }}</a>
+                                                                            </li>
+                                                                        @endif
+                                                                    @endforeach
+                                                                </ul>
+                                                            </div>
+                                                        @endif
+
+                                                        @if (!empty($relatesLabels))
+                                                            <div class="dropdown ticketDropdown relatesDropdown colorized show firstDropdown">
+                                                                <a class="dropdown-toggle f-left relates label-{{ $relatesLabels[$row['relates']]['dropdown'] }}" href="javascript:void(0);" role="button" id="relatesDropdownMenuLink{{ $row['id'] }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                                    <span class="text">{{ $relatesLabels[$row['relates']]['title'] }}</span> <i class="fa fa-caret-down" aria-hidden="true"></i>
+                                                                </a>
+                                                                <ul class="dropdown-menu" aria-labelledby="relatesDropdownMenuLink{{ $row['id'] }}">
+                                                                    <li class="nav-header border">{{ __("dropdown.choose_relates") }}</li>
+                                                                    @foreach ($relatesLabels as $key => $data)
+                                                                        @if ($data['active'] || true)
+                                                                            <li class='dropdown-item'>
+                                                                                <a href="javascript:void(0);" class="label-{{ $data['dropdown'] }}" data-label='{{ $data["title"] }}' data-value="{{ $row['id'] . "/" . $key }}" id="ticketRelatesChange{{ $row['id'] . $key }}">{{ $data['title'] }}</a>
+                                                                            </li>
+                                                                        @endif
+                                                                    @endforeach
+                                                                </ul>
+                                                            </div>
+                                                        @endif
+
+                                                        <div class="dropdown ticketDropdown userDropdown noBg show right lastDropdown dropRight">
+                                                            <a class="dropdown-toggle f-left" href="javascript:void(0);" role="button" id="userDropdownMenuLink{{ $row['id'] }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                                <span class="text">
+                                                                    @if ($row["authorFirstname"] != "")
+                                                                        <span id='userImage{{ $row['id'] }}'>
+                                                                            <img src='{{ BASE_URL }}/api/users?profileImage={{ $row['author'] }}' width='25' style='vertical-align: middle;'/>
+                                                                        </span>
+                                                                        <span id='user{{ $row['id'] }}'></span>
+                                                                    @else
+                                                                        <span id='userImage{{ $row['id'] }}'>
+                                                                            <img src='{{ BASE_URL }}/api/users?profileImage=false' width='25' style='vertical-align: middle;'/>
+                                                                        </span>
+                                                                        <span id='user{{ $row['id'] }}'></span>
+                                                                    @endif
+                                                                </span>
+                                                            </a>
+                                                            <ul class="dropdown-menu" aria-labelledby="userDropdownMenuLink{{ $row['id'] }}">
+                                                                <li class="nav-header border">{{ __("dropdown.choose_user") }}</li>
+                                                                @foreach ($users as $user)
+                                                                    <li class='dropdown-item'>
+                                                                        <a href='javascript:void(0);' data-label='{{ sprintf(__("text.full_name"), $tpl->escape($user["firstname"]), $tpl->escape($user['lastname'])) }}' data-value='{{ $row['id'] . "_" . $user['id'] . "_" . $user['profileId'] }}' id='userStatusChange{{ $row['id'] . $user['id'] }}'>
+                                                                            <img src='{{ BASE_URL }}/api/users?profileImage={{ $user['id'] }}' width='25' style='vertical-align: middle; margin-right:5px;'/>
+                                                                            {{ sprintf(__("text.full_name"), $tpl->escape($user["firstname"]), $tpl->escape($user['lastname'])) }}
+                                                                        </a>
+                                                                    </li>
+                                                                @endforeach
+                                                            </ul>
+                                                        </div>
+
+                                                        <div class="right" style="margin-right:10px;">
+                                                            <a href="{{ BASE_URL }}/goalcanvas/editCanvasComment/{{ $row['id'] }}" class="goalCanvasModal" data="item_{{ $row['id'] }}" @if($nbcomments == 0) style="color: grey;" @endif>
+                                                                <span class="fas fa-comments"></span>
+                                                            </a>
+                                                            <small>{{ $nbcomments }}</small>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                @if ($row['milestoneHeadline'] != '')
+                                                    <br/>
+                                                    <div hx-trigger="load" hx-indicator=".htmx-indicator" hx-get="{{ BASE_URL }}/hx/tickets/milestones/showCard?milestoneId={{ $row['milestoneId'] }}">
+                                                        <div class="htmx-indicator">
+                                                            {{ __("label.loading_milestone") }}
+                                                        </div>
+                                                    </div>
+                                                @endif
+                                            </div>
+                                        </div>
+                                    @endif
+                                @endforeach
+                            </div>
+                            <br />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        @endforeach
+    @endif
+</div>
+
+
+
+{{-- 
+ * showCanvasBottom.blade.php template - Bottom part of the main canvas page
+ *
+ * Required variables:
+ * - goal      Name of current canvas
+--}}
+
+@if (count($allCanvas) > 0)
+    {{--  --}}
+@else
+    <br><br>
+    <div class='center'>
+        <div class='svgContainer'>
+            {!! file_get_contents(ROOT . "/dist/images/svg/undraw_design_data_khdb.svg") !!}
+        </div>
+        <h3>{{ __("headlines.goal.analysis") }}</h3>
+        <br>{!! __("text.goal.helper_content") !!}
+        
+        @if ($login::userIsAtLeast($roles::$editor))
+            <br><br>
+            <a href='javascript:void(0)' class='addCanvasLink btn btn-primary'>
+                {{ __("links.icon.create_new_board") }}
+            </a>
+        @endif
+    </div>
+@endif
+
+@if (!empty($disclaimer) && count($allCanvas) > 0)
+    <small class="align-center">{{ $disclaimer }}</small>
+@endif
+
+{!! $tpl->viewFactory->make($tpl->getTemplatePath('canvas', 'modals'), $__data)->render() !!}
+
+</div>
+</div>
+
+<script type="text/javascript">
+jQuery(document).ready(function() {
+    if(jQuery('#searchCanvas').length > 0) {
+        new SlimSelect({ select: '#searchCanvas' });
+    }
+
+    leantime.goalCanvasController.setRowHeights();
+    leantime.canvasController.setCanvasName('goal');
+    leantime.canvasController.initFilterBar();
+
+    @if ($login::userIsAtLeast($roles::$editor))
+        leantime.canvasController.initCanvasLinks();
+        leantime.canvasController.initUserDropdown();
+        leantime.canvasController.initStatusDropdown();
+        leantime.canvasController.initRelatesDropdown();
+    @else
+        leantime.authController.makeInputReadonly(".maincontentinner");
+    @endif
+
+    @if (isset($_GET['showModal']))
+        @php
+            $modalUrl = $_GET['showModal'] == "" 
+                ? "&type=" . array_key_first($canvasTypes)
+                : "/" . (int)$_GET['showModal'];
+        @endphp
+        leantime.canvasController.openModalManually("{{ BASE_URL }}/goalcanvas/editCanvasItem{{ $modalUrl }}");
+        window.history.pushState({}, document.title, '{{ BASE_URL }}/goalcanvas/showCanvas/');
+    @endif
+});
+</script>
+
+@endsection
\ No newline at end of file
diff --git a/app/Domain/Goalcanvas/Templates/dashboard.tpl.php b/app/Domain/Goalcanvas/Templates/dashboard.tpl.php
deleted file mode 100644
index dddd1fcfb1..0000000000
--- a/app/Domain/Goalcanvas/Templates/dashboard.tpl.php
+++ /dev/null
@@ -1,724 +0,0 @@
-<?php
-
-/**
- * Template
- */
-
-use Leantime\Domain\Comments\Repositories\Comments;
-use Leantime\Domain\Goalcanvas\Services\Goalcanvas;
-
-defined('RESTRICTED') or die('Restricted access');
-
-foreach ($__data as $var => $val) {
-    $$var = $val; // necessary for blade refactor
-}
-$canvasName = 'goal';
-$elementName = 'goal';
-
-
-/**
- * showCanvasTop.inc template - Top part of the main canvas page
- *
- * Required variables:
- * - $canvasName       Name of current canvas
- */
-
-$canvasTitle = '';
-$allCanvas = $tpl->get('allCanvas');
-$canvasIcon = $tpl->get('canvasIcon');
-$canvasTypes = $tpl->get('canvasTypes');
-$statusLabels = $statusLabels ?? $tpl->get('statusLabels');
-$relatesLabels = $relatesLabels ?? $tpl->get('relatesLabels');
-$dataLabels = $tpl->get('dataLabels');
-$disclaimer = $tpl->get('disclaimer');
-$canvasItems = $tpl->get('canvasItems');
-
-$filter['status'] = $_GET['filter_status'] ?? (session("filter_status") ?? 'all');
-session(["filter_status" => $filter['status']]);
-$filter['relates'] = $_GET['filter_relates'] ?? (session("filter_relates") ?? 'all');
-session(["filter_relates" => $filter['relates']]);
-
-//get canvas title
-foreach ($tpl->get('allCanvas') as $canvasRow) {
-    if ($canvasRow["id"] == $tpl->get('currentCanvas')) {
-        $canvasTitle = $canvasRow["title"];
-        $canvasId = $canvasRow["id"];
-        break;
-    }
-}
-
-$goalStats = $tpl->get("goalStats");
-
-?>
-    <style>
-        .canvas-row { margin-left: 0px; margin-right: 0px;}
-        .canvas-title-only { border-radius: var(--box-radius-small); }
-        h4.canvas-element-title-empty { background: white !important; border-color: white !important; }
-        div.canvas-element-center-middle { text-align: center; }
-    </style>
-
-    <div class="pageheader">
-        <div class="pageicon"><span class='fa <?=$canvasIcon ?>'></span></div>
-        <div class="pagetitle">
-            <h5><?php $tpl->e(session("currentProjectClient") . " // " . session("currentProjectName")); ?></h5>
-
-            <h1><?=$tpl->__("headline.$canvasName.dashboardboard") ?> //
-                <?php if (count($allCanvas) > 0) {?>
-                    <span class="dropdown dropdownWrapper">
-                <a href="javascript:void(0);" class="dropdown-toggle header-title-dropdown" data-toggle="dropdown">All Goal Groups&nbsp;<i class="fa fa-caret-down"></i>
-                </a>
-
-                <ul class="dropdown-menu canvasSelector">
-                     <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                         <li><a href="#/goalcanvas/bigRock"><?=$tpl->__("links.icon.create_new_board") ?></a></li>
-
-                     <?php } ?>
-                    <li class="border"></li>
-                    <?php
-                    $lastClient = "";
-                    $i = 0;
-                    foreach ($tpl->get('allCanvas') as $canvasRow) {
-                        echo "<li><a href='" . BASE_URL . "/" . $canvasName . "canvas/showCanvas/" . $canvasRow["id"] . "'>" . $tpl->escape($canvasRow["title"]) . "</a></li>";
-                    }
-                    ?>
-                </ul>
-            </span>
-                <?php } ?>
-
-            </h1>
-        </div>
-    </div><!--pageheader-->
-
-    <div class="maincontent">
-
-
-<?php echo $tpl->displayNotification(); ?>
-
-
-
-    <div class="row" style="margin-bottom:20px; ">
-        <div class="col-md-4">
-            <div class="bigNumberBox" style="padding: 29px 15px;">
-                <h2>Progress: <?php echo round($goalStats['avgPercentComplete']); ?>%</h2>
-
-                <div class="progress" style="margin-top:5px;">
-                    <div class="progress-bar progress-bar-success" role="progressbar"
-                         aria-valuenow="<?php echo round($goalStats['avgPercentComplete']); ?>" aria-valuemin="0" aria-valuemax="100"
-                         style="width: <?php echo $goalStats['avgPercentComplete']; ?>%">
-                        <span class="sr-only"><?=sprintf($tpl->__("text.percent_complete"), round($goalStats['avgPercentComplete']))?></span>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <div class="col-md-2">
-        </div>
-        <div class="col-md-2">
-            <div class="bigNumberBox priority-border-4">
-                <h2>On Track</h2>
-                <span class="content"><?=$goalStats['goalsOnTrack'] ?></span>
-            </div>
-        </div>
-        <div class="col-md-2">
-            <div class="bigNumberBox priority-border-3">
-                <h2>At Risk</h2>
-                <span class="content"><?=$goalStats['goalsAtRisk'] ?></span>
-            </div>
-        </div>
-        <div class="col-md-2">
-            <div class="bigNumberBox priority-border-1">
-                <h2>Miss</h2>
-                <span class="content"><?=$goalStats['goalsMiss'] ?></span>
-
-            </div>
-
-        </div>
-    </div>
-
-
-
-
-    <div class="maincontentinner">
-    <div class="row">
-        <div class="col-md-6">
-
-
-        </div>
-    </div>
-<?php if (count($allCanvas) > 0) {?>
-    <?php foreach ($tpl->get('allCanvas') as $canvasRow) { ?>
-        <div class="row">
-            <div class="col-md-12">
-                <a href='#/goalcanvas/editCanvasItem?type=goal&canvasId=<?=$canvasRow["id"]?>' class='btn btn-primary pull-right'><i class="fa fa-plus"></i> Create New Goal</a>
-
-                <?php echo "<h5 class='subtitle'><a href='" . BASE_URL . "/" . $canvasName . "canvas/showCanvas/" . $canvasRow["id"] . "'>" . $tpl->escape($canvasRow["title"]) . "</a> </h5>"; ?>
-
-            </div>
-        </div>
-        <div class="row" style="border-bottom:1px solid var(--main-border-color); margin-bottom:20px">
-            <?php
-            $canvasSvc = app()->make(Goalcanvas::class);
-            $canvasItems = $canvasSvc->getCanvasItemsById($canvasRow["id"]);
-            ?>
-            <div id="sortableCanvasKanban-<?=$canvasRow["id"]?>" class="sortableTicketList disabled col-md-12" style="padding-top:15px;">
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="row">
-
-                            <?php if (!is_countable($canvasItems) || count($canvasItems) == 0) {
-                                echo "<div class='col-md-12'>No goals on this board yet. Open the <a href='" . BASE_URL . "/" . $canvasName . "canvas/showCanvas/" . $canvasRow["id"] . "'>board</a> to start adding goals</div>";
-                            }
-                            ?>
-                            <?php foreach ($canvasItems as $row) {
-                                $filterStatus = $filter['status'] ?? 'all';
-                                $filterRelates = $filter['relates'] ?? 'all';
-
-                                if (
-                                    $row['box'] === $elementName && ($filterStatus == 'all'
-                                        || $filterStatus == $row['status']) && ($filterRelates == 'all'
-                                        || $filterRelates == $row['relates'])
-                                ) {
-                                    $comments = app()->make(Comments::class);
-                                    $nbcomments = $comments->countComments(moduleId: $row['id']);
-                                    ?>
-                                    <div class="col-md-4">
-                                        <div class="ticketBox" id="item_<?php echo $row["id"];?>">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div class="inlineDropDownContainer" style="float:right;">
-
-                                                        <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                                                            <a href="javascript:void(0)" class="dropdown-toggle ticketDropDown" data-toggle="dropdown">
-                                                                <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
-                                                            </a>
-                                                        <?php } ?>
-
-                                                        <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                                                            &nbsp;&nbsp;&nbsp;
-                                                            <ul class="dropdown-menu">
-                                                                <li class="nav-header"><?=$tpl->__("subtitles.edit"); ?></li>
-                                                                <li><a
-                                                                        href="#/<?=$canvasName ?>canvas/editCanvasItem/<?php echo $row["id"];?>"
-                                                                        class="<?=$canvasName ?>CanvasModal"
-                                                                        data="item_<?php echo $row["id"];?>"
-                                                                    > <?=$tpl->__("links.edit_canvas_item"); ?></a></li>
-                                                                <li><a
-                                                                        href="#/<?=$canvasName ?>canvas/delCanvasItem/<?php echo $row["id"]; ?>"
-                                                                        class="delete <?=$canvasName ?>CanvasModal"
-                                                                        data="item_<?php echo $row["id"];?>"
-                                                                    > <?=$tpl->__("links.delete_canvas_item"); ?></a></li>
-                                                            </ul>
-                                                        <?php } ?>
-                                                    </div>
-
-                                                    <h4>
-                                                        <strong>Goal:</strong>
-                                                        <a
-                                                            href="#/<?=$canvasName ?>canvas/editCanvasItem/<?=$row["id"];?>"
-                                                            class="<?=$canvasName ?>CanvasModal"
-                                                            data="item_<?=$row['id'] ?>">
-                                                            <?php $tpl->e($row["title"]);?>
-                                                        </a>
-                                                    </h4>
-                                                    <br />
-                                                    <strong>Metric:</strong> <?=$tpl->escape($row["description"]) ?>
-                                                    <br /><br />
-
-                                                    <?php
-                                                    $percentDone = $row["goalProgress"];
-                                                    $metricTypeFront = '';
-                                                    $metricTypeBack = '';
-                                                    if ($row["metricType"] == "percent") {
-                                                        $metricTypeBack = '%';
-                                                    } elseif ($row["metricType"] == "currency") {
-                                                        $metricTypeFront = $tpl->__("language.currency");
-                                                    }
-                                                    ?>
-
-                                                    <div class="row">
-                                                        <div class="col-md-4"></div>
-                                                        <div class="col-md4 center">
-
-                                                            <small><?=sprintf($tpl->__("text.percent_complete"), $percentDone); ?></small>
-                                                        </div>
-                                                        <div class="col-md-4"></div>
-                                                    </div>
-                                                    <div class="progress" style="margin-bottom:0px;">
-                                                        <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $percentDone; ?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $percentDone; ?>%">
-                                                            <span class="sr-only"><?=sprintf($tpl->__("text.percent_complete"), $percentDone)?></span>
-                                                        </div>
-                                                    </div>
-                                                    <div class="row" style="padding-bottom:0px;">
-                                                        <div class="col-md-4">
-                                                            <small>Start:<br /><?=$metricTypeFront . $row["startValue"] . $metricTypeBack ?></small>
-                                                        </div>
-                                                        <div class="col-md-4 center">
-                                                            <small><?=$tpl->__('label.current') ?>:<br /><?=$metricTypeFront . $row["currentValue"] . $metricTypeBack ?></small>
-                                                        </div>
-                                                        <div class="col-md-4" style="text-align:right">
-                                                            <small><?=$tpl->__('label.goal') ?>:<br /><?=$metricTypeFront . $row["endValue"] . $metricTypeBack ?></small>
-                                                        </div>
-                                                    </div>
-
-                                                    <div class="clearfix" style="padding-bottom: 8px;"></div>
-
-                                                    <?php if (!empty($statusLabels)) { ?>
-                                                        <div class="dropdown ticketDropdown statusDropdown colorized show firstDropdown">
-                                                            <a class="dropdown-toggle f-left status label-<?=$row['status'] != "" ? $statusLabels[$row['status']]['dropdown'] : ""?>"
-                                                               href="javascript:void(0);" role="button"
-                                                               id="statusDropdownMenuLink<?=$row['id']?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                                <span class="text"><?=$row['status'] != "" ? $statusLabels[$row['status']]['title'] : ""?></span> <i class="fa fa-caret-down" aria-hidden="true"></i>
-                                                            </a>
-                                                            <ul class="dropdown-menu" aria-labelledby="statusDropdownMenuLink<?=$row['id']?>">
-                                                                <li class="nav-header border"><?=$tpl->__("dropdown.choose_status")?></li>
-                                                                <?php foreach ($statusLabels as $key => $data) { ?>
-                                                                    <?php if ($data['active'] || true) { ?>
-                                                                        <li class='dropdown-item'>
-                                                                            <a href="javascript:void(0);" class="label-<?=$data['dropdown'] ?>"
-                                                                               data-label='<?=$data["title"] ?>' data-value="<?=$row['id'] . "/" . $key ?>"
-                                                                               id="ticketStatusChange<?=$row['id'] . $key ?>"><?=$data['title'] ?></a>
-                                                                        </li>
-                                                                    <?php } ?>
-                                                                <?php } ?>
-                                                            </ul>
-                                                        </div>
-                                                    <?php } ?>
-
-                                                    <?php if (!empty($relatesLabels)) {  ?>
-                                                        <div class="dropdown ticketDropdown relatesDropdown colorized show firstDropdown">
-                                                            <a class="dropdown-toggle f-left relates label-<?=$relatesLabels[$row['relates']]['dropdown'] ?>"
-                                                               href="javascript:void(0);" role="button"
-                                                               id="relatesDropdownMenuLink<?=$row['id']?>" data-toggle="dropdown" aria-haspopup="true"
-                                                               aria-expanded="false">
-                                                                <span class="text"><?=$relatesLabels[$row['relates']]['title'] ?></span> <i class="fa fa-caret-down" aria-hidden="true"></i>
-                                                            </a>
-                                                            <ul class="dropdown-menu" aria-labelledby="relatesDropdownMenuLink<?=$row['id']?>">
-                                                                <li class="nav-header border"><?=$tpl->__("dropdown.choose_relates")?></li>
-                                                                <?php foreach ($relatesLabels as $key => $data) { ?>
-                                                                    <?php if ($data['active'] || true) { ?>
-                                                                        <li class='dropdown-item'>
-                                                                            <a href="javascript:void(0);" class="label-<?=$data['dropdown'] ?>"
-                                                                               data-label='<?=$data["title"] ?>'
-                                                                               data-value="<?=$row['id'] . "/" . $key ?>"
-                                                                               id="ticketRelatesChange<?=$row['id'] . $key ?>"><?=$data['title'] ?></a>
-                                                                        </li>
-                                                                    <?php } ?>
-                                                                <?php } ?>
-                                                            </ul>
-                                                        </div>
-                                                    <?php } ?>
-
-                                                    <div class="dropdown ticketDropdown userDropdown noBg show right lastDropdown dropRight">
-                                                        <a class="dropdown-toggle f-left" href="javascript:void(0);" role="button" id="userDropdownMenuLink<?=$row['id']?>"
-                                                           data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                                <span class="text">
-                                                                    <?php if ($row["authorFirstname"] != "") {
-                                                                        echo "<span id='userImage" . $row['id'] . "'>"
-                                                                            . "<img src='" . BASE_URL . "/api/users?profileImage=" . $row['author'] . "' width='25' "
-                                                                            . "style='vertical-align: middle;'/></span><span id='user" . $row['id'] . "'></span>";
-                                                                    } else {
-                                                                        echo "<span id='userImage" . $row['id'] . "'><img src='" . BASE_URL
-                                                                            . "/api/users?profileImage=false' width='25' "
-                                                                            . "style='vertical-align: middle;'/></span><span id='user" . $row['id'] . "'></span>";
-                                                                    } ?>
-                                                                </span>
-                                                        </a>
-                                                        <ul class="dropdown-menu" aria-labelledby="userDropdownMenuLink<?=$row['id']?>">
-                                                            <li class="nav-header border"><?=$tpl->__("dropdown.choose_user")?></li>
-                                                            <?php foreach ($tpl->get('users') as $user) { ?>
-                                                                <li class='dropdown-item'>
-                                                                    <a
-                                                                        href='javascript:void(0);'
-                                                                        data-label='<?= sprintf(
-                                                                            $tpl->__("text.full_name"),
-                                                                            $tpl->escape($user["firstname"]),
-                                                                            $tpl->escape($user['lastname'])
-                                                                        ) ?>'
-                                                                        data-value='<?=$row['id'] . "_" . $user['id'] . "_" . $user['profileId'] ?>'
-                                                                        id='userStatusChange<?=$row['id'] . $user['id'] ?>'
-                                                                    >
-                                                                        <img
-                                                                            src='<?= BASE_URL ?>/api/users?profileImage=<?=$user['id'] ?>'
-                                                                            width='25'
-                                                                            style='vertical-align: middle; margin-right:5px;'
-                                                                        />
-                                                                        <?= sprintf(
-                                                                            $tpl->__("text.full_name"),
-                                                                            $tpl->escape($user["firstname"]),
-                                                                            $tpl->escape($user['lastname'])
-                                                                        ) ?>
-                                                                    </a>
-                                                                </li>
-                                                            <?php }?>
-                                                        </ul>
-                                                    </div>
-
-                                                    <div class="right" style="margin-right:10px;">
-                                                        <a
-                                                            href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasComment/<?=$row['id'] ?>"
-                                                            class="<?=$canvasName ?>CanvasModal" data="item_<?=$row['id'] ?>"
-                                                            <?php echo $nbcomments == 0 ? 'style="color: grey;"' : '' ?>
-                                                        ><span class="fas fa-comments"></span></a> <small><?=$nbcomments ?></small>
-                                                    </div>
-
-                                                </div>
-                                            </div>
-
-                                            <?php if ($row['milestoneHeadline'] != '') {?>
-                                                <br/>
-                                                <div hx-trigger="load"
-                                                     hx-indicator=".htmx-indicator"
-                                                     hx-get="<?=BASE_URL ?>/hx/tickets/milestones/showCard?milestoneId=<?=$row['milestoneId'] ?>">
-                                                    <div class="htmx-indicator">
-                                                        <?=$tpl->__("label.loading_milestone") ?>
-                                                    </div>
-                                                </div>
-                                            <?php } ?>
-                                        </div>
-                                    </div>
-                                <?php } ?>
-                            <?php } ?>
-
-
-
-                        </div>
-                        <br />
-
-
-
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-    <?php } ?>
-
-<?php } ?>
-
-
-
-<?php /*
-
-
-        <div class="row">
-            <div class="col-md-3">
-
-                <?php if ($login::userIsAtLeast($roles::$editor) && count($canvasTypes) == 1 && count($allCanvas) > 0) { ?>
-                    <a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasItem?type=<?php echo $elementName; ?>"
-                       class="<?=$canvasName ?>CanvasModal btn btn-primary" id="<?php echo $elementName; ?>"><?=$tpl->__('links.add_new_canvas_item' . $canvasName) ?></a>
-                <?php } ?>
-
-            </div>
-
-            <div class="col-md-6 center">
-
-            </div>
-
-            <div class="col-md-3">
-                <div class="pull-right">
-                    <div class="btn-group viewDropDown">
-                        <?php if (count($allCanvas) > 0 && !empty($statusLabels)) {?>
-                            <?php if ($filter['status'] == 'all') { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-filter"></i> <?=$tpl->__("status.all") ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } else { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw <?=$tpl->__($statusLabels[$filter['status']]['icon']) ?>"></i> <?=$statusLabels[$filter['status']]['title'] ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } ?>
-                            <ul class="dropdown-menu">
-                                <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_status=all" <?php if ($filter['status'] == 'all') {
-                                    ?>class="active" <?php
-                                    } ?>><i class="fas fa-globe"></i> <?=$tpl->__("status.all") ?></a></li>
-                                <?php foreach ($statusLabels as $key => $data) { ?>
-                                    <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_status=<?=$key ?>" <?php if ($filter['status'] == $key) {
-                                        ?>class="active" <?php
-                                        } ?>><i class="fas fa-fw <?=$data['icon'] ?>"></i> <?=$data['title'] ?></a></li>
-                                <?php } ?>
-                            </ul>
-                        <?php } ?>
-                    </div>
-
-                    <div class="btn-group viewDropDown">
-                        <?php if (count($allCanvas) > 0 && !empty($relatesLabels)) {?>
-                            <?php if ($filter['relates'] == 'all') { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw fa-globe"></i> <?=$tpl->__("relates.all") ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } else { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw <?=$tpl->__($relatesLabels[$filter['relates']]['icon']) ?>"></i> <?=$relatesLabels[$filter['relates']]['title'] ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } ?>
-                            <ul class="dropdown-menu">
-                                <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_relates=all" <?php if ($filter['relates'] == 'all') {
-                                    ?>class="active" <?php
-                                    } ?>><i class="fas fa-globe"></i> <?=$tpl->__("relates.all") ?></a></li>
-                                <?php foreach ($relatesLabels as $key => $data) { ?>
-                                    <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_relates=<?=$key ?>" <?php if ($filter['relates'] == $key) {
-                                        ?>class="active" <?php
-                                        } ?>><i class="fas fa-fw <?=$data['icon'] ?>"></i> <?=$data['title'] ?></a></li>
-                                <?php } ?>
-                            </ul>
-                        <?php } ?>
-                    </div>
-
-                </div>
-            </div>
-
-        </div>
-
-        <div class="clearfix"></div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <?php if (count($tpl->get('allCanvas')) > 0) { ?>
-        <div id="sortableCanvasKanban" class="sortableTicketList disabled" style="padding-top:15px;">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="row">
-                        <?php foreach ($canvasItems as $row) {
-                            $filterStatus = $filter['status'] ?? 'all';
-                            $filterRelates = $filter['relates'] ?? 'all';
-
-                            if (
-                                $row['box'] === $elementName && ($filterStatus == 'all' ||
-                                $filterStatus == $row['status']) && ($filterRelates == 'all' ||
-                                $filterRelates == $row['relates'])
-                            ) {
-                                $comments = app()->make(\Leantime\Domain\Comments\Repositories\Comments::class);
-                                $nbcomments = $comments->countComments(moduleId: $row['id']);
-                                ?>
-                            <div class="col-md-4">
-                                <div class="ticketBox" id="item_<?php echo $row["id"];?>">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <div class="inlineDropDownContainer" style="float:right;">
-
-                                            <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                                                <a href="javascript:void(0)" class="dropdown-toggle ticketDropDown" data-toggle="dropdown">
-                                                    <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
-                                                </a>
-                                            <?php } ?>
-
-
-                                            <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                                                &nbsp;&nbsp;&nbsp;
-                                                <ul class="dropdown-menu">
-                                                    <li class="nav-header"><?=$tpl->__("subtitles.edit"); ?></li>
-                                                    <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasItem/<?php echo $row["id"];?>"
-                                                           class="<?=$canvasName ?>CanvasModal"
-                                                           data="item_<?php echo $row["id"];?>"> <?=$tpl->__("links.edit_canvas_item"); ?></a></li>
-                                                    <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/delCanvasItem/<?php echo $row["id"]; ?>"
-                                                           class="delete <?=$canvasName ?>CanvasModal"
-                                                           data="item_<?php echo $row["id"];?>"> <?=$tpl->__("links.delete_canvas_item"); ?></a></li>
-                                                </ul>
-                                            <?php } ?>
-                                        </div>
-
-                                        <h4><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasItem/<?=$row["id"];?>"
-                                               class="<?=$canvasName ?>CanvasModal"
-                                               data="item_<?=$row['id'] ?>"><?php $tpl->e($row["description"]);?></a></h4>
-                                        <br />
-                                        <?=$tpl->escape($row["assumptions"]) ?>
-                                        <br />
-
-                                        <?php
-                                        if ($row["conclusion"] != 0 && is_numeric($row["data"]) && is_numeric($row["conclusion"])) {
-                                            $percentDone = round($row["data"] / $row["conclusion"] * 100, 2);
-                                        } else {
-                                            $percentDone = 0;
-                                        }
-
-                                        ?>
-
-
-                                        <div class="row" style="padding-bottom:0px;">
-
-                                            <div class="col-md-4">
-                                                <small><?=$tpl->__('label.current') ?>: <?=$row["data"] ?></small>
-                                            </div>
-                                            <div class="col-md-4">
-                                                <small><?=sprintf($tpl->__("text.percent_complete"), $percentDone); ?></small>
-                                            </div>
-                                            <div class="col-md-4" style="text-align:right">
-                                                <small><?=$tpl->__('label.goal') ?>: <?=$row["conclusion"] ?></small>
-                                            </div>
-                                        </div>
-                                        <div class="progress">
-                                            <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $percentDone; ?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $percentDone; ?>%">
-                                                <span class="sr-only"><?=sprintf($tpl->__("text.percent_complete"), $percentDone)?></span>
-                                            </div>
-                                        </div>
-
-                                        <div class="clearfix" style="padding-bottom: 8px;"></div>
-
-                                        <?php if (!empty($statusLabels)) { ?>
-                                            <div class="dropdown ticketDropdown statusDropdown colorized show firstDropdown">
-                                                <a class="dropdown-toggle f-left status label-<?=$statusLabels[$row['status']]['dropdown'] ?>"
-                                                   href="javascript:void(0);" role="button"
-                                                   id="statusDropdownMenuLink<?=$row['id']?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    <span class="text"><?=$statusLabels[$row['status']]['title'] ?></span> <i class="fa fa-caret-down"
-                                                                                                                              aria-hidden="true"></i>
-                                                </a>
-                                                <ul class="dropdown-menu" aria-labelledby="statusDropdownMenuLink<?=$row['id']?>">
-                                                    <li class="nav-header border"><?=$tpl->__("dropdown.choose_status")?></li>
-                                                    <?php foreach ($statusLabels as $key => $data) { ?>
-                                                        <?php if ($data['active'] || true) { ?>
-                                                            <li class='dropdown-item'>
-                                                                <a href="javascript:void(0);" class="label-<?=$data['dropdown'] ?>"
-                                                                   data-label='<?=$data["title"] ?>' data-value="<?=$row['id'] . "/" . $key ?>"
-                                                                   id="ticketStatusChange<?=$row['id'] . $key ?>"><?=$data['title'] ?></a>
-                                                            </li>
-                                                        <?php } ?>
-                                                    <?php } ?>
-                                                </ul>
-                                            </div>
-                                        <?php } ?>
-
-                                        <?php if (!empty($relatesLabels)) {  ?>
-                                            <div class="dropdown ticketDropdown relatesDropdown colorized show firstDropdown">
-                                                <a class="dropdown-toggle f-left relates label-<?=$relatesLabels[$row['relates']]['dropdown'] ?>"
-                                                   href="javascript:void(0);" role="button"
-                                                   id="relatesDropdownMenuLink<?=$row['id']?>" data-toggle="dropdown" aria-haspopup="true"
-                                                   aria-expanded="false">
-                                                    <span class="text"><?=$relatesLabels[$row['relates']]['title'] ?></span> <i class="fa fa-caret-down"
-                                                                                                                                aria-hidden="true"></i>
-                                                </a>
-                                                <ul class="dropdown-menu" aria-labelledby="relatesDropdownMenuLink<?=$row['id']?>">
-                                                    <li class="nav-header border"><?=$tpl->__("dropdown.choose_relates")?></li>
-                                                    <?php foreach ($relatesLabels as $key => $data) { ?>
-                                                        <?php if ($data['active'] || true) { ?>
-                                                            <li class='dropdown-item'>
-                                                                <a href="javascript:void(0);" class="label-<?=$data['dropdown'] ?>"
-                                                                   data-label='<?=$data["title"] ?>'
-                                                                   data-value="<?=$row['id'] . "/" . $key ?>"
-                                                                   id="ticketRelatesChange<?=$row['id'] . $key ?>"><?=$data['title'] ?></a>
-                                                            </li>
-                                                        <?php } ?>
-                                                    <?php } ?>
-                                                </ul>
-                                            </div>
-                                        <?php } ?>
-
-
-                                        <div class="dropdown ticketDropdown userDropdown noBg show right lastDropdown dropRight">
-                                            <a class="dropdown-toggle f-left" href="javascript:void(0);" role="button" id="userDropdownMenuLink<?=$row['id']?>"
-                                               data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <span class="text">
-                                                    <?php if ($row["authorFirstname"] != "") {
-                                                        echo "<span id='userImage" . $row['id'] . "'>" .
-                                                            "<img src='" . BASE_URL . "/api/users?profileImage=" . $row['author'] . "' width='25' " .
-                                                            "style='vertical-align: middle;'/></span><span id='user" . $row['id'] . "'></span>";
-                                                    } else {
-                                                        echo "<span id='userImage" . $row['id'] . "'><img src='" . BASE_URL .
-                                                        "/api/users?profileImage=false' width='25' " .
-                                                        "style='vertical-align: middle;'/></span><span id='user" . $row['id'] . "'></span>";
-                                                    } ?>
-                                                </span>
-                                            </a>
-                                            <ul class="dropdown-menu" aria-labelledby="userDropdownMenuLink<?=$row['id']?>">
-                                                <li class="nav-header border"><?=$tpl->__("dropdown.choose_user")?></li>
-                                                    <?php foreach ($tpl->get('users') as $user) {
-                                                        echo "<li class='dropdown-item'>" .
-                                                        "<a href='javascript:void(0);' data-label='" .
-                                                        sprintf(
-                                                            $tpl->__("text.full_name"),
-                                                            $tpl->escape($user["firstname"]),
-                                                            $tpl->escape($user['lastname'])
-                                                        ) . "' data-value='" . $row['id'] . "_" . $user['id'] . "_" .
-                                                        $user['profileId'] . "' id='userStatusChange" . $row['id'] . $user['id'] . "' ><img src='" .
-                                                        BASE_URL . "/api/users?profileImage=" . $user['id'] . "' width='25' " .
-                                                        "style='vertical-align: middle; margin-right:5px;'/>" .
-                                                        sprintf(
-                                                            $tpl->__("text.full_name"),
-                                                            $tpl->escape($user["firstname"]),
-                                                            $tpl->escape($user['lastname'])
-                                                        ) . "</a>";
-                                                        echo"</li>";
-                                                    }?>
-                                            </ul>
-                                        </div>
-
-                                        <div class="right" style="margin-right:10px;">
-                                            <a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasComment/<?=$row['id'] ?>"
-                                               class="<?=$canvasName ?>CanvasModal" data="item_<?=$row['id'] ?>"
-                                                    <?php echo $nbcomments == 0 ? 'style="color: grey;"' : ''
-                                                    ?>><span class="fas fa-comments"></span></a> <small><?=$nbcomments ?></small>
-                                        </div>
-
-                                    </div>
-                                </div>
-
-                                    <?php if ($row['milestoneHeadline'] != '') {?>
-                                    <hr style="margin-top: 5px; margin-bottom: 5px;"/><small>
-                                        <div class="row">
-                                            <div class="col-md-5" >
-                                                <?php strlen($row['milestoneHeadline']) > 60 ?
-                                                    $tpl->e(substr(($row['milestoneHeadline']), 0, 60) . " ...") :  $tpl->e($row['milestoneHeadline']); ?>
-                                            </div>
-                                            <div class="col-md-7" style="text-align:right">
-                                                <?=sprintf($tpl->__("text.percent_complete"), $row['percentDone'])?>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <div class="progress">
-                                                    <div class="progress-bar progress-bar-success" role="progressbar"
-                                                         aria-valuenow="<?php echo $row['percentDone']; ?>" aria-valuemin="0" aria-valuemax="100"
-                                                         style="width: <?php echo $row['percentDone']; ?>%">
-                                                        <span class="sr-only"><?=sprintf($tpl->__("text.percent_complete"), $row['percentDone'])?></span>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div></small>
-                                    <?php } ?>
-                            </div>
-                            </div>
-                            <?php } ?>
-                        <?php } ?>
-
-                    </div>
-                    <br />
-
-
-
-                </div>
-            </div>
-        </div>
-
-        <?php if (count($canvasItems) == 0) {
-            echo "<br /><br /><div class='center'>";
-
-                echo "<div class='svgContainer'>";
-                    echo file_get_contents(ROOT . "/dist/images/svg/undraw_design_data_khdb.svg");
-                    echo "</div>";
-
-                echo"<h3>" . $tpl->__("headlines.goal.analysis") . "</h3>";
-                echo "<br />" . $tpl->__("text.goal.helper_content");
-
-
-                echo"</div>";
-         } ?>
-
-
-        <div class="clearfix"></div>
-    <?php } ?>
-
- */
-
-echo $tpl->viewFactory->make(
-    $tpl->getTemplatePath('canvas', 'showCanvasBottom'),
-    array_merge($__data, ['canvasName' => 'goal'])
-)->render(); ?>
diff --git a/app/Domain/Goalcanvas/Templates/delCanvas.blade.php b/app/Domain/Goalcanvas/Templates/delCanvas.blade.php
new file mode 100644
index 0000000000..4ad4588393
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/delCanvas.blade.php
@@ -0,0 +1,15 @@
+@extends($layout) 
+@section('content')
+
+<h4 class="widgettitle title-light">{!!__("subtitles.delete") !!}</h4>
+
+<form method="post" action="{{ BASE_URL."/goalcanvas/delCanvas/$id" }}">
+    @if(isset($csrf_token))
+        <input type="hidden" name="csrf_token" value="{{ $csrf_token }}">
+    @endif
+    <p>{{ __('text.confirm_board_deletion') }}</p><br />
+    <input type="submit" value="{{ __('buttons.yes_delete') }}" name="del" class="button" />
+    <a class="btn btn-secondary" href="{{ BASE_URL."/goalcanvas/showCanvas" }}">{{ __('buttons.back') }}</a>
+</form>
+
+@endsection
\ No newline at end of file
diff --git a/app/Domain/Goalcanvas/Templates/delCanvas.tpl.php b/app/Domain/Goalcanvas/Templates/delCanvas.tpl.php
deleted file mode 100644
index 608a99bf40..0000000000
--- a/app/Domain/Goalcanvas/Templates/delCanvas.tpl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Delete Canvas
- */
-
-foreach ($__data as $var => $val) {
-    $$var = $val; // necessary for blade refactor
-}
-echo $tpl->viewFactory->make(
-    $tpl->getTemplatePath('canvas', 'delCanvas'),
-    array_merge($__data, ['canvasName' => 'goal'])
-)->render();
diff --git a/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php b/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php
new file mode 100644
index 0000000000..455a37ed6b
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php
@@ -0,0 +1,12 @@
+@extends($layout)
+@section('content')
+
+<h4 class="widgettitle title-light">{!! __("subtitles.delete") !!}</h4>
+<hr style="margin-top: 5px; margin-bottom: 15px;">
+
+<form method="post" action="{{ BASE_URL }}/goalcanvas/delCanvasItem/{{ $id }}">
+    <p>{{ __('text.confirm_board_item_deletion') }}</p><br />
+    <input type="submit" value="{{ __('buttons.yes_delete') }}" name="del" class="button" />
+    <a class="btn btn-secondary" href="{{ BASE_URL }}/goalcanvas/showCanvas">{{ __('buttons.back') }}</a>
+</form>
+@endsection
diff --git a/app/Domain/Goalcanvas/Templates/delCanvasItem.tpl.php b/app/Domain/Goalcanvas/Templates/delCanvasItem.tpl.php
deleted file mode 100644
index 155d8a1b4c..0000000000
--- a/app/Domain/Goalcanvas/Templates/delCanvasItem.tpl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Delete Item
- */
-
-foreach ($__data as $var => $val) {
-    $$var = $val; // necessary for blade refactor
-}
-echo $tpl->viewFactory->make(
-    $tpl->getTemplatePath('canvas', 'delCanvasItem'),
-    array_merge($__data, ['canvasName' => 'goal'])
-)->render();
diff --git a/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php b/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php
new file mode 100644
index 0000000000..eb952ac662
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php
@@ -0,0 +1,66 @@
+@if (count($allCanvas) > 0)
+@else
+    <br /><br />
+    <div class='center'>
+        <div class='svgContainer'>
+            {!! file_get_contents(ROOT . '/dist/images/svg/undraw_design_data_khdb.svg') !!}
+        </div>
+
+        <h3>{{ __("headlines.goal.analysis") }}</h3>
+        <br />{{ __("text.goal.helper_content") }}
+
+        @if ($login::userIsAtLeast($roles::$editor))
+            <br /><br />
+            <a href='javascript:void(0)' class='addCanvasLink btn btn-primary'>
+                {{ __('links.icon.create_new_board') }}
+            </a>
+        @endif
+    </div>
+@endif
+
+@if (!empty($disclaimer) && count($allCanvas) > 0)
+    <small class="align-center">{{ $disclaimer }}</small>
+@endif
+
+{!! $tpl->viewFactory->make($tpl->getTemplatePath('canvas', 'modals'), $__data)->render() !!}
+</div>
+</div>
+
+
+<script type="text/javascript">
+  jQuery(document).ready(function() {
+
+      if (jQuery('#searchCanvas').length > 0) {
+          new SlimSelect({
+              select: '#searchCanvas'
+          });
+      }
+
+      leantime.goalCanvasController.setRowHeights();
+      leantime.canvasController.setCanvasName('goal');
+      leantime.canvasController.initFilterBar();
+
+      @if ($login::userIsAtLeast($roles::$editor))
+      leantime.canvasController.initCanvasLinks();
+      leantime.canvasController.initUserDropdown();
+      leantime.canvasController.initStatusDropdown();
+      leantime.canvasController.initRelatesDropdown();
+      @else
+      leantime.authController.makeInputReadonly(".maincontentinner");
+      @endif
+
+      @if (isset($_GET['showModal']))
+          @php
+              if ($_GET['showModal'] == "") {
+                  $modalUrl = "&type=" . array_key_first($canvasTypes);
+              } else {
+                  $modalUrl = "/" . (int)$_GET['showModal'];
+              }
+          @endphp
+      leantime.canvasController.openModalManually(
+          "{{ BASE_URL }}/goalcanvas/editCanvasItem{{ $modalUrl }}");
+      window.history.pushState({}, document.title, '{{ BASE_URL }}/goalcanvas/showCanvas/');
+      @endif
+
+  });
+</script>
diff --git a/app/Domain/Goalcanvas/Templates/showCanvas.blade.php b/app/Domain/Goalcanvas/Templates/showCanvas.blade.php
new file mode 100644
index 0000000000..881d6de6c3
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/showCanvas.blade.php
@@ -0,0 +1,488 @@
+@extends($layout)
+@section('content')
+
+
+    @php
+        $elementName = 'goal';
+
+    @endphp
+
+    @php
+
+        $canvasTitle = '';
+
+        //get canvas title
+        foreach ($allCanvas as $canvasRow) {
+            if ($canvasRow['id'] == $currentCanvas) {
+                $canvasTitle = $canvasRow['title'];
+                break;
+            }
+        }
+
+        $tpl->assign('canvasTitle', $canvasTitle);
+
+    @endphp
+    <style>
+        .canvas-row {
+            margin-left: 0px;
+            margin-right: 0px;
+        }
+
+        .canvas-title-only {
+            border-radius: var(--box-radius-small);
+        }
+
+        h4.canvas-element-title-empty {
+            background: white !important;
+            border-color: white !important;
+        }
+
+        div.canvas-element-center-middle {
+            text-align: center;
+        }
+    </style>
+
+    <div class="pageheader">
+        <div class="pageicon"><span class="fas {{ $canvasIcon }}"></span></div>
+        <div class="pagetitle">
+            <h5>{{ session('currentProjectClient') . ' // ' . session('currentProjectName') }}</h5>
+            @if (count($allCanvas) > 0)
+                <span class="dropdown dropdownWrapper headerEditDropdown">
+                    <a href="javascript:void(0)" class="dropdown-toggle btn btn-transparent" data-toggle="dropdown"><i
+                            class="fa-solid fa-ellipsis-v"></i></a>
+                    <ul class="dropdown-menu editCanvasDropdown">
+                        @if ($login::userIsAtLeast($roles::$editor))
+                            <li><a href="#/goalcanvas/bigRock/{{ $currentCanvas }}">{{ __('links.icon.edit') }}</a></li>
+                            <li><a href="javascript:void(0)" class="cloneCanvasLink ">{{ __('links.icon.clone') }}</a></li>
+                            <li><a href="javascript:void(0)" class="mergeCanvasLink ">{{ __('links.icon.merge') }}</a></li>
+                            <li><a href="javascript:void(0)" class="importCanvasLink ">{{ __('links.icon.import') }}</a>
+                            </li>
+                        @endif
+                        <li><a
+                                href="{{ BASE_URL }} /goalcanvas/export/{{ $currentCanvas }}">{{ __('links.icon.export') }}</a>
+                        </li>
+                        <li><a href="javascript:window.print();">{{ __('links.icon.print') }}</a></li>
+                        @if ($login::userIsAtLeast($roles::$editor))
+                            <li><a href="#/goalcanvas/delCanvas/{{ $currentCanvas }}"
+                                    class="delete">{{ __('links.icon.delete') }}</a></li>
+                        @endif
+                    </ul>
+                </span>
+            @endif
+            <h1>{{ __('headline.goal.board') }} //
+                @if (count($allCanvas) > 0)
+                    <span class="dropdown dropdownWrapper">
+                        <a href="javascript:void(0);" class="dropdown-toggle header-title-dropdown" data-toggle="dropdown">
+                            {{ $canvasTitle }}&nbsp;<i class="fa fa-caret-down"></i>
+                        </a>
+
+                        <ul class="dropdown-menu canvasSelector">
+                            @if ($login::userIsAtLeast($roles::$editor))
+                                <li><a href="#/goalcanvas/bigRock">{{ __('links.icon.create_new_bigrock') }}</a></li>
+                            @endif
+                            <li class="border"></li>
+                            @foreach ($allCanvas as $canvasRow)
+                                <li><a
+                                        href='{{ BASE_URL }} /goalcanvas/showCanvas/{{ $canvasRow['id'] }}'>{{ $canvasRow['title'] }}</a>
+                                </li>
+                            @endforeach
+                        </ul>
+                    </span>
+                @endif
+            </h1>
+        </div>
+    </div>
+    <!--pageheader-->
+
+    <div class="maincontent">
+        <div class="maincontentinner">
+
+            <?php echo $tpl->displayNotification(); ?>
+
+            <div class="row">
+                <div class="col-md-3">
+                    @if ($login::userIsAtLeast($roles::$editor) && count($canvasTypes) == 1 && count($allCanvas) > 0)
+                        <a href="#/goalcanvas/editCanvasItem?type={{ $elementName }}" class="btn btn-primary"
+                            id="{{ $elementName }}">{!! __('links.add_new_canvas_itemgoal') !!}</a>
+                    @endif
+                </div>
+
+                <div class="col-md-6 center">
+                </div>
+
+                <div class="col-md-3">
+                    <div class="pull-right">
+                        <div class="btn-group viewDropDown">
+                            @if (count($allCanvas) > 0 && !empty($statusLabels))
+                                @if ($filter['status'] == 'all')
+                                    <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-filter"></i>
+                                        {!! __('status.all') !!} {!! __('links.view') !!}</button>
+                                @else
+                                    <button class="btn dropdown-toggle" data-toggle="dropdown"><i
+                                            class="fas fa-fw {{ __($statusLabels[$filter['status']]['icon']) }}"></i>
+                                        {{ $statusLabels[$filter['status']]['title'] }} {{ __('links.view') }}</button>
+                                @endif
+                                <ul class="dropdown-menu">
+                                    <li><a href="{{ BASE_URL }} /goalcanvas/showCanvas?filter_status=all" @if ($filter['status'] == 'all')
+                                            class="active"
+                            @endif><i class="fas fa-globe"></i> {{ __('status.all') }}</a></li>
+                            @foreach ($statusLabels as $key => $data)
+                                <li><a href="{{ BASE_URL }} /goalcanvas/showCanvas?filter_status={{ $key }}"
+                                        @if ($filter['status'] == $key)
+                                        class="active"
+                            @endif><i class="fas fa-fw {{ $data['icon'] }}"></i>
+                            {{ $data['title'] }}</a></li>
+                            @endforeach
+                            </ul>
+                            @endif
+                        </div>
+
+                        <div class="btn-group viewDropDown">
+                            @if (count($allCanvas) > 0 && !empty($relatesLabels))
+                                @if ($filter['relates'] == 'all')
+                                    <button class="btn dropdown-toggle" data-toggle="dropdown"><i
+                                            class="fas fa-fw fa-globe"></i> {{ __('relates.all') }}
+                                        {{ __('links.view') }}</button>
+                                @else
+                                    <button class="btn dropdown-toggle" data-toggle="dropdown"><i
+                                            class="fas fa-fw {{ __($relatesLabels[$filter['relates']]['icon']) }}"></i>
+                                        {{ $relatesLabels[$filter['relates']]['title'] }} {{ __('links.view') }}</button>
+                                @endif
+                                <ul class="dropdown-menu">
+                                    <li><a href="{{ BASE_URL }} /goalcanvas/showCanvas?filter_relates=all" @if ($filter['relates'] == 'all')
+                                            class="active"
+                            @endif><i class="fas fa-globe"></i> {{ __('relates.all') }}</a></li>
+                            @foreach ($relatesLabels as $key => $data)
+                                <li><a href="{{ BASE_URL }} /goalcanvas/showCanvas?filter_relates={{ $key }}"
+                                        @if ($filter['relates'] == $key)
+                                        class="active"
+                            @endif><i class="fas fa-fw {{ $data['icon'] }}"></i>
+                            {{ $data['title'] }}</a></li>
+                            @endforeach
+                            </ul>
+                            @endif
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="clearfix"></div>
+
+
+            @if (count($allCanvas) > 0)
+                <div id="sortableCanvasKanban" class="sortableTicketList disabled" style="padding-top:15px;">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="row">
+                                @foreach ($canvasItems as $row)
+                                    @php
+                                        $filterStatus = $filter['status'] ?? 'all';
+                                        $filterRelates = $filter['relates'] ?? 'all';
+                                    @endphp
+
+                                    @if (
+                                        $row['box'] === $elementName &&
+                                            ($filterStatus == 'all' || $filterStatus == $row['status']) &&
+                                            ($filterRelates == 'all' || $filterRelates == $row['relates']))
+                                        @php
+                                            $comments = app()->make(Comments::class);
+                                            $nbcomments = $comments->countComments(moduleId: $row['id']);
+                                        @endphp
+                                        <div class="col-md-4">
+                                            <div class="ticketBox" id="item_{{ $row['id'] }}">
+                                                <div class="row">
+                                                    <div class="col-md-12">
+                                                        <div class="inlineDropDownContainer" style="float:right;">
+                                                            @if ($login::userIsAtLeast($roles::$editor))
+                                                                <a href="javascript:void(0)"
+                                                                    class="dropdown-toggle ticketDropDown"
+                                                                    data-toggle="dropdown">
+                                                                    <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                                                </a>
+                                                                <ul class="dropdown-menu">
+                                                                    <li class="nav-header">{{ __('subtitles.edit') }}</li>
+                                                                    <li><a href="#/goalcanvas/editCanvasItem/{{ $row['id'] }}"
+                                                                            data="item_{{ $row['id'] }}">
+                                                                            {{ __('links.edit_canvas_item') }}</a></li>
+                                                                    <li><a href="#/goalcanvas/delCanvasItem/{{ $row['id'] }}"
+                                                                            data="item_{{ $row['id'] }}">
+                                                                            {{ __('links.delete_canvas_item') }}</a></li>
+                                                                </ul>
+                                                            @endif
+                                                        </div>
+
+                                                        <h4><strong>Goal:</strong> <a
+                                                                href="#/goalcanvas/editCanvasItem/{{ $row['id'] }}"
+                                                                data="item_{{ $row['id'] }}">{{ $row['title'] }}</a>
+                                                        </h4>
+                                                        <br />
+                                                        <strong>Metric:</strong> {{ $row['description'] }}
+                                                        <br /><br />
+
+                                                        @php
+                                                            $percentDone = $row['goalProgress'];
+                                                            $metricTypeFront = '';
+                                                            $metricTypeBack = '';
+                                                            if ($row['metricType'] == 'percent') {
+                                                                $metricTypeBack = '%';
+                                                            } elseif ($row['metricType'] == 'currency') {
+                                                                $metricTypeFront = __('language.currency');
+                                                            }
+                                                        @endphp
+
+                                                        <div class="row">
+                                                            <div class="col-md-4"></div>
+                                                            <div class="col-md4 center">
+                                                                <small>{{ sprintf(__('text.percent_complete'), $percentDone) }}</small>
+                                                            </div>
+                                                            <div class="col-md-4"></div>
+                                                        </div>
+                                                        <div class="progress" style="margin-bottom:0px;">
+                                                            <div class="progress-bar progress-bar-success"
+                                                                role="progressbar" aria-valuenow="{{ $percentDone }}"
+                                                                aria-valuemin="0" aria-valuemax="100"
+                                                                style="width: {{ $percentDone }}%">
+                                                                <span
+                                                                    class="sr-only">{{ sprintf(__('text.percent_complete'), $percentDone) }}</span>
+                                                            </div>
+                                                        </div>
+                                                        <div class="row" style="padding-bottom:0px;">
+                                                            <div class="col-md-4">
+                                                                <small>Start:<br />{{ $metricTypeFront . $row['startValue'] . $metricTypeBack }}</small>
+                                                            </div>
+                                                            <div class="col-md-4 center">
+                                                                <small>{{ __('label.current') }}:<br />{{ $metricTypeFront . $row['currentValue'] . $metricTypeBack }}</small>
+                                                            </div>
+                                                            <div class="col-md-4" style="text-align:right">
+                                                                <small>{{ __('label.goal') }}:<br />{{ $metricTypeFront . $row['endValue'] . $metricTypeBack }}</small>
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="clearfix" style="padding-bottom: 8px;"></div>
+
+                                                        @if (!empty($statusLabels))
+                                                            <div
+                                                                class="dropdown ticketDropdown statusDropdown colorized show firstDropdown">
+                                                                <a class="dropdown-toggle f-left status label-{{ $row['status'] != '' ? $statusLabels[$row['status']]['dropdown'] : '' }}"
+                                                                    href="javascript:void(0);" role="button"
+                                                                    id="statusDropdownMenuLink{{ $row['id'] }}"
+                                                                    data-toggle="dropdown" aria-haspopup="true"
+                                                                    aria-expanded="false">
+                                                                    <span
+                                                                        class="text">{{ $row['status'] != '' ? $statusLabels[$row['status']]['title'] : '' }}</span>
+                                                                    <i class="fa fa-caret-down" aria-hidden="true"></i>
+                                                                </a>
+                                                                <ul class="dropdown-menu"
+                                                                    aria-labelledby="statusDropdownMenuLink{{ $row['id'] }}">
+                                                                    <li class="nav-header border">
+                                                                        {{ __('dropdown.choose_status') }}</li>
+                                                                    @foreach ($statusLabels as $key => $data)
+                                                                        @if ($data['active'] || true)
+                                                                            <li class='dropdown-item'>
+                                                                                <a href="javascript:void(0);"
+                                                                                    class="label-{{ $data['dropdown'] }}"
+                                                                                    data-label='{{ $data['title'] }}'
+                                                                                    data-value="{{ $row['id'] . '/' . $key }}"
+                                                                                    id="ticketStatusChange{{ $row['id'] . $key }}">{{ $data['title'] }}</a>
+                                                                            </li>
+                                                                        @endif
+                                                                    @endforeach
+                                                                </ul>
+                                                            </div>
+                                                        @endif
+
+                                                        @if (!empty($relatesLabels))
+                                                            <div
+                                                                class="dropdown ticketDropdown relatesDropdown colorized show firstDropdown">
+                                                                <a class="dropdown-toggle f-left relates label-{{ $relatesLabels[$row['relates']]['dropdown'] }}"
+                                                                    href="javascript:void(0);" role="button"
+                                                                    id="relatesDropdownMenuLink{{ $row['id'] }}"
+                                                                    data-toggle="dropdown" aria-haspopup="true"
+                                                                    aria-expanded="false">
+                                                                    <span
+                                                                        class="text">{{ $relatesLabels[$row['relates']]['title'] }}</span>
+                                                                    <i class="fa fa-caret-down" aria-hidden="true"></i>
+                                                                </a>
+                                                                <ul class="dropdown-menu"
+                                                                    aria-labelledby="relatesDropdownMenuLink{{ $row['id'] }}">
+                                                                    <li class="nav-header border">
+                                                                        {{ __('dropdown.choose_relates') }}</li>
+                                                                    @foreach ($relatesLabels as $key => $data)
+                                                                        @if ($data['active'] || true)
+                                                                            <li class='dropdown-item'>
+                                                                                <a href="javascript:void(0);"
+                                                                                    class="label-{{ $data['dropdown'] }}"
+                                                                                    data-label='{{ $data['title'] }}'
+                                                                                    data-value="{{ $row['id'] . '/' . $key }}"
+                                                                                    id="ticketRelatesChange{{ $row['id'] . $key }}">{{ $data['title'] }}</a>
+                                                                            </li>
+                                                                        @endif
+                                                                    @endforeach
+                                                                </ul>
+                                                            </div>
+                                                        @endif
+
+                                                        <div
+                                                            class="dropdown ticketDropdown userDropdown noBg show right lastDropdown dropRight">
+                                                            <a class="dropdown-toggle f-left" href="javascript:void(0);"
+                                                                role="button"
+                                                                id="userDropdownMenuLink{{ $row['id'] }}"
+                                                                data-toggle="dropdown" aria-haspopup="true"
+                                                                aria-expanded="false">
+                                                                <span class="text">
+                                                                    @if ($row['authorFirstname'] != '')
+                                                                        <span id='userImage{{ $row['id'] }}'>
+                                                                            <img src='{{ BASE_URL }} /api/users?profileImage={{ $row['author'] }}'
+                                                                                width='25'
+                                                                                style='vertical-align: middle;' />
+                                                                        </span>
+                                                                        <span id='user{{ $row['id'] }}'></span>
+                                                                    @else
+                                                                        <span id='userImage{{ $row['id'] }}'>
+                                                                            <img src='{{ BASE_URL }} /api/users?profileImage=false'
+                                                                                width='25'
+                                                                                style='vertical-align: middle;' />
+                                                                        </span>
+                                                                        <span id='user{{ $row['id'] }}'></span>
+                                                                    @endif
+                                                                </span>
+                                                            </a>
+                                                            <ul class="dropdown-menu"
+                                                                aria-labelledby="userDropdownMenuLink{{ $row['id'] }}">
+                                                                <li class="nav-header border">
+                                                                    {{ __('dropdown.choose_user') }}</li>
+                                                                @foreach ($users as $user)
+                                                                    <li class='dropdown-item'>
+                                                                        <a href='javascript:void(0);'
+                                                                            data-label='{{ sprintf(__('text.full_name'), $user['firstname'], $user['lastname']) }}'
+                                                                            data-value='{{ $row['id'] . '_' . $user['id'] . '_' . $user['profileId'] }}'
+                                                                            id='userStatusChange{{ $row['id'] . $user['id'] }}'>
+                                                                            <img src='{{ BASE_URL }} /api/users?profileImage={{ $user['id'] }}'
+                                                                                width='25'
+                                                                                style='vertical-align: middle; margin-right:5px;' />
+                                                                            {{ sprintf(__('text.full_name'), $user['firstname'], $user['lastname']) }}
+                                                                        </a>
+                                                                    </li>
+                                                                @endforeach
+                                                            </ul>
+                                                        </div>
+
+                                                        <div class="right" style="margin-right:10px;">
+                                                            <a href="#/goalcanvas/editCanvasComment/{{ $row['id'] }}"
+                                                                class="commentCountLink"
+                                                                data="item_{{ $row['id'] }}"><span
+                                                                    class="fas fa-comments"></span></a>
+                                                            <small>{{ $nbcomments }}</small>
+                                                        </div>
+
+                                                    </div>
+                                                </div>
+
+                                                @if ($row['milestoneHeadline'] != '')
+                                                    <br />
+                                                    <div hx-trigger="load" hx-indicator=".htmx-indicator"
+                                                        hx-get="{{ BASE_URL }} /hx/tickets/milestones/showCard?milestoneId={{ $row['milestoneId'] }}">
+                                                        <div class="htmx-indicator">
+                                                            {{ __('label.loading_milestone') }}
+                                                        </div>
+                                                    </div>
+                                                @endif
+                                            </div>
+                                        </div>
+                                    @endif
+                                @endforeach
+                            </div>
+                            <br />
+                        </div>
+                    </div>
+                </div>
+
+                @if (count($canvasItems) == 0)
+                    <br /><br />
+                    <div class='center'>
+                        <div class='svgContainer'>
+                            {!! file_get_contents(ROOT . '/dist/images/svg/undraw_design_data_khdb.svg') !!}
+                        </div>
+                        <h3>{{ __('headlines.goal.analysis') }}</h3>
+                        <br />{!! __('text.goal.helper_content') !!}
+                    </div>
+                @endif
+
+                <div class="clearfix"></div>
+            @endif
+
+
+
+
+            <!-- ShowBottomCanvs -->
+
+
+            @if (count($allCanvas) > 0)
+            @else
+                <br /><br />
+                <div class='center'>
+                    <div class='svgContainer'>
+                        {!! file_get_contents(ROOT . '/dist/images/svg/undraw_design_data_khdb.svg') !!}
+                    </div>
+
+                    <h3>{{ __('headlines.goal.analysis') }}</h3>
+                    <br />{{ __('text.goal.helper_content') }}
+
+                    @if ($login::userIsAtLeast($roles::$editor))
+                        <br /><br />
+                        <a href='javascript:void(0)' class='addCanvasLink btn btn-primary'>
+                            {{ __('links.icon.create_new_board') }}
+                        </a>
+                    @endif
+                </div>
+            @endif
+
+            @if (!empty($disclaimer) && count($allCanvas) > 0)
+                <small class="align-center">{{ $disclaimer }}</small>
+            @endif
+
+            {!! $tpl->viewFactory->make($tpl->getTemplatePath('canvas', 'modals'), $__data)->render() !!}
+        </div>
+    </div>
+
+
+    <script type="text/javascript">
+        jQuery(document).ready(function() {
+            if (jQuery('#searchCanvas').length > 0) {
+                new SlimSelect({
+                    select: '#searchCanvas'
+                });
+            }
+
+            leantime.goalCanvasController.setRowHeights();
+            leantime.canvasController.setCanvasName('goal');
+            leantime.canvasController.initFilterBar();
+
+            @if ($login::userIsAtLeast($roles::$editor))
+                leantime.canvasController.initCanvasLinks();
+                leantime.canvasController.initUserDropdown();
+                leantime.canvasController.initStatusDropdown();
+                leantime.canvasController.initRelatesDropdown();
+            @else
+                leantime.authController.makeInputReadonly(".maincontentinner");
+            @endif
+
+            @if (isset($_GET['showModal']))
+                @php
+                    if ($_GET['showModal'] == '') {
+                        $modalUrl = '&type=' . array_key_first($canvasTypes);
+                    } else {
+                        $modalUrl = '/' . (int) $_GET['showModal'];
+                    }
+                @endphp
+                leantime.canvasController.openModalManually(
+                    "{{ BASE_URL }}/goalcanvas/editCanvasItem{{ $modalUrl }}");
+                window.history.pushState({}, document.title,
+                    '{{ BASE_URL }}/goalcanvas/showCanvas/');
+            @endif
+        });
+    </script>
+
+
+
+@endsection
diff --git a/app/Domain/Goalcanvas/Templates/showCanvas.tpl.php b/app/Domain/Goalcanvas/Templates/showCanvas.tpl.php
deleted file mode 100644
index 2137b1e6a3..0000000000
--- a/app/Domain/Goalcanvas/Templates/showCanvas.tpl.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-
-/**
- * Template
- */
-
-use Leantime\Domain\Comments\Repositories\Comments;
-
-defined('RESTRICTED') or die('Restricted access');
-
-foreach ($__data as $var => $val) {
-    $$var = $val; // necessary for blade refactor
-}
-$canvasName = 'goal';
-$elementName = 'goal';
-
-?>
-
-<?php
-
-$canvasTitle = '';
-$allCanvas = $tpl->get('allCanvas');
-$canvasIcon = $tpl->get('canvasIcon');
-$canvasTypes = $tpl->get('canvasTypes');
-$statusLabels = $statusLabels ?? $tpl->get('statusLabels');
-$relatesLabels = $relatesLabels ?? $tpl->get('relatesLabels');
-$dataLabels = $tpl->get('dataLabels');
-$disclaimer = $tpl->get('disclaimer');
-$canvasItems = $tpl->get('canvasItems');
-
-$filter['status'] = $_GET['filter_status'] ?? (session("filter_status") ?? 'all');
-session(["filter_status" => $filter['status']]);
-$filter['relates'] = $_GET['filter_relates'] ?? (session("filter_relates") ?? 'all');
-session(["filter_relates" => $filter['relates']]);
-
-//get canvas title
-foreach ($tpl->get('allCanvas') as $canvasRow) {
-    if ($canvasRow["id"] == $tpl->get('currentCanvas')) {
-        $canvasTitle = $canvasRow["title"];
-        break;
-    }
-}
-
-$tpl->assign('canvasTitle', $canvasTitle);
-
-?>
-<style>
-    .canvas-row { margin-left: 0px; margin-right: 0px;}
-    .canvas-title-only { border-radius: var(--box-radius-small); }
-    h4.canvas-element-title-empty { background: white !important; border-color: white !important; }
-    div.canvas-element-center-middle { text-align: center; }
-</style>
-
-<div class="pageheader">
-    <div class="pageicon"><span class='fa <?=$canvasIcon ?>'></span></div>
-    <div class="pagetitle">
-        <h5><?php $tpl->e(session("currentProjectClient") . " // " . session("currentProjectName")); ?></h5>
-        <?php if (count($allCanvas) > 0) {?>
-            <span class="dropdown dropdownWrapper headerEditDropdown">
-        <a href="javascript:void(0)" class="dropdown-toggle btn btn-transparent" data-toggle="dropdown"><i class="fa-solid fa-ellipsis-v"></i></a>
-        <ul class="dropdown-menu editCanvasDropdown">
-            <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                <li><a href="#/goalcanvas/bigRock/<?=$tpl->get('currentCanvas')?>"><?=$tpl->__("links.icon.edit") ?></a></li>
-                <li><a href="javascript:void(0)" class="cloneCanvasLink "><?=$tpl->__("links.icon.clone") ?></a></li>
-                <li><a href="javascript:void(0)" class="mergeCanvasLink "><?=$tpl->__("links.icon.merge") ?></a></li>
-                <li><a href="javascript:void(0)" class="importCanvasLink "><?=$tpl->__("links.icon.import") ?></a></li>
-            <?php } ?>
-            <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/export/<?php echo $tpl->get('currentCanvas');?>"><?=$tpl->__("links.icon.export") ?></a></li>
-            <li><a href="javascript:window.print();"><?=$tpl->__("links.icon.print") ?></a></li>
-            <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                <li><a href="#/<?=$canvasName ?>canvas/delCanvas/<?php echo $tpl->get('currentCanvas');?>" class="delete"><?php echo $tpl->__("links.icon.delete") ?></a></li>
-            <?php } ?>
-        </ul>
-        </span>
-        <?php } ?>
-        <h1><?=$tpl->__("headline.$canvasName.board") ?> //
-            <?php if (count($allCanvas) > 0) {?>
-                <span class="dropdown dropdownWrapper">
-                <a href="javascript:void(0);" class="dropdown-toggle header-title-dropdown" data-toggle="dropdown">
-                    <?php $tpl->e($canvasTitle); ?>&nbsp;<i class="fa fa-caret-down"></i>
-                </a>
-
-                <ul class="dropdown-menu canvasSelector">
-                     <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                         <li><a href="#/goalcanvas/bigRock"><?=$tpl->__("links.icon.create_new_bigrock") ?></a></li>
-
-                     <?php } ?>
-                    <li class="border"></li>
-                    <?php
-                    $lastClient = "";
-                    $i = 0;
-                    foreach ($tpl->get('allCanvas') as $canvasRow) {
-                        echo "<li><a href='" . BASE_URL . "/" . $canvasName . "canvas/showCanvas/" . $canvasRow["id"] . "'>" . $tpl->escape($canvasRow["title"]) . "</a></li>";
-                    }
-                    ?>
-                </ul>
-            </span>
-            <?php } ?>
-        </h1>
-    </div>
-</div><!--pageheader-->
-
-<div class="maincontent">
-    <div class="maincontentinner">
-
-        <?php echo $tpl->displayNotification(); ?>
-
-        <div class="row">
-            <div class="col-md-3">
-
-                <?php if ($login::userIsAtLeast($roles::$editor) && count($canvasTypes) == 1 && count($allCanvas) > 0) { ?>
-                    <a href="#/<?=$canvasName ?>canvas/editCanvasItem?type=<?php echo $elementName; ?>"
-                       class="btn btn-primary" id="<?php echo $elementName; ?>"><?=$tpl->__('links.add_new_canvas_item' . $canvasName) ?></a>
-                <?php } ?>
-
-            </div>
-
-            <div class="col-md-6 center">
-
-            </div>
-
-            <div class="col-md-3">
-                <div class="pull-right">
-                    <div class="btn-group viewDropDown">
-                        <?php if (count($allCanvas) > 0 && !empty($statusLabels)) {?>
-                            <?php if ($filter['status'] == 'all') { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-filter"></i> <?=$tpl->__("status.all") ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } else { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw <?=$tpl->__($statusLabels[$filter['status']]['icon']) ?>"></i> <?=$statusLabels[$filter['status']]['title'] ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } ?>
-                            <ul class="dropdown-menu">
-                                <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_status=all" <?php if ($filter['status'] == 'all') {
-                                    ?>class="active" <?php
-                                    } ?>><i class="fas fa-globe"></i> <?=$tpl->__("status.all") ?></a></li>
-                                <?php foreach ($statusLabels as $key => $data) { ?>
-                                    <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_status=<?=$key ?>" <?php if ($filter['status'] == $key) {
-                                        ?>class="active" <?php
-                                        } ?>><i class="fas fa-fw <?=$data['icon'] ?>"></i> <?=$data['title'] ?></a></li>
-                                <?php } ?>
-                            </ul>
-                        <?php } ?>
-                    </div>
-
-                    <div class="btn-group viewDropDown">
-                        <?php if (count($allCanvas) > 0 && !empty($relatesLabels)) {?>
-                            <?php if ($filter['relates'] == 'all') { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw fa-globe"></i> <?=$tpl->__("relates.all") ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } else { ?>
-                                <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fas fa-fw <?=$tpl->__($relatesLabels[$filter['relates']]['icon']) ?>"></i> <?=$relatesLabels[$filter['relates']]['title'] ?> <?=$tpl->__("links.view") ?></button>
-                            <?php } ?>
-                            <ul class="dropdown-menu">
-                                <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_relates=all" <?php if ($filter['relates'] == 'all') {
-                                    ?>class="active" <?php
-                                    } ?>><i class="fas fa-globe"></i> <?=$tpl->__("relates.all") ?></a></li>
-                                <?php foreach ($relatesLabels as $key => $data) { ?>
-                                    <li><a href="<?=BASE_URL ?>/<?=$canvasName ?>canvas/showCanvas?filter_relates=<?=$key ?>" <?php if ($filter['relates'] == $key) {
-                                        ?>class="active" <?php
-                                        } ?>><i class="fas fa-fw <?=$data['icon'] ?>"></i> <?=$data['title'] ?></a></li>
-                                <?php } ?>
-                            </ul>
-                        <?php } ?>
-                    </div>
-
-                </div>
-            </div>
-
-        </div>
-
-        <div class="clearfix"></div>
-
-
-    <?php if (count($tpl->get('allCanvas')) > 0) { ?>
-        <div id="sortableCanvasKanban" class="sortableTicketList disabled" style="padding-top:15px;">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="row">
-                        <?php foreach ($canvasItems as $row) {
-                            $filterStatus = $filter['status'] ?? 'all';
-                            $filterRelates = $filter['relates'] ?? 'all';
-
-                            if (
-                                $row['box'] === $elementName && ($filterStatus == 'all' ||
-                                $filterStatus == $row['status']) && ($filterRelates == 'all' ||
-                                $filterRelates == $row['relates'])
-                            ) {
-                                $comments = app()->make(Comments::class);
-                                $nbcomments = $comments->countComments(moduleId: $row['id']);
-                                ?>
-                            <div class="col-md-4">
-                                <div class="ticketBox" id="item_<?php echo $row["id"];?>">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <div class="inlineDropDownContainer" style="float:right;">
-
-                                            <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                                                <a href="javascript:void(0)" class="dropdown-toggle ticketDropDown" data-toggle="dropdown">
-                                                    <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
-                                                </a>
-                                            <?php } ?>
-
-
-                                            <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
-                                                &nbsp;&nbsp;&nbsp;
-                                                <ul class="dropdown-menu">
-                                                    <li class="nav-header"><?=$tpl->__("subtitles.edit"); ?></li>
-                                                    <li><a href="#/<?=$canvasName ?>canvas/editCanvasItem/<?php echo $row["id"];?>"
-                                                           data="item_<?php echo $row["id"];?>"> <?=$tpl->__("links.edit_canvas_item"); ?></a></li>
-                                                    <li><a href="#/<?=$canvasName ?>canvas/delCanvasItem/<?php echo $row["id"]; ?>"
-
-                                                           data="item_<?php echo $row["id"];?>"> <?=$tpl->__("links.delete_canvas_item"); ?></a></li>
-                                                </ul>
-                                            <?php } ?>
-                                        </div>
-
-                                        <h4><strong>Goal:</strong> <a href="#/<?=$canvasName ?>canvas/editCanvasItem/<?=$row["id"];?>"
-                                               data="item_<?=$row['id'] ?>"><?php $tpl->e($row['title']);?></a></h4>
-                                        <br />
-                                        <strong>Metric:</strong> <?=$tpl->escape($row["description"]) ?>
-                                        <br /><br />
-
-
-
-
-                                        <?php
-
-                                        $percentDone = $row["goalProgress"];
-                                        $metricTypeFront = '';
-                                        $metricTypeBack = '';
-                                        if ($row["metricType"] == "percent") {
-                                            $metricTypeBack = '%';
-                                        } elseif ($row["metricType"] == "currency") {
-                                            $metricTypeFront = $tpl->__("language.currency");
-                                        }
-
-                                        ?>
-
-                                        <div class="row">
-                                            <div class="col-md-4"></div>
-                                            <div class="col-md4 center">
-
-                                                <small><?=sprintf($tpl->__("text.percent_complete"), $percentDone); ?></small>
-                                            </div>
-                                            <div class="col-md-4"></div>
-                                        </div>
-                                        <div class="progress" style="margin-bottom:0px;">
-                                            <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $percentDone; ?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $percentDone; ?>%">
-                                                <span class="sr-only"><?=sprintf($tpl->__("text.percent_complete"), $percentDone)?></span>
-                                            </div>
-                                        </div>
-                                        <div class="row" style="padding-bottom:0px;">
-                                            <div class="col-md-4">
-                                                <small>Start:<br /><?=$metricTypeFront . $row["startValue"] . $metricTypeBack ?></small>
-                                            </div>
-                                            <div class="col-md-4 center">
-                                                <small><?=$tpl->__('label.current') ?>:<br /><?=$metricTypeFront . $row["currentValue"] . $metricTypeBack ?></small>
-                                            </div>
-                                            <div class="col-md-4" style="text-align:right">
-                                                <small><?=$tpl->__('label.goal') ?>:<br /><?=$metricTypeFront . $row["endValue"] . $metricTypeBack ?></small>
-                                            </div>
-                                        </div>
-
-                                        <div class="clearfix" style="padding-bottom: 8px;"></div>
-
-                                        <?php if (!empty($statusLabels)) { ?>
-                                            <div class="dropdown ticketDropdown statusDropdown colorized show firstDropdown">
-                                                <a class="dropdown-toggle f-left status label-<?=$row['status'] != "" ? $statusLabels[$row['status']]['dropdown'] : ''?>"
-                                                   href="javascript:void(0);" role="button"
-                                                   id="statusDropdownMenuLink<?=$row['id']?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                    <span class="text"><?=$row['status'] != "" ? $statusLabels[$row['status']]['title'] : '' ?></span> <i class="fa fa-caret-down"
-                                                                                                                              aria-hidden="true"></i>
-                                                </a>
-                                                <ul class="dropdown-menu" aria-labelledby="statusDropdownMenuLink<?=$row['id']?>">
-                                                    <li class="nav-header border"><?=$tpl->__("dropdown.choose_status")?></li>
-                                                    <?php foreach ($statusLabels as $key => $data) { ?>
-                                                        <?php if ($data['active'] || true) { ?>
-                                                            <li class='dropdown-item'>
-                                                                <a href="javascript:void(0);" class="label-<?=$data['dropdown'] ?>"
-                                                                   data-label='<?=$data["title"] ?>' data-value="<?=$row['id'] . "/" . $key ?>"
-                                                                   id="ticketStatusChange<?=$row['id'] . $key ?>"><?=$data['title'] ?></a>
-                                                            </li>
-                                                        <?php } ?>
-                                                    <?php } ?>
-                                                </ul>
-                                            </div>
-                                        <?php } ?>
-
-                                        <?php if (!empty($relatesLabels)) {  ?>
-                                            <div class="dropdown ticketDropdown relatesDropdown colorized show firstDropdown">
-                                                <a class="dropdown-toggle f-left relates label-<?=$relatesLabels[$row['relates']]['dropdown'] ?>"
-                                                   href="javascript:void(0);" role="button"
-                                                   id="relatesDropdownMenuLink<?=$row['id']?>" data-toggle="dropdown" aria-haspopup="true"
-                                                   aria-expanded="false">
-                                                    <span class="text"><?=$relatesLabels[$row['relates']]['title'] ?></span> <i class="fa fa-caret-down"
-                                                                                                                                aria-hidden="true"></i>
-                                                </a>
-                                                <ul class="dropdown-menu" aria-labelledby="relatesDropdownMenuLink<?=$row['id']?>">
-                                                    <li class="nav-header border"><?=$tpl->__("dropdown.choose_relates")?></li>
-                                                    <?php foreach ($relatesLabels as $key => $data) { ?>
-                                                        <?php if ($data['active'] || true) { ?>
-                                                            <li class='dropdown-item'>
-                                                                <a href="javascript:void(0);" class="label-<?=$data['dropdown'] ?>"
-                                                                   data-label='<?=$data["title"] ?>'
-                                                                   data-value="<?=$row['id'] . "/" . $key ?>"
-                                                                   id="ticketRelatesChange<?=$row['id'] . $key ?>"><?=$data['title'] ?></a>
-                                                            </li>
-                                                        <?php } ?>
-                                                    <?php } ?>
-                                                </ul>
-                                            </div>
-                                        <?php } ?>
-
-
-                                        <div class="dropdown ticketDropdown userDropdown noBg show right lastDropdown dropRight">
-                                            <a class="dropdown-toggle f-left" href="javascript:void(0);" role="button" id="userDropdownMenuLink<?=$row['id']?>"
-                                               data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                <span class="text">
-                                                    <?php if ($row["authorFirstname"] != "") {
-                                                        echo "<span id='userImage" . $row['id'] . "'>" .
-                                                            "<img src='" . BASE_URL . "/api/users?profileImage=" . $row['author'] . "' width='25' " .
-                                                            "style='vertical-align: middle;'/></span><span id='user" . $row['id'] . "'></span>";
-                                                    } else {
-                                                        echo "<span id='userImage" . $row['id'] . "'><img src='" . BASE_URL .
-                                                        "/api/users?profileImage=false' width='25' " .
-                                                        "style='vertical-align: middle;'/></span><span id='user" . $row['id'] . "'></span>";
-                                                    } ?>
-                                                </span>
-                                            </a>
-                                            <ul class="dropdown-menu" aria-labelledby="userDropdownMenuLink<?=$row['id']?>">
-                                                <li class="nav-header border"><?=$tpl->__("dropdown.choose_user")?></li>
-                                                    <?php foreach ($tpl->get('users') as $user) {
-                                                        echo "<li class='dropdown-item'>" .
-                                                        "<a href='javascript:void(0);' data-label='" .
-                                                        sprintf(
-                                                            $tpl->__("text.full_name"),
-                                                            $tpl->escape($user["firstname"]),
-                                                            $tpl->escape($user['lastname'])
-                                                        ) . "' data-value='" . $row['id'] . "_" . $user['id'] . "_" .
-                                                        $user['profileId'] . "' id='userStatusChange" . $row['id'] . $user['id'] . "' ><img src='" .
-                                                        BASE_URL . "/api/users?profileImage=" . $user['id'] . "' width='25' " .
-                                                        "style='vertical-align: middle; margin-right:5px;'/>" .
-                                                        sprintf(
-                                                            $tpl->__("text.full_name"),
-                                                            $tpl->escape($user["firstname"]),
-                                                            $tpl->escape($user['lastname'])
-                                                        ) . "</a>";
-                                                        echo"</li>";
-                                                    }?>
-                                            </ul>
-                                        </div>
-
-                                        <div class="right" style="margin-right:10px;">
-                                            <a href="#/<?=$canvasName ?>canvas/editCanvasComment/<?=$row['id'] ?>"
-                                               class="commentCountLink" data="item_<?=$row['id'] ?>"><span class="fas fa-comments"></span></a> <small><?=$nbcomments ?></small>
-                                        </div>
-
-                                    </div>
-                                </div>
-
-                                    <?php if ($row['milestoneHeadline'] != '') {?>
-                                        <br/>
-                                        <div hx-trigger="load"
-                                             hx-indicator=".htmx-indicator"
-                                             hx-get="<?=BASE_URL ?>/hx/tickets/milestones/showCard?milestoneId=<?=$row['milestoneId'] ?>">
-                                            <div class="htmx-indicator">
-                                                <?=$tpl->__("label.loading_milestone") ?>
-                                            </div>
-                                        </div>
-                                    <?php } ?>
-                            </div>
-                            </div>
-                            <?php } ?>
-                        <?php } ?>
-
-                    </div>
-                    <br />
-
-
-
-                </div>
-            </div>
-        </div>
-
-        <?php if (count($canvasItems) == 0) {
-            echo "<br /><br /><div class='center'>";
-
-            echo "<div class='svgContainer'>";
-            echo file_get_contents(ROOT . "/dist/images/svg/undraw_design_data_khdb.svg");
-            echo "</div>";
-
-            echo"<h3>" . $tpl->__("headlines.goal.analysis") . "</h3>";
-            echo "<br />" . $tpl->__("text.goal.helper_content");
-
-
-            echo"</div>";
-        } ?>
-
-
-        <div class="clearfix"></div>
-    <?php } ?>
-
-<?php echo $tpl->viewFactory->make(
-    $tpl->getTemplatePath('canvas', 'showCanvasBottom'),
-    array_merge($__data, ['canvasName' => 'goal'])
-)->render(); ?>
diff --git a/app/Language/en-US.ini b/app/Language/en-US.ini
index cc0d5e820d..4ef6055233 100644
--- a/app/Language/en-US.ini
+++ b/app/Language/en-US.ini
@@ -2518,6 +2518,16 @@ headlines.set_up_your_account = "Set up your account"
 text.challenges_brings_you_here = "Tell us about the challenge that brings you here."
 text.point_to_where_it_hurts = "🩺 Point to where it hurts"
 
+text.what_metric_will_you_be_using = "How will you measure this objective. What metric will you be using."
+
+label.starting_value = "Starting Value"
+label.currennt_value = "Current Value"
+label.goal_value = "Goal Value"
+label.type = "Type"
+label.number = "Number"
+label.percent = "% Percent"
+
 label.start="start date"
 label.end="end date"
 label.status_lowercase="status"
+
diff --git a/app/helpers.php b/app/helpers.php
index c76d65423a..5a7d462736 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -7,6 +7,7 @@
 use Leantime\Core\Application;
 use Leantime\Core\AppSettings;
 use Leantime\Core\Bootloader;
+use Leantime\Core\IncomingRequest;
 use Leantime\Core\Language;
 use Leantime\Core\Support\Build;
 use Leantime\Core\Support\Cast;
@@ -341,3 +342,27 @@ function storage_path($path = '')
     }
 
 }
+
+if (! function_exists('request')) {
+    /**
+     * Get an instance of the current request or an input item from the request.
+     *
+     * @param  list<string>|string|null  $key
+     * @param  mixed  $default
+     * @return ($key is null ? \Illuminate\Http\Request : ($key is string ? mixed : array<string, mixed>))
+     */
+    function request($key = null, $default = null)
+    {
+        if (is_null($key)) {
+            return app()->make(IncomingRequest::class);
+        }
+
+        if (is_array($key)) {
+            return app()->make(IncomingRequest::class)->only($key);
+        }
+
+        $value = app()->make(IncomingRequest::class)->__get($key);
+
+        return is_null($value) ? value($default) : $value;
+    }
+}
diff --git a/public/dist/mix-manifest.json b/public/dist/mix-manifest.json
index 50ccac5584..37425f04eb 100644
--- a/public/dist/mix-manifest.json
+++ b/public/dist/mix-manifest.json
@@ -66,23 +66,16 @@
     "/images/backgrounds/bg6.png": "/images/backgrounds/bg6.png",
     "/images/backgrounds/bg7.png": "/images/backgrounds/bg7.png",
     "/images/calarrow.png": "/images/calarrow.png",
-    "/images/canvas.PNG": "/images/canvas.PNG",
     "/images/chosen-sprite-light.png": "/images/chosen-sprite-light.png",
     "/images/chosen-sprite-light@2x.png": "/images/chosen-sprite-light@2x.png",
     "/images/chosen-sprite.png": "/images/chosen-sprite.png",
     "/images/close.png": "/images/close.png",
-    "/images/controls.png": "/images/controls.png",
-    "/images/default-user.png": "/images/default-user.png",
     "/images/discord-logo.png": "/images/discord-logo.png",
     "/images/doc.png": "/images/doc.png",
-    "/images/emptyChartBg.png": "/images/emptyChartBg.png",
     "/images/favicon.png": "/images/favicon.png",
-    "/images/glyphicons-halflings-white.png": "/images/glyphicons-halflings-white.png",
-    "/images/glyphicons-halflings.png": "/images/glyphicons-halflings.png",
     "/images/icon-192.png": "/images/icon-192.png",
     "/images/icon-512.png": "/images/icon-512.png",
     "/images/index.html": "/images/index.html",
-    "/images/leantime-no-access.jpg": "/images/leantime-no-access.jpg",
     "/images/loading-animation.svg": "/images/loading-animation.svg",
     "/images/logo-powered-by-leantime.png": "/images/logo-powered-by-leantime.png",
     "/images/logo.png": "/images/logo.png",
@@ -90,6 +83,19 @@
     "/images/logo_blue.png": "/images/logo_blue.png",
     "/images/logo_blue.svg": "/images/logo_blue.svg",
     "/images/mattermost-logoHorizontal.png": "/images/mattermost-logoHorizontal.png",
+    "/images/openid-icon.png": "/images/openid-icon.png",
+    "/images/Screenshots/apps.png": "/images/Screenshots/apps.png",
+    "/images/Screenshots/blueprints.png": "/images/Screenshots/blueprints.png",
+    "/images/Screenshots/calendar.png": "/images/Screenshots/calendar.png",
+    "/images/Screenshots/dark.png": "/images/Screenshots/dark.png",
+    "/images/Screenshots/docs.png": "/images/Screenshots/docs.png",
+    "/images/Screenshots/goals.png": "/images/Screenshots/goals.png",
+    "/images/Screenshots/kanban.png": "/images/Screenshots/kanban.png",
+    "/images/Screenshots/mywork.png": "/images/Screenshots/mywork.png",
+    "/images/Screenshots/projectDashboard.png": "/images/Screenshots/projectDashboard.png",
+    "/images/Screenshots/table.png": "/images/Screenshots/table.png",
+    "/images/Screenshots/timeline.png": "/images/Screenshots/timeline.png",
+    "/images/Screenshots/timesheet.png": "/images/Screenshots/timesheet.png",
     "/images/onboarding/canvasScreen.png": "/images/onboarding/canvasScreen.png",
     "/images/onboarding/ideaScreen.png": "/images/onboarding/ideaScreen.png",
     "/images/onboarding/retroScreen.png": "/images/onboarding/retroScreen.png",
@@ -97,18 +103,14 @@
     "/images/onboarding/todoScreen.png": "/images/onboarding/todoScreen.png",
     "/images/openid-icon.png": "/images/openid-icon.png",
     "/images/spotlightBg.png": "/images/spotlightBg.png",
-    "/images/svg/30h/logo.png": "/images/svg/30h/logo.png",
-    "/images/svg/SVG/logo.svg": "/images/svg/SVG/logo.svg",
     "/images/svg/apps-grid-icon.svg": "/images/svg/apps-grid-icon.svg",
     "/images/svg/csv-icon.svg": "/images/svg/csv-icon.svg",
     "/images/svg/loading-animation.svg": "/images/svg/loading-animation.svg",
-    "/images/svg/logo.svg": "/images/svg/logo.svg",
-    "/images/svg/undraw_Organizing_projects_0p9a.svg": "/images/svg/undraw_Organizing_projects_0p9a.svg",
-    "/images/svg/undraw_a_moment_to_relax_bbpa.svg": "/images/svg/undraw_a_moment_to_relax_bbpa.svg",
     "/images/svg/undraw_adjustments_p22m.svg": "/images/svg/undraw_adjustments_p22m.svg",
     "/images/svg/undraw_adventure_map_hnin.svg": "/images/svg/undraw_adventure_map_hnin.svg",
     "/images/svg/undraw_air_support_re_nybl.svg": "/images/svg/undraw_air_support_re_nybl.svg",
     "/images/svg/undraw_attached_file_re_0n9b.svg": "/images/svg/undraw_attached_file_re_0n9b.svg",
+    "/images/svg/undraw_a_moment_to_relax_bbpa.svg": "/images/svg/undraw_a_moment_to_relax_bbpa.svg",
     "/images/svg/undraw_blooming_re_2kc4.svg": "/images/svg/undraw_blooming_re_2kc4.svg",
     "/images/svg/undraw_book_reading_re_fu2c.svg": "/images/svg/undraw_book_reading_re_fu2c.svg",
     "/images/svg/undraw_business_decisions_re_84ag.svg": "/images/svg/undraw_business_decisions_re_84ag.svg",
@@ -137,8 +139,9 @@
     "/images/svg/undraw_no_data_re_kwbl.svg": "/images/svg/undraw_no_data_re_kwbl.svg",
     "/images/svg/undraw_online_connection_6778.svg": "/images/svg/undraw_online_connection_6778.svg",
     "/images/svg/undraw_online_party_re_7t6g.svg": "/images/svg/undraw_online_party_re_7t6g.svg",
-    "/images/svg/undraw_party_re_nmwj.svg": "/images/svg/undraw_party_re_nmwj.svg",
+    "/images/svg/undraw_Organizing_projects_0p9a.svg": "/images/svg/undraw_Organizing_projects_0p9a.svg",
     "/images/svg/undraw_partying_re_at7f.svg": "/images/svg/undraw_partying_re_at7f.svg",
+    "/images/svg/undraw_party_re_nmwj.svg": "/images/svg/undraw_party_re_nmwj.svg",
     "/images/svg/undraw_photos_re_pvh3.svg": "/images/svg/undraw_photos_re_pvh3.svg",
     "/images/svg/undraw_powerful_re_frhr.svg": "/images/svg/undraw_powerful_re_frhr.svg",
     "/images/svg/undraw_progressive_app_m-9-ms.svg": "/images/svg/undraw_progressive_app_m-9-ms.svg",
@@ -166,32 +169,6 @@
     "/images/throbber.gif": "/images/throbber.gif",
     "/images/undraw_progressive_app_m9ms.png": "/images/undraw_progressive_app_m9ms.png",
     "/images/zulip-org-logo.png": "/images/zulip-org-logo.png",
-    "/fonts/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/Atkinson-Hyperlegible-Bold-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2": "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-Italic-102.ttf": "/fonts/Atkinson-Hyperlegible-Italic-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2",
-    "/fonts/Roboto-Bold.ttf": "/fonts/Roboto-Bold.ttf",
-    "/fonts/Roboto-Bold.woff2": "/fonts/Roboto-Bold.woff2",
-    "/fonts/Roboto-Italic.ttf": "/fonts/Roboto-Italic.ttf",
-    "/fonts/Roboto-Italic.woff2": "/fonts/Roboto-Italic.woff2",
-    "/fonts/Roboto-Light.ttf": "/fonts/Roboto-Light.ttf",
-    "/fonts/Roboto-Light.woff2": "/fonts/Roboto-Light.woff2",
-    "/fonts/Roboto-LightItalic.ttf": "/fonts/Roboto-LightItalic.ttf",
-    "/fonts/Roboto-LightItalic.woff2": "/fonts/Roboto-LightItalic.woff2",
-    "/fonts/Roboto-Medium.ttf": "/fonts/Roboto-Medium.ttf",
-    "/fonts/Roboto-Medium.woff2": "/fonts/Roboto-Medium.woff2",
-    "/fonts/Roboto-MediumItalic.ttf": "/fonts/Roboto-MediumItalic.ttf",
-    "/fonts/Roboto-MediumItalic.woff2": "/fonts/Roboto-MediumItalic.woff2",
-    "/fonts/Roboto-Regular.ttf": "/fonts/Roboto-Regular.ttf",
-    "/fonts/Roboto-Regular.woff2": "/fonts/Roboto-Regular.woff2",
-    "/fonts/Shantell_Sans-Informal_Bold.woff2": "/fonts/Shantell_Sans-Informal_Bold.woff2",
-    "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2",
-    "/fonts/Shantell_Sans-Informal_Regular.woff2": "/fonts/Shantell_Sans-Informal_Regular.woff2",
-    "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2",
     "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102.ttf",
     "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102a.woff2",
     "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102.ttf",
@@ -201,6 +178,14 @@
     "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102a.woff2",
     "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102.ttf",
     "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/Atkinson-Hyperlegible-Bold-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2": "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-Italic-102.ttf": "/fonts/Atkinson-Hyperlegible-Italic-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2",
     "/fonts/fa-brands-400.ttf": "/fonts/fa-brands-400.ttf",
     "/fonts/fa-brands-400.woff2": "/fonts/fa-brands-400.woff2",
     "/fonts/fa-regular-400.ttf": "/fonts/fa-regular-400.ttf",
@@ -235,10 +220,28 @@
     "/fonts/roboto/Roboto-Thin.woff2": "/fonts/roboto/Roboto-Thin.woff2",
     "/fonts/roboto/Roboto-ThinItalic.ttf": "/fonts/roboto/Roboto-ThinItalic.ttf",
     "/fonts/roboto/Roboto-ThinItalic.woff2": "/fonts/roboto/Roboto-ThinItalic.woff2",
+    "/fonts/Roboto-Bold.ttf": "/fonts/Roboto-Bold.ttf",
+    "/fonts/Roboto-Bold.woff2": "/fonts/Roboto-Bold.woff2",
+    "/fonts/Roboto-Italic.ttf": "/fonts/Roboto-Italic.ttf",
+    "/fonts/Roboto-Italic.woff2": "/fonts/Roboto-Italic.woff2",
+    "/fonts/Roboto-Light.ttf": "/fonts/Roboto-Light.ttf",
+    "/fonts/Roboto-Light.woff2": "/fonts/Roboto-Light.woff2",
+    "/fonts/Roboto-LightItalic.ttf": "/fonts/Roboto-LightItalic.ttf",
+    "/fonts/Roboto-LightItalic.woff2": "/fonts/Roboto-LightItalic.woff2",
+    "/fonts/Roboto-Medium.ttf": "/fonts/Roboto-Medium.ttf",
+    "/fonts/Roboto-Medium.woff2": "/fonts/Roboto-Medium.woff2",
+    "/fonts/Roboto-MediumItalic.ttf": "/fonts/Roboto-MediumItalic.ttf",
+    "/fonts/Roboto-MediumItalic.woff2": "/fonts/Roboto-MediumItalic.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Bold.woff2": "/fonts/shantell/Shantell_Sans-Informal_Bold.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Regular.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2",
+
+    "/fonts/Shantell_Sans-Informal_Bold.woff2": "/fonts/Shantell_Sans-Informal_Bold.woff2",
+    "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2",
+    "/fonts/Shantell_Sans-Informal_Regular.woff2": "/fonts/Shantell_Sans-Informal_Regular.woff2",
+    "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2",
+
     "/lottie/leo/Dino.json": "/lottie/leo/Dino.json",
     "/lottie/leo/Loading_Clock_Animation.json": "/lottie/leo/Loading_Clock_Animation.json",
     "/lottie/leo/Lochnes.json": "/lottie/leo/Lochnes.json",
@@ -247,15 +250,24 @@
     "/lottie/leo/Peek_Unicorn.json": "/lottie/leo/Peek_Unicorn.json",
     "/lottie/leo/Rainbow_Unicorn.json": "/lottie/leo/Rainbow_Unicorn.json",
     "/lottie/leo/Rolling LEO.json": "/lottie/leo/Rolling LEO.json",
+
     "/lottie/leo/announcement.json": "/lottie/leo/announcement.json",
+    "/lottie/leo/Dino.json": "/lottie/leo/Dino.json",
     "/lottie/leo/exclamation.json": "/lottie/leo/exclamation.json",
     "/lottie/leo/happy.json": "/lottie/leo/happy.json",
     "/lottie/leo/heart.json": "/lottie/leo/heart.json",
     "/lottie/leo/in-robo.json": "/lottie/leo/in-robo.json",
     "/lottie/leo/king_arthur.json": "/lottie/leo/king_arthur.json",
+    "/lottie/leo/Loading_Clock_Animation.json": "/lottie/leo/Loading_Clock_Animation.json",
+    "/lottie/leo/Lochnes.json": "/lottie/leo/Lochnes.json",
+    "/lottie/leo/Mermaid.json": "/lottie/leo/Mermaid.json",
     "/lottie/leo/motivational_speaker.json": "/lottie/leo/motivational_speaker.json",
+    "/lottie/leo/Narhwal.json": "/lottie/leo/Narhwal.json",
     "/lottie/leo/peaking.json": "/lottie/leo/peaking.json",
+    "/lottie/leo/Peek_Unicorn.json": "/lottie/leo/Peek_Unicorn.json",
     "/lottie/leo/pirate.json": "/lottie/leo/pirate.json",
+    "/lottie/leo/Rainbow_Unicorn.json": "/lottie/leo/Rainbow_Unicorn.json",
+    "/lottie/leo/Rolling LEO.json": "/lottie/leo/Rolling LEO.json",
     "/lottie/leo/sleep.json": "/lottie/leo/sleep.json",
     "/lottie/leo/smoking.json": "/lottie/leo/smoking.json",
     "/lottie/leo/still.json": "/lottie/leo/still.json",