diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index e807b5d..36bb5c9 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "EventManagement",
-        "uri": "{/base}/eventmanagement/list?{?}",
+        "uri": "{/base}/eventmanagement/list",
         "target": "self",
         "icon": null,
         "order": 65,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/eventmanagement/list?{?}",
+                "uri": "{/base}/eventmanagement/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/eventmanagement/create?{?}",
+                "uri": "{/base}/eventmanagement/create",
                 "target": "self",
                 "icon": null,
                 "order": 5,
diff --git a/Admin/Install/db.json b/Admin/Install/db.json
index c99c61f..19fb185 100755
--- a/Admin/Install/db.json
+++ b/Admin/Install/db.json
@@ -82,6 +82,13 @@
                 "null": false,
                 "foreignTable": "account",
                 "foreignKey": "account_id"
+            },
+            "eventmanagement_event_unit": {
+                "name": "eventmanagement_event_unit",
+                "type": "INT",
+                "null": false,
+                "foreignTable": "unit",
+                "foreignKey": "unit_id"
             }
         }
     },
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index f6be215..05a4244 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -84,18 +84,20 @@ final class ApiController extends Controller
         $event->progress           = $request->getDataInt('progress') ?? 0;
         $event->budgetCosts->value = $request->getDataInt('budgetcosts') ?? 0;
         $event->actualCosts->value = $request->getDataInt('actualcosts') ?? 0;
+        $event->unit               = $request->getDataInt('unit') ?? $this->app->unitId;
 
         // @todo implement unit
         //$event->unit = $this->app->unitId;
 
-        if (!empty($uploadedFiles = $request->files)) {
+        // @todo implement event directory
+        if (!empty($request->files)) {
             $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
-                [],
-                [],
-                $uploadedFiles,
-                $request->header->account,
-                __DIR__ . '/../../../Modules/Media/Files/Modules/EventManagement',
-                '/Modules/EventManagement',
+                names: [],
+                fileNames: [],
+                files: $request->files,
+                account: $request->header->account,
+                basePath: __DIR__ . '/../../../Modules/Media/Files/Modules/EventManagement',
+                virtualPath: '/Modules/EventManagement',
             );
 
             foreach ($uploaded as $media) {
diff --git a/Models/Event.php b/Models/Event.php
index 544ee7c..15e4c9a 100755
--- a/Models/Event.php
+++ b/Models/Event.php
@@ -174,6 +174,8 @@ class Event
      */
     public array $accountRelations = [];
 
+    public int $unit = 0;
+
     /**
      * Constructor.
      *
diff --git a/Models/EventMapper.php b/Models/EventMapper.php
index d13a0d2..21a28ea 100755
--- a/Models/EventMapper.php
+++ b/Models/EventMapper.php
@@ -54,6 +54,7 @@ final class EventMapper extends DataMapperFactory
         'eventmanagement_event_actualearnings' => ['name' => 'eventmanagement_event_actualearnings',      'type' => 'Serializable', 'internal' => 'actualEarnings'],
         'eventmanagement_event_created_by'     => ['name' => 'eventmanagement_event_created_by',    'type' => 'int',          'internal' => 'createdBy', 'readonly' => true],
         'eventmanagement_event_created_at'     => ['name' => 'eventmanagement_event_created_at',    'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
+        'eventmanagement_event_unit'           => ['name' => 'eventmanagement_event_unit',    'type' => 'int',          'internal' => 'unit'],
     ];
 
     /**
diff --git a/Theme/Backend/eventmanagement-view.tpl.php b/Theme/Backend/eventmanagement-view.tpl.php
index da4d53b..35a393e 100644
--- a/Theme/Backend/eventmanagement-view.tpl.php
+++ b/Theme/Backend/eventmanagement-view.tpl.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 use Modules\EventManagement\Models\NullEvent;
 use Modules\EventManagement\Models\ProgressType;
 
-/** \Modules\EventManagement\Models\Event $event */
+/** @var \Modules\EventManagement\Models\Event $event */
 $event = $this->data['event'] ?? new NullEvent();
 
 $isNew = $event->id === 0;
@@ -72,7 +72,7 @@ echo $this->data['nav']->render(); ?>
                             </select>
                         </div>
                         <div>
-                            <input type="text" id="iProgress" name="progress" value="<?= $event->progress; ?>"<?= $event->progressType !== ProgressType::MANUAL ? ' disabled' : ''; ?>>
+                            <input type="number" id="iProgress" name="progress" step="1" min="0" max="100" value="<?= $event->progress; ?>"<?= $event->progressType !== ProgressType::MANUAL ? ' disabled' : ''; ?>>
                         </div>
                     </div>
                 </div>
@@ -81,14 +81,14 @@ echo $this->data['nav']->render(); ?>
                     <div>
                         <div class="form-group">
                         <label for="iBudget"><?= $this->getHtml('Budget'); ?></label><td>
-                            <input type="text" id="iBudget" name="budget">
+                            <input type="number" step="any" id="iBudget" name="budget">
                         </div>
                     </div>
 
                     <div>
                         <div class="form-group">
                         <label for="iActual"><?= $this->getHtml('Actual'); ?></label>
-                            <input type="text" id="iActual" name="actual">
+                            <input type="number" step="any" id="iActual" name="actual">
                         </div>
                     </div>
                 </div>