diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index cde4a93..b42cb09 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -65,7 +65,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Events",
-                "uri": "{/base}/marketing/event/list?{?}",
+                "uri": "{/base}/eventmanagement/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -79,7 +79,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "List",
-                        "uri": "{/base}/marketing/event/list?{?}",
+                        "uri": "{/base}/eventmanagement/list?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -94,7 +94,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Create",
-                        "uri": "{/base}/marketing/event/create?{?}",
+                        "uri": "{/base}/eventmanagement/create?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 5,
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index db6bb42..736cf51 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -150,7 +150,7 @@ final class BackendController extends Controller
     public function viewMarketingPromotionCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
-        $view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-create');
+        $view->setTemplate('/Modules/Marketing/Theme/Backend/promotion-view');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001902001, $request, $response);
 
         return $view;
@@ -192,7 +192,7 @@ final class BackendController extends Controller
     public function viewMarketingEventCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
-        $view->setTemplate('/Modules/Marketing/Theme/Backend/event-create');
+        $view->setTemplate('/Modules/Marketing/Theme/Backend/event-view');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001903001, $request, $response);
 
         return $view;
diff --git a/Theme/Backend/event-create.tpl.php b/Theme/Backend/event-create.tpl.php
deleted file mode 100755
index 33edeec..0000000
--- a/Theme/Backend/event-create.tpl.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Jingga
- *
- * PHP Version 8.1
- *
- * @package   Modules\Marketing
- * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-/**
- * @var \phpOMS\Views\View $this
- */
-
-echo $this->data['nav']->render(); ?>
-
-<div class="row">
-    <div class="col-xs-12 col-md-6">
-        <section class="box wf-100">
-            <header><h1><?= $this->getHtml('Event'); ?></h1></header>
-            <div class="inner">
-                <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/template'); ?>" method="post">
-                    <table class="layout wf-100">
-                        <tbody>
-                        <tr><td colspan="2"><label for="iType"><?= $this->getHtml('Type'); ?></label>
-                        <tr><td colspan="2"><select id="iType" name="type"></select>
-                        <tr><td colspan="2"><label for="iTitle"><?= $this->getHtml('Title'); ?></label>
-                        <tr><td colspan="2"><input id="iTitle" type="text" name="title">
-                        <tr><td colspan="2"><label for="iDescription"><?= $this->getHtml('Description'); ?></label>
-                        <tr><td colspan="2"><textarea id="iDescription" name="description"></textarea>
-                        <tr><td><label for="iStart"><?= $this->getHtml('Start'); ?></label><td><label for="iEnd"><?= $this->getHtml('End'); ?></label>
-                        <tr><td><input id="iSTart" type="datetime-local"><td><input id="iEnd" type="datetime-local">
-                        <tr><td colspan="2"><label for="iBudget"><?= $this->getHtml('Budget'); ?></label>
-                        <tr><td colspan="2"><input type="text" id="iBudget" name="budget" placeholder="">
-                    </table>
-                </form>
-            </div>
-        </section>
-    </div>
-</div>
\ No newline at end of file
diff --git a/Theme/Backend/event-list.tpl.php b/Theme/Backend/event-list.tpl.php
deleted file mode 100755
index da45b26..0000000
--- a/Theme/Backend/event-list.tpl.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Jingga
- *
- * PHP Version 8.1
- *
- * @package   Modules\Marketing
- * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-$footerView = new \phpOMS\Views\PaginationView($this->l11nManager, $this->request, $this->response);
-$footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
-$footerView->setPages(20);
-$footerView->setPage(1);
-
-echo $this->data['nav']->render(); ?>
-
-<div class="row">
-    <div class="col-xs-12">
-        <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Events'); ?><i class="g-icon download btn end-xs">download</i></div>
-            <div class="slider">
-            <table class="default sticky">
-                <thead>
-                <tr>
-                    <td><?= $this->getHtml('Status'); ?>
-                    <td><?= $this->getHtml('Type'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
-                    <td><?= $this->getHtml('Start'); ?>
-                    <td><?= $this->getHtml('End'); ?>
-                    <td><?= $this->getHtml('Location'); ?>
-                    <td><?= $this->getHtml('Expenses'); ?>
-                    <td><?= $this->getHtml('Sales'); ?>
-                    <td><?= $this->getHtml('Budget'); ?>
-                <tbody>
-                <?php $count = 0; foreach ([] as $key => $value) : ++$count; ?>
-                <?php endforeach; ?>
-                <?php if ($count === 0) : ?>
-                <tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
-                        <?php endif; ?>
-            </table>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/Theme/Backend/event-view.tpl.php b/Theme/Backend/event-view.tpl.php
deleted file mode 100644
index e69de29..0000000
diff --git a/Theme/Backend/promotion-create.tpl.php b/Theme/Backend/promotion-create.tpl.php
deleted file mode 100755
index 5aeff96..0000000
--- a/Theme/Backend/promotion-create.tpl.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Jingga
- *
- * PHP Version 8.1
- *
- * @package   Modules\Marketing
- * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
- * @version   1.0.0
- * @link      https://jingga.app
- */
-declare(strict_types=1);
-
-/**
- * @var \phpOMS\Views\View $this
- */
-
-echo $this->data['nav']->render(); ?>
-
-<div class="row">
-    <div class="col-xs-12 col-md-6">
-        <section class="box wf-100">
-            <header><h1><?= $this->getHtml('Promotion'); ?></h1></header>
-            <div class="inner">
-                <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}marketing/promotion'); ?>" method="post">
-                    <table class="layout wf-100">
-                        <tbody>
-                        <tr><td colspan="2"><label for="iType"><?= $this->getHtml('Type'); ?></label>
-                        <tr><td colspan="2"><select id="iType" name="type"></select>
-                        <tr><td colspan="2"><label for="iTitle"><?= $this->getHtml('Title'); ?></label>
-                        <tr><td colspan="2"><input id="iTitle" type="text" name="title">
-                        <tr><td colspan="2"><label for="iDescription"><?= $this->getHtml('Description'); ?></label>
-                        <tr><td colspan="2"><textarea id="iDescription" name="description"></textarea>
-                        <tr><td><label for="iStart"><?= $this->getHtml('Start'); ?></label><td><label for="iEnd"><?= $this->getHtml('End'); ?></label>
-                        <tr><td><input id="iSTart" type="datetime-local"><td><input id="iEnd" type="datetime-local">
-                        <tr><td colspan="2"><label for="iBudget"><?= $this->getHtml('Budget'); ?></label>
-                        <tr><td colspan="2"><input type="text" id="iBudget" name="budget" placeholder="">
-                    </table>
-                </form>
-            </div>
-        </section>
-    </div>
-</div>
\ No newline at end of file
diff --git a/Theme/Backend/promotion-view.tpl.php b/Theme/Backend/promotion-view.tpl.php
index 2d141a5..4af9f29 100644
--- a/Theme/Backend/promotion-view.tpl.php
+++ b/Theme/Backend/promotion-view.tpl.php
@@ -12,42 +12,75 @@
  */
 declare(strict_types=1);
 
-$promotion = $this->data['promotion'];
+use Modules\Marketing\Models\NullPromotion;
+
+$promotion = $this->data['promotion'] ?? new NullPromotion();
 
 echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-6">
-        <section class="box wf-100">
-            <header><h1><?= $this->printHtml($promotion->getName()); ?></h1></header>
-            <div class="inner">
-                <form id="fProject" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}marketing/promotion?{?}&csrf={$CSRF}'); ?>">
-                    <table class="layout wf-100">
-                        <tbody>
-                        <tr><td colspan="2"><label for="iName"><?= $this->getHtml('Name'); ?></label>
-                        <tr><td colspan="2"><input type="text" id="iName" name="name" placeholder="Name" value="<?= $this->printHtml($promotion->getName()); ?>" required>
-                        <tr><td><label for="iStart"><?= $this->getHtml('Start'); ?></label>
-                            <td><label for="iEnd"><?= $this->getHtml('End'); ?></label>
-                        <tr><td><input type="datetime-local" id="iStart" name="start" value="<?= $this->printHtml($promotion->getStart()->format('Y-m-d\TH:i:s')); ?>">
-                            <td><input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml($promotion->getEnd()->format('Y-m-d\TH:i:s')); ?>">
-                        <tr><td colspan="2"><label for="iDescription"><?= $this->getHtml('Description'); ?></label>
-                        <tr><td colspan="2"><textarea id="iDescription" name="desc"><?= $this->printHtml($promotion->description); ?></textarea>
-                        <tr><td><label for="iBudget"><?= $this->getHtml('Budget'); ?></label><td><label for="iActual"><?= $this->getHtml('Actual'); ?></label>
-                        <tr><td><input type="text" id="iBudget" name="budget" placeholder=""><td><input type="text" id="iActual" name="actual">
-                        <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>" name="save-promotion">
-                    </table>
-                </form>
+        <section class="portlet">
+            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}marketing/promotion'); ?>" method="post">
+            <div class="portlet-head"><?= $this->getHtml('Promotion'); ?></div>
+            <div class="portlet-body">
+                <div class="form-group">
+                    <label for="iType"><?= $this->getHtml('Type'); ?></label>
+                    <select id="iType" name="type"></select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iTitle"><?= $this->getHtml('Title'); ?></label>
+                    <input id="iTitle" type="text" name="title">
+                </div>
+
+                <div class="form-group">
+                    <label for="iDescription"><?= $this->getHtml('Description'); ?></label>
+                    <textarea id="iDescription" name="description"></textarea>
+                </div>
+
+                <div class="line-flex">
+                    <div>
+                        <div class="form-group">
+                            <label for="iStart"><?= $this->getHtml('Start'); ?></label>
+                            <input id="iSTart" type="datetime-local">
+                        </div>
+                    </div>
+
+                    <div>
+                        <div class="form-group">
+                            <label for="iEnd"><?= $this->getHtml('End'); ?></label>
+                            <input id="iEnd" type="datetime-local">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label for="iBudget"><?= $this->getHtml('Budget'); ?></label>
+                    <input type="text" id="iBudget" name="budget" placeholder="">
+                </div>
             </div>
+            <div class="portlet-foot">
+                <?php if ($promotion->id === 0) : ?>
+                    <input id="iCreateSubmit" type="Submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
+                <?php else : ?>
+                    <input id="iSaveSubmit" type="Submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
+                <?php endif; ?>
+            </div>
+            </form>
         </section>
     </div>
 
+    <?php if ($promotion->id !== 0) : ?>
     <div class="col-xs-12 col-md-6">
         <div class="box wf-100">
             <?= $this->getData('tasklist')->render($promotion->tasks); ?>
         </div>
     </div>
+    <?php endif; ?>
 </div>
 
+<?php if ($promotion->id !== 0) : ?>
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <?= $this->getData('calendar')->render($promotion->getCalendar()); ?>
@@ -64,4 +97,5 @@ echo $this->data['nav']->render(); ?>
             <header><h1>Finances</h1></header>
         </section>
     </div>
-</div>
\ No newline at end of file
+</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/info.json b/info.json
index 329a143..d4a52ff 100755
--- a/info.json
+++ b/info.json
@@ -20,7 +20,8 @@
         "Admin": "1.0.0",
         "Media": "1.0.0",
         "Tasks": "1.0.0",
-        "Calendar": "1.0.0"
+        "Calendar": "1.0.0",
+        "EventManagement": "1.0.0"
     },
     "providing": {
         "Navigation": "*"