diff --git a/app/Domain/Goalcanvas/Controllers/Dashboard.php b/app/Domain/Goalcanvas/Controllers/Dashboard.php
index 5aed828c8..f10874ded 100644
--- a/app/Domain/Goalcanvas/Controllers/Dashboard.php
+++ b/app/Domain/Goalcanvas/Controllers/Dashboard.php
@@ -305,12 +305,6 @@ public function run()
                 }
             }
 
-            // request
-            // $filter['status'] = request('filter_status', session('filter_status', 'all'));
-            // session(['filter_status' => $filter['status']]);
-            // $filter['relates'] = request('filter_relates', session('filter_relates', 'all'));
-            // session(['filter_relates' => $filter['relates']]);
-
             $filter['status'] = $_GET['filter_status'] ?? (session("filter_status") ?? 'all');
             session(["filter_status" => $filter['status']]);
             $filter['relates'] = $_GET['filter_relates'] ?? (session("filter_relates") ?? 'all');
diff --git a/app/Domain/Goalcanvas/Controllers/DelCanvas.php b/app/Domain/Goalcanvas/Controllers/DelCanvas.php
index 151d33af9..02e5f0aba 100644
--- a/app/Domain/Goalcanvas/Controllers/DelCanvas.php
+++ b/app/Domain/Goalcanvas/Controllers/DelCanvas.php
@@ -4,13 +4,27 @@
  * Controller / Delete Canvas
  */
 
+
 namespace Leantime\Domain\Goalcanvas\Controllers {
 
+    // use AWS\CRT\HTTP\Response;
+    use Symfony\Component\HttpFoundation\Response;
+
+
     /**
      *
      */
     class DelCanvas extends \Leantime\Domain\Canvas\Controllers\DelCanvas
     {
         protected const CANVAS_NAME = 'goal';
+
+        public function get($params):Response
+        {
+            $id = filter_var($params['id'] ?? '', FILTER_SANITIZE_NUMBER_INT);
+            $this->tpl->assign('id', $id);
+
+            return $this->tpl->displayPartial('goalcanvas.delCanvas');
+
+        }
     }
 }
diff --git a/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php b/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php
index 7406bf7fa..c70253209 100644
--- a/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php
+++ b/app/Domain/Goalcanvas/Controllers/DelCanvasItem.php
@@ -5,6 +5,7 @@
  */
 
 namespace Leantime\Domain\Goalcanvas\Controllers {
+    use Symfony\Component\HttpFoundation\Response;
 
     /**
      *
@@ -12,6 +13,14 @@
     class DelCanvasItem extends \Leantime\Domain\Canvas\Controllers\DelCanvasItem
     {
         protected const CANVAS_NAME = 'goal';
+        public function get($params):Response
+        {
+            $id = filter_var($params['id'] ?? '', FILTER_SANITIZE_NUMBER_INT);
+            $this->tpl->assign('id', $id);
+
+            return $this->tpl->displayPartial('goalcanvas.delCanvasItem');
+
+        }
 
     }
 
diff --git a/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php b/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php
index bff0b2bc8..3a284339b 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());
diff --git a/app/Domain/Goalcanvas/Templates/bigRockDialog.blade.php b/app/Domain/Goalcanvas/Templates/bigRockDialog.blade.php
index 3e73bb1e9..1388cf0b0 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,27 +23,25 @@
 </form>
 
 <script>
-    jQuery(document).ready(function(){
+    jQuery(document).ready(function() {
 
-        <?php if (isset($_GET['closeModal'])): ?>
+        @if (isset($_GET['closeModal']))
             jQuery.nmTop().close();
-        
-        <?php endif ?>
-        
-       if(jQuery("#wikiTitle").val().length >= 2) {
-           jQuery("#saveBtn").removeAttr("disabled");
-       }else{
-           jQuery("#saveBtn").attr("disabled", "disabled");
-       }
-
-        jQuery("#wikiTitle").keypress(function(){
-
-            if(jQuery("#wikiTitle").val().length >= 2) {
+        @endif
+
+        if (jQuery("#wikiTitle").val().length >= 2) {
+            jQuery("#saveBtn").removeAttr("disabled");
+        } else {
+            jQuery("#saveBtn").attr("disabled", "disabled");
+        }
+
+        jQuery("#wikiTitle").keypress(function() {
+
+            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
index 070ee1072..849304601 100644
--- a/app/Domain/Goalcanvas/Templates/canvasComment.blade.php
+++ b/app/Domain/Goalcanvas/Templates/canvasComment.blade.php
@@ -23,7 +23,7 @@
     window.onload = function() {
         if (!window.jQuery) {
             //It's not a modal
-            location.href = "<?= BASE_URL ?>/<?= $canvasName ?>canvas/showCanvas?showModal=<?php echo $canvasItem['id']; ?>";
+            location.href = "<?= BASE_URL ?>/<?= $canvasName ?>canvas/showCanvas?showModal=<?= $canvasItem['id']; ?>";
         }
     }
 </script>
@@ -36,18 +36,16 @@
     </h4>
     <hr style="margin-top: 5px; margin-bottom: 15px;">
 
-    {!! $tpl->displayNotification() !!}
-
-    <h5 style="padding-left: 40px"><strong>{{ $tpl->e($canvasItem['description']) }}</strong></h5>
+    <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>{{ $tpl->__('subtitles.discussion') }}
+        <span class="fa fa-comments"></span>{{ __('subtitles.discussion') }}
     </h4>
     @php
-    $tpl->assign("formUrl", "/{{ $canvasName }}canvas/editCanvasComment/" . $id . "");
+    $tpl->assign("formUrl", "/goalcanvas/editCanvasComment/" . $id . "");
     $tpl->displaySubmodule('comments-generalComment');
     @endphp
     @endif
@@ -59,14 +57,14 @@
 
         leantime.editorController.initSimpleEditor();
 
-        <?php if (!$login::userIsAtLeast($roles::$editor)) { ?>
+        @if(!$login::userIsAtLeast($roles::$editor))
             leantime.authController.makeInputReadonly(".nyroModalCont");
 
-        <?php } ?>
+        @endif;
 
-        <?php if ($login::userHasRole([$roles::$commenter])) { ?>
+        @if($login::userHasRole([$roles::$commenter]))
             leantime.commentsController.enableCommenterForms();
-        <?php } ?>
+        @endif;
 
     })
 </script>
diff --git a/app/Domain/Goalcanvas/Templates/canvasDialog.blade.php b/app/Domain/Goalcanvas/Templates/canvasDialog.blade.php
index f61fa9c54..0785ab8c4 100644
--- a/app/Domain/Goalcanvas/Templates/canvasDialog.blade.php
+++ b/app/Domain/Goalcanvas/Templates/canvasDialog.blade.php
@@ -1,182 +1,169 @@
 @extends($layout)
 @section('content')
-
-@php
-
-$canvasName = 'goal';
-
-$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'];
-}
-
-@endphp
-
-<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 type="text/javascript">
+        window.onload = function() {
+            if (!window.jQuery) {
+                //It's not a modal
+                location.href = "<?= BASE_URL ?>/goalcanvas/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>
+    </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 . "/goal/canvas/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>
 
-    {{ $tpl->displayNotification() }}
+                <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>
 
-    <form class="formModal" method="post" action="{{ BASE_URL."/$canvasName/canvas/editCanvasItem/$id" }}">
+                <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>{{ __('subtitles.discussion') }}</h4>
+                    @php
+                        $formUrl = '/strategyPro/editCanvasItem/' . $id;
+                    @endphp
+                    @include('comments.generalComment', [
+                        'formUrl' => '/goalcanvas/editCanvasComment/' . $id,
+                    ])
+                @endif
+            </div>
 
-        <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">
+            @if ($id != '')
+                <a href="{{ url("/goal/canvas/delCanvasItem/$id") }}" class="formModal delete right">
+                    <i class='fa fa-trash-can'></i> {{ __('links.delete') }}
+                </a>
+            @endif
 
-        <div class="col-md-8">
-            <label>{{ __("label.what_is_your_goal") }}</label>
-            <input type="text" name="title" value="{{ $canvasItem['title'] }}" style="width:100%"><br>
+        </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))
-            <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) }}">
+                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
-            <br>
-            <h4 class="widgettitle title-light" style="margin-bottom:0px;"><i class="fa-solid fa-ranking-star"></i> {{ __("Metrics") }}</h4>
-
-            @php
-
-            $tpl->dispatchTplEvent('beforeMeasureGoalContainer', $canvasItem); @endphp
-            <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'] }}" @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>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" @if ($canvasItem['metricType']=='number' ) selected @endif>Number</option>
-                        <option value="percent" @if ($canvasItem['metricType']=='percent' ) selected @endif>% Percent</option>
-                        <option value="currency" @if ($canvasItem['metricType']=='currency' ) selected @endif>{{ __('language.currency') }}</option>
-                    </select>
-                </div>
-            </div>
+            leantime.editorController.initSimpleEditor();
 
-            <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>
+            @if (!$login::userIsAtLeast($roles::$editor))
+                leantime.authController.makeInputReadonly(".nyroModalCont");
             @endif
 
-            @if ($id !== '')
-            <br><br><br>
-            <input type="hidden" name="comment" value="1">
-            <h4 class="widgettitle title-light"><span class="fa fa-comments"></span>{{ __('subtitles.discussion') }}</h4>
-            @php
-            $formUrl = "/strategyPro/editCanvasItem/" . $id;
-            @endphp
-            @include('comments.generalComment', ['formUrl' => $formUrl])
+            @if ($login::userHasRole([$roles::$commenter]))
+                leantime.commentsController.enableCommenterForms();
             @endif
-        </div>
-
-        @if ($id != '')
-        <a href="{{ url("/$canvasName/canvas/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");
-
-        <?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>
-
-@endsection
\ No newline at end of file
+
+        });
+    </script>
+@endsection
diff --git a/app/Domain/Goalcanvas/Templates/dashboard.blade.php b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
index b861b7467..08b731fe0 100644
--- a/app/Domain/Goalcanvas/Templates/dashboard.blade.php
+++ b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
@@ -78,8 +78,6 @@
 
 <div class="maincontent">
 
-{!! $tpl->displayNotification() !!}
-
 <div class="row" style="margin-bottom:20px; ">
     <div class="col-md-4">
         <div class="bigNumberBox" style="padding: 29px 15px;">
diff --git a/app/Domain/Goalcanvas/Templates/delCanvas.blade.php b/app/Domain/Goalcanvas/Templates/delCanvas.blade.php
index 47bc018b7..cb24385b3 100644
--- a/app/Domain/Goalcanvas/Templates/delCanvas.blade.php
+++ b/app/Domain/Goalcanvas/Templates/delCanvas.blade.php
@@ -1,29 +1,15 @@
 @extends($layout) 
 @section('content')
 
+<h4 class="widgettitle title-light">{!!__("subtitles.delete") !!}</h4>
 
-@php
-/**
- * delCanvas.inc template - Generic template for deleting canvas
- *
- * Required variables:
- * - $canvasName     Name of current canvas
- * - $csrf_token     CSRF token (if used in your application)
- */
-
-$id = filter_var($_GET['id'] ?? '', FILTER_SANITIZE_NUMBER_INT);
-$canvasName = 'goal'
-@endphp
-
-<h4 class="widgettitle title-light">{{ __("subtitles.delete") }}</h4>
-
-<form method="post" action="{{ BASE_URL."/$canvasName/canvas/delCanvas/$id" }}">
+<form method="post" action="{{ BASE_URL."/goal/canvas/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."/$canvasName/canvas/showCanvas" }}">{{ __('buttons.back') }}</a>
+    <a class="btn btn-secondary" href="{{ BASE_URL."/goal/canvas/showCanvas" }}">{{ __('buttons.back') }}</a>
 </form>
 
 @endsection
\ No newline at end of file
diff --git a/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php b/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php
index a6908c91d..835f549f4 100644
--- a/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php
+++ b/app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php
@@ -1,25 +1,12 @@
 @extends($layout)
 @section('content')
 
-@php
-
-/**
- * delCanvasItem.inc template - Generic template for deleting canvas item
- *
- * Required variables:
- * - $canvasName   Name of current canvas
- */
-
-$id = filter_var($_GET['id'], FILTER_SANITIZE_NUMBER_INT);
-$canvasName = 'goal'
-@endphp
-
-<h4 class="widgettitle title-light"><?=$tpl->__("subtitles.delete") ?></h4>
+<h4 class="widgettitle title-light">{!! __("subtitles.delete") !!}</h4>
 <hr style="margin-top: 5px; margin-bottom: 15px;">
 
-<form method="post" action="<?=BASE_URL ?>/{{ $canvasName }}canvas/delCanvasItem/{{ $id }}">
+<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 ?>/{{ $canvasName }}canvas/showCanvas">{{ __('buttons.back') }}</a>
+    <a class="btn btn-secondary" href="<?=BASE_URL ?>/goalcanvas/showCanvas">{{ __('buttons.back') }}</a>
 </form>
 @endsection
diff --git a/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php b/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php
index 8f044e7e1..1bc564221 100644
--- a/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php
+++ b/app/Domain/Goalcanvas/Templates/showBottomCanvas.blade.php
@@ -1,25 +1,25 @@
 @if (count($tpl->get('allCanvas')) > 0)
 @else
-<br /><br />
-<div class='center'>
-  <div class='svgContainer'>
-    {!! file_get_contents(ROOT . "/dist/images/svg/undraw_design_data_khdb.svg") !!}
-  </div>
+    <br /><br />
+    <div class='center'>
+        <div class='svgContainer'>
+            {!! file_get_contents(ROOT . '/dist/images/svg/undraw_design_data_khdb.svg') !!}
+        </div>
 
-  <h3>{{ __("headlines.$canvasName.analysis") }}</h3>
-  <br />{{ __("text.$canvasName.helper_content") }}
+        <h3>{{ __("headlines.$canvasName.analysis") }}</h3>
+        <br />{{ __("text.$canvasName.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>
+        @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($tpl->get('allCanvas')) > 0)
-<small class="align-center">{{ $disclaimer }}</small>
+    <small class="align-center">{{ $disclaimer }}</small>
 @endif
 
 {!! $tpl->viewFactory->make($tpl->getTemplatePath('canvas', 'modals'), $__data)->render() !!}
@@ -30,38 +30,37 @@
 <script type="text/javascript">
   jQuery(document).ready(function() {
 
-    if (jQuery('#searchCanvas').length > 0) {
-      new SlimSelect({
-        select: '#searchCanvas'
-      });
-    }
+      if (jQuery('#searchCanvas').length > 0) {
+          new SlimSelect({
+              select: '#searchCanvas'
+          });
+      }
 
-    leantime.<?= $canvasName ?>CanvasController.setRowHeights();
-    leantime.canvasController.setCanvasName('<?= $canvasName ?>');
-    leantime.canvasController.initFilterBar();
+      leantime.goalCanvasController.setRowHeights();
+      leantime.canvasController.setCanvasName('goal');
+      leantime.canvasController.initFilterBar();
 
-    <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
+      @if ($login::userIsAtLeast($roles::$editor))
       leantime.canvasController.initCanvasLinks();
       leantime.canvasController.initUserDropdown();
       leantime.canvasController.initStatusDropdown();
       leantime.canvasController.initRelatesDropdown();
-    <?php } else { ?>
+      @else
       leantime.authController.makeInputReadonly(".maincontentinner");
+      @endif
 
-    <?php } ?>
-
-
-    <?php if (isset($_GET['showModal'])) {
-      if ($_GET['showModal'] == "") {
-        $modalUrl = "&type=" . array_key_first($canvasTypes);
-      } else {
-        $modalUrl = "/" . (int)$_GET['showModal'];
-      }
-    ?>
-      leantime.canvasController.openModalManually("<?= BASE_URL ?>/<?= $canvasName ?>canvas/editCanvasItem<?= $modalUrl ?>");
-      window.history.pushState({}, document.title, '<?= BASE_URL ?>/<?= $canvasName ?>canvas/showCanvas/');
-
-    <?php } ?>
+      @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>
\ No newline at end of file
+</script>
diff --git a/app/Language/en-US.ini b/app/Language/en-US.ini
index 44a8c2364..1beac3609 100644
--- a/app/Language/en-US.ini
+++ b/app/Language/en-US.ini
@@ -2517,3 +2517,12 @@ text.welcome_to_leantime_content  = "<h1>Hi There 👋 </h1>We're excited to see
 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"
\ No newline at end of file