diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig
index 1bcb28d..e40664c 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig
@@ -1,25 +1,31 @@
 <div class="ui column">
     <div class="ui segment event box">
-        <h2 class="ui dividing header segment green inverted"><a href="{{ path('_show', { 'slug': entity.slug }) }}">{{ entity.summary }}</a>
+        <h2 class="ui dividing header segment green inverted"><a
+                    href="{{ path('_show', { 'slug': entity.slug }) }}">{{ entity.summary }}</a>
         </h2>
 
         <p class="edit">
-            <a href="{{ path('_edit', {'slug' : entity.slug }) }}"><i class="circular icon edit green inverted link"></i>Bearbeiten</a>
+            <a href="{{ path('_edit', {'slug' : entity.slug }) }}"><i
+                        class="circular icon edit green inverted link"></i>Bearbeiten</a>
         </p>
 
         <p class="startdate ">
-            <i class="circular icon calendar green inverted link" title="Wann?" data-content="Wann?"></i>{{ entity.startdate.format('Y-m-d H:i') }}
+            <i class="circular icon calendar green inverted link" title="Wann?"
+               data-content="Wann?"></i>{{ entity.startdate.format('Y-m-d H:i') }}
         </p>
 
         {% if entity.location is not null %}
             <p class="location">
-                <a href="{{ path('location_show', {'slug' : entity.location.slug }) }}"><i class="circular icon map marker green inverted link" title="Wo?" data-content="Wo?"></i>{{ entity.location.name }}</a>
+                <a href="{{ path('location_show', {'slug' : entity.location.slug }) }}"><i
+                            class="circular icon map marker green inverted link" title="Wo?"
+                            data-content="Wo?"></i>{{ entity.location.name }}</a>
             </p>
         {% endif %}
         {% if entity.tags|length > 0 %}
             <ul class="tags">
                 {% for tag in entity.tags %}
-                    <li class="tag"><a href="{{ path('tag_show',{'slug' : tag.slug }) }}"><i class="circular icon tag green inverted link"></i>{{ tag.name }}</a></li>
+                    <li class="tag"><a href="{{ path('tag_show',{'slug' : tag.slug }) }}"><i
+                                    class="circular icon tag green inverted link"></i>{{ tag.name }}</a></li>
                 {% endfor %}
             </ul>
         {% endif %}
@@ -37,6 +43,5 @@
         {% else %}
             <p>{{ entity.description|markdown }}</p>
         {% endif %}
-
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig
index 83be9d6..f48ab4d 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig
@@ -1,4 +1,4 @@
-<form method="post" action="{% if entity.id > 0 %}{{ path('_update',{'slug':entity.slug}) }}{% else %}{{ path('_create') }}{% endif %}">
+<form method="post" action="{% if entity.id|default(0) > 0 %}{{ path('_update',{'slug':entity.slug}) }}{% else %}{{ path('_create') }}{% endif %}">
     <div class="ui form segment">
         <div class="field">
             <label class="control-label required" for="event_startdate">Startdatum</label>
diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig
index b91fabd..27728ae 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig
+++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig
@@ -18,6 +18,6 @@
 
 {% block body -%}
     <div class="ui one column page grid">
-        {{ include('CalciferBundle:Event:event_box.html.twig') }}
+      {{ include('CalciferBundle:Event:event_box.html.twig',{'entity' : entity}) }}
     </div>
 {% endblock %}