diff --git a/backend/views/event-type/index.php b/backend/views/event-type/index.php
index ef18f81..ac4a7f7 100644
--- a/backend/views/event-type/index.php
+++ b/backend/views/event-type/index.php
@@ -30,8 +30,15 @@ $this->params['breadcrumbs'][] = $this->title;
                 'attribute' => 'theme',
                 'label' => 'Színtéma',
                 'value' => function ($model, $key, $index, $column){
-                    return isset($model['theme']) ? "Színtéma " . ($model['theme']+1) : "";
+                    $result = "";
+                    if ( isset( $model['theme'] )){
+                     $box = "<span style='margin-right: 0.3rem; height: 1rem; width: 1rem; display: inline-block;' class='event-theme-active-".$model['theme']."'></span>";
+                     $name =  "Színtéma " . ($model['theme']+1);
+                     $result = $box . $name;
                 }
+                    return $result;
+                },
+                'format' => 'raw'
             ],
             ['class' => 'yii\grid\ActionColumn',
                 'template' => '{view} {update}'
diff --git a/common/helpers/AppDateTimeHelper.php b/common/helpers/AppDateTimeHelper.php
index f0233fd..240efa2 100644
--- a/common/helpers/AppDateTimeHelper.php
+++ b/common/helpers/AppDateTimeHelper.php
@@ -13,4 +13,11 @@ class AppDateTimeHelper
         return $unixTime;
     }
 
+     public static function convertUnixTimeToDateTime($unixTime){
+            $result = new \DateTime();
+            $result->setTimestamp($unixTime);
+            $result->setTimeZone(new \DateTimeZone("UTC"));
+            return $result;
+        }
+
 }
diff --git a/common/modules/event/models/EventSearch.php b/common/modules/event/models/EventSearch.php
index 8b625f3..6735764 100644
--- a/common/modules/event/models/EventSearch.php
+++ b/common/modules/event/models/EventSearch.php
@@ -73,7 +73,7 @@ class EventSearch extends Event
         $query->innerJoin('trainer', 'event.id_trainer = trainer.id');
         $query->innerJoin('room', 'event.id_room = room.id');
         $query->innerJoin('event_type', 'event_type.id = event.id_event_type');
-        $query->leftJoin('event_registration', 'event_registration.id_event = event.id');
+        $query->leftJoin('event_registration', 'event_registration.id_event = event.id and event_registration.canceled_at is null and event_registration.deleted_at is null ');
         $query->groupBy(
             [
                 'event_id',
diff --git a/common/modules/event/views/event/index.php b/common/modules/event/views/event/index.php
index e850aa8..186c6a2 100644
--- a/common/modules/event/views/event/index.php
+++ b/common/modules/event/views/event/index.php
@@ -16,7 +16,7 @@ if ( $permissions->allowCreate ){
     $indexTableTemplateButtons[] = '{update}';
 }
 $indexTableTemplateButtons[] = '{reserve-card}';
-$indexTableTemplateButtons[] = '{equipment-types-assignment}';
+//$indexTableTemplateButtons[] = '{equipment-types-assignment}';
 
 
 ?>
@@ -155,14 +155,14 @@ $indexTableTemplateButtons[] = '{equipment-types-assignment}';
                         ];
                         return Html::a('<span class="glyphicon glyphicon-user"></span>', $url, $options);
                     },
-                    'equipment-types-assignment' => function ($url, $model, $key) {
-                        $options = [
-                            'title' => Yii::t('yii', 'Equipment Types'),
-                            'aria-label' => Yii::t('yii', 'Equipment Types'),
-                            'data-pjax' => '0',
-                        ];
-                        return Html::a('<span class="glyphicon glyphicon-wrench"></span>', $url, $options);
-                    }
+//                    'equipment-types-assignment' => function ($url, $model, $key) {
+//                        $options = [
+//                            'title' => Yii::t('yii', 'Equipment Types'),
+//                            'aria-label' => Yii::t('yii', 'Equipment Types'),
+//                            'data-pjax' => '0',
+//                        ];
+//                        return Html::a('<span class="glyphicon glyphicon-wrench"></span>', $url, $options);
+//                    }
                 ]
 
             ],
diff --git a/common/modules/event/widgets/event/EventView.php b/common/modules/event/widgets/event/EventView.php
index 8d6395e..cb7b371 100644
--- a/common/modules/event/widgets/event/EventView.php
+++ b/common/modules/event/widgets/event/EventView.php
@@ -1,5 +1,6 @@
 <?php
 namespace common\modules\event\widgets\event;
+use common\helpers\AppDateTimeHelper;
 use common\models\Event;
 use DateTime;
 use yii\bootstrap\Widget;
@@ -20,10 +21,8 @@ class EventView extends Widget
     public function init(){
         parent::init();
         if ( isset($this->event )){
-            $this->start = new DateTime();
-            $this->start->setTimestamp($this->event->start);
-            $this->end = new DateTime();
-            $this->end->setTimestamp($this->event->end);
+            $this->start = AppDateTimeHelper::convertUnixTimeToDateTime($this->event->start);
+            $this->end = AppDateTimeHelper::convertUnixTimeToDateTime($this->event->end);
         }
     }