diff --git a/app/Domain/Goalcanvas/Hxcontrollers/GoalcanvasCard.php b/app/Domain/Goalcanvas/Hxcontrollers/Canvas.php
similarity index 67%
rename from app/Domain/Goalcanvas/Hxcontrollers/GoalcanvasCard.php
rename to app/Domain/Goalcanvas/Hxcontrollers/Canvas.php
index d8dd7584d..eab525e53 100644
--- a/app/Domain/Goalcanvas/Hxcontrollers/GoalcanvasCard.php
+++ b/app/Domain/Goalcanvas/Hxcontrollers/Canvas.php
@@ -3,22 +3,22 @@
 namespace Leantime\Domain\Goalcanvas\Hxcontrollers;
 
 use Leantime\Core\Controller\HtmxController;
-use Leantime\Domain\Goalcanvas\Services\Goalcanvas;
+use Leantime\Domain\Goalcanvas\Services\Goalcanvas as GoalcanvasService;
 use Leantime\Domain\Projects\Services\Projects;
 
 
-class GoalcanvasCard extends HtmxController
+class Canvas extends HtmxController
 {
-  protected static string $view = 'goalcanvas::partials.goalCanvasCard';
+  protected static string $view = 'goalcanvas::components.canvas';
 
-  private Goalcanvas $goalService;
+  private GoalcanvasService $goalService;
   private Projects $projectService;
 
   /**
    * Controller constructor
    *
    */
-  public function init(Goalcanvas $goalService, Projects $projectService): void
+  public function init(GoalcanvasService $goalService, Projects $projectService): void
   {
     $this->goalService = $goalService;
     $this->projectService = $projectService;
@@ -34,9 +34,12 @@ public function get($params): void
     $statusLabels = $this->goalService->getGoalStatusLabels();
     $relatesLabels = $this->goalService->getGoalRelatesLabels();
     $users = $this->projectService->getUsersAssignedToProject(session('currentProject'));
+    $canvasItems = $this->goalService->getCanvasItemsById($id);
+
     $this->tpl->assign('canvas', $canvas);
     $this->tpl->assign('statusLabels', $statusLabels);
     $this->tpl->assign('relatesLabels', $relatesLabels);
     $this->tpl->assign('users', $users);
+    $this->tpl->assign('goalItems', $canvasItems);
   }
 }
diff --git a/app/Domain/Goalcanvas/Templates/components/canvas.blade.php b/app/Domain/Goalcanvas/Templates/components/canvas.blade.php
new file mode 100644
index 000000000..a6e18091b
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/components/canvas.blade.php
@@ -0,0 +1,56 @@
+
+@props([
+    'canvasId' => '',
+    'canvasTitle' => '',
+    'goalItems' => [],
+    'statusLabels' => [],
+    'relatesLabels' => [],
+    'users' => [],
+    'id' => '',
+])
+
+@if (empty($id) == false)
+    <div hx-get="{{ BASE_URL }}/hx/goalcanvas/canvas/get?id={{ $id }}" hx-trigger="load"
+        hx-swap="innerHtml">
+
+        loading...
+
+    </div>
+@else
+    <div class="row">
+        <div class="col-md-12">
+            <a href="#/goalcanvas/editCanvasItem?type=goal&canvasId={{ $canvasId }}"
+                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/{{ $canvasId }}'>
+                    {{ $canvasTitle }}
+                </a>
+            </h5>
+        </div>
+    </div>
+
+    <div class="row" style="border-bottom:1px solid var(--main-border-color); margin-bottom:20px">
+        <div id="sortableCanvasKanban-{{ $canvasId }}" class="sortableTicketList disabled col-md-12"
+            style="padding-top:15px;">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="row">
+                        @if (count($goalItems) == 0)
+                            <div class='col-md-12'>No goals on this board yet. Open the <a
+                                    href='{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasId }}'>board</a> to
+                                start adding goals</div>
+                        @endif
+
+                        @foreach ($goalItems as $goal)
+                            <x-goalcanvas::goal-item-card :row="$goal" elementName="goal" :filter="$filter ?? []"
+                                :statusLabels="$statusLabels" :relatesLabels="$relatesLabels" :users="$users" />
+                        @endforeach
+                    </div>
+                    <br />
+                </div>
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/app/Domain/Goalcanvas/Templates/components/goal-card.blade.php b/app/Domain/Goalcanvas/Templates/components/goal-card.blade.php
deleted file mode 100644
index cdc746bb4..000000000
--- a/app/Domain/Goalcanvas/Templates/components/goal-card.blade.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
-@props([ 
-    'canvasId' => '',
-    'canvasTitle' => '',
-    'goalItems' => [],
-    'statusLabels' => [],
-    'relatesLabels' => [],
-    'users' => [],
-    'id' => '',
-    ])
-
-
-@if(!empty($id))
-    <div hx-get="{{BASE_URL}}/hx/goalcanvas/goalcanvasCard/get?id={{$id}}"
-        hx-trigger="load"
-        hx-swap="innerHtml"
-    >
-
-        loading...
-        {{-- <x-global::content.card>
-            <x-global::elements.loader />
-        </x-global::content.card> --}}
-    </div>
-@else 
-    <x-global::content.card>
-        <div class="row">
-            <div class="col-md-12">
-                <a href="#/goalcanvas/editCanvasItem?type=goal&canvasId={{ $canvasId }}"
-                    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/{{ $canvasId }}'>
-                        {{ $canvasTitle }}
-                    </a>
-                </h5>
-            </div>
-        </div>
-
-        <div class="row" style="border-bottom:1px solid var(--main-border-color); margin-bottom:20px">
-            <div id="sortableCanvasKanban-{{ $canvasId }}" class="sortableTicketList disabled col-md-12"
-                style="padding-top:15px;">
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="row">
-                            @if (count($goalItems) == 0)
-                                <div class='col-md-12'>No goals on this board yet. Open the <a
-                                        href='{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasId }}'>board</a> to
-                                    start adding goals</div>
-                            @endif
-
-                            @foreach ($goalItems as $goal)
-                                <x-goalcanvas::goal-item-card 
-                                    :row="$goal" elementName="goal"
-                                    :filter="$filter ?? []" 
-                                    :statusLabels="$statusLabels" 
-                                    :relatesLabels="$relatesLabels" 
-                                    :users="$users"
-                                />
-                            @endforeach
-                        </div>
-                        <br />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </x-global::content.card>
-@endif
\ No newline at end of file
diff --git a/app/Domain/Goalcanvas/Templates/dashboard.blade.php b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
index bbae04d7f..e575fbb79 100644
--- a/app/Domain/Goalcanvas/Templates/dashboard.blade.php
+++ b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
@@ -105,14 +105,14 @@ class="sr-only">{{ sprintf(__('text.percent_complete'), round($goalStats['avgPer
             </div>
             @if (count($allCanvas) > 0)
                 @foreach ($allCanvas as $canvasRow)
-                    @php                    
+                    {{-- @php                    
                         $canvasItems = $canvasSvc->getCanvasItemsById($canvasRow['id']);
-                    @endphp
+                    @endphp --}}
 
-                    <x-goalcanvas::goal-card
-                        canvasId="{{ $canvasRow['id'] }}"
+                    <x-goalcanvas::canvas
+                        id="{{ $canvasRow['id'] }}"
                         canvasTitle="{{ $canvasRow['title'] }}"
-                        :goalItems="$canvasItems"
+                        {{-- :goalItems="$canvasItems" --}}
                         :statusLabels="$statusLabels"
                         :relatesLabels="$relatesLabels"
                         :users="$users"
diff --git a/app/Domain/Goalcanvas/Templates/partials/goalCanvasCard.blade.php b/app/Domain/Goalcanvas/Templates/partials/goalCanvasCard.blade.php
index 6ef2391a6..e40c281ce 100644
--- a/app/Domain/Goalcanvas/Templates/partials/goalCanvasCard.blade.php
+++ b/app/Domain/Goalcanvas/Templates/partials/goalCanvasCard.blade.php
@@ -9,7 +9,6 @@
   <x-goalcanvas::goal-card
     canvasTitle="{{ $canvas->title }}"
     canvasId = "{{ $canvas->id }}"
-    :goalItems="$canvasItems"
     :statusLabels="$statusLabels"
     :relatesLabels="$relatesLabels"
     :users="$users"
diff --git a/app/Domain/Projects/Services/Projects.php b/app/Domain/Projects/Services/Projects.php
index 122e1e956..38c3f04e8 100644
--- a/app/Domain/Projects/Services/Projects.php
+++ b/app/Domain/Projects/Services/Projects.php
@@ -244,8 +244,8 @@ public function notifyProjectUsers(Notification $notification): void
         {
 
             //Filter notifications
-            $eventCore = new EventCore();
-            $notification = $eventCore->dispatchFilter('notificationFilter', $notification);
+
+            $notification = self::dispatchFilter('notificationFilter', $notification);
 
         //Email
         $users = $this->getUsersToNotify($notification->projectId);
@@ -330,7 +330,7 @@ public function notifyProjectUsers(Notification $notification): void
                 );
             }
 
-            $eventCore->dispatchEvent('notifyProjectUsers', ['type' => 'projectUpdate', 'module' => $notification->module, 'moduleId' => $entityId, 'message' => $notification->message, 'subject' => $notification->subject, 'users' => $this->getAllUserInfoToNotify($notification->projectId), 'url' => $notification->url['url']], 'domain.services.projects');
+            self::dispatchEvent('notifyProjectUsers', ['type' => 'projectUpdate', 'module' => $notification->module, 'moduleId' => $entityId, 'message' => $notification->message, 'subject' => $notification->subject, 'users' => $this->getAllUserInfoToNotify($notification->projectId), 'url' => $notification->url['url']], 'domain.services.projects');
         }
 
         /**