diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php
index ffb32f65..cf11a0d1 100644
--- a/app/Http/Controllers/CalendarController.php
+++ b/app/Http/Controllers/CalendarController.php
@@ -10,7 +10,7 @@ class CalendarController extends Controller
     {
         parent::registerView($request, 'agenda', $id);
         $apiResult = $this->API('agenda/item/' . (int)$id);
-        $calendarEvent = new \Model\CalendarEvent($apiResult);
+        $calendarEvent = new \Model\CalendarEvent($apiResult->news);
 
         return view('calendarevent', array_merge($this->getSidebareData(), ['event' => $calendarEvent, 'metadata' => $calendarEvent->metadata]));
     }
diff --git a/resources/views/calendarevent.blade.php b/resources/views/calendarevent.blade.php
index 9e7911f4..ca923e76 100644
--- a/resources/views/calendarevent.blade.php
+++ b/resources/views/calendarevent.blade.php
@@ -104,7 +104,7 @@
 					@include('partial/nh_story', ['content' => $event->content]);
 				@else
 				<div class="text">
-					<p>{!!$event->content!!}</p>
+				{!!$event->content!!}
 				</div>
 				@endif
 
diff --git a/resources/views/calendarlist.blade.php b/resources/views/calendarlist.blade.php
index 000a3f1d..4ce39203 100644
--- a/resources/views/calendarlist.blade.php
+++ b/resources/views/calendarlist.blade.php
@@ -41,7 +41,7 @@
                     @php($count = 0)
                     @foreach($events as $event)
                             @php($count++)
-                            <?php $url = route('agenda.details', ['id' => $event->id, 'title' => $event->title]); ?>
+                <?php $url = $event->url; ?>
                             <div class="box featured">
                                 <div class="row">
                                     <div class="col-12 col-md-6">
@@ -52,15 +52,19 @@
                                     <div class="col-12 col-md-6">
                                         <h2 class="post_title"><a href="{{$url}}" title="{{$event->title}}">{!!$event->title!!}</a></h2>
                                         <div class="sub_title" style="flex-wrap: wrap">
-					    <ul class="post_tags" style="width: 100%; margin: 0 0 8px 0;height: 25px;">
-						@foreach($event->tags as $tag)
-						<li><a style="padding: 3px 8px 3px" title="{{$tag->title}}">{{$tag->title}}</a></li>
+                        <ul class="post_tags" style="width: 100%; margin: 0 0 8px 0;height: 25px;">
+                        @foreach($event->tags as $tag)
+                        <li><a style="padding: 3px 8px 3px" title="{{$tag->title}}">{{$tag->title}}</a></li>
                                                 @endforeach
                                             </ul>
                                             <span class="post_date" style="line-height: 1.17; height: 14px;" title="{{Formatter::relativeDate($event->starts, 'W d m y?')}}">
                                                 <i class="fa-regular fa-clock"></i> {{Formatter::relativeDate($event->starts, 'W d m y?')}}
                                                 @if($event->ends && $event->starts != $event->ends)
-                                                    t/m {{strtolower(Formatter::relativeDate($event->ends, 'W d m y?'))}}
+                                                    @if($event->ends->format('d M y') != $event->starts->format('d M y'))
+                                                        t/m {{strtolower(Formatter::relativeDate($event->ends, 'W d m y?'))}}
+                                                    @else
+                                                        van {{ $event->starts->format('H:i') }} uur tot {{ $event->ends->format('H:i') }} uur 
+                                                    @endif
                                                 @endif
                                             </span>
                                         </div>