diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a0dd754..40977c0 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -228,8 +228,8 @@ final class ApiController extends Controller
     private function validateWikiCategoryL11nCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['name'] = !$request->hasData('name'))
-            || ($val['category'] = !$request->hasData('category'))
+        if (($val['content'] = !$request->hasData('content'))
+            || ($val['ref'] = !$request->hasData('ref'))
         ) {
             return $val;
         }
@@ -276,9 +276,9 @@ final class ApiController extends Controller
     private function createWikiCategoryL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
         $l11nWikiCategory           = new BaseStringL11n();
-        $l11nWikiCategory->ref      = $request->getDataInt('category') ?? 0;
+        $l11nWikiCategory->ref      = $request->getDataInt('ref') ?? 0;
         $l11nWikiCategory->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
-        $l11nWikiCategory->content  = $request->getDataString('name') ?? '';
+        $l11nWikiCategory->content  = $request->getDataString('content') ?? '';
 
         return $l11nWikiCategory;
     }
@@ -418,7 +418,7 @@ final class ApiController extends Controller
         $category      = new WikiCategory();
         $category->app = new NullWikiApp($request->getDataInt('app') ?? 1);
         $category->setL11n(
-            $request->getDataString('name') ?? '',
+            $request->getDataString('content') ?? '',
             ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language
         );
 
@@ -441,7 +441,7 @@ final class ApiController extends Controller
     private function validateWikiCategoryCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['name'] = !$request->hasData('name'))) {
+        if (($val['content'] = !$request->hasData('content'))) {
             return $val;
         }
 
@@ -508,7 +508,7 @@ final class ApiController extends Controller
     private function updateCategoryFromRequest(RequestAbstract $request, WikiCategory $new) : WikiCategory
     {
         $new->setL11n(
-            $request->getDataString('name') ?? $new->getL11n(),
+            $request->getDataString('content') ?? $new->getL11n(),
             ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language
         );
 
@@ -725,7 +725,7 @@ final class ApiController extends Controller
     public function updateCategoryL11nFromRequest(RequestAbstract $request, BaseStringL11n $new) : BaseStringL11n
     {
         $new->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $new->language;
-        $new->content  = $request->getDataString('title') ?? $new->content;
+        $new->content  = $request->getDataString('content') ?? $new->content;
 
         return $new;
     }
@@ -743,7 +743,7 @@ final class ApiController extends Controller
     {
         $val = [];
         if (($val['id'] = !$request->hasData('id'))
-            || (($val['title'] = !$request->hasData('title'))
+            || (($val['content'] = !$request->hasData('content'))
                 && ($val['language'] = !$request->hasData('language')))
         ) {
             return $val;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 0fdb429..b63e18f 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -448,6 +448,15 @@ final class BackendController extends Controller
 
         $view->data['doc'] = new NullWikiDoc();
 
+        $view->data['categories'] = WikiCategoryMapper::getAll()
+            ->with('name')
+            ->where('name/language', $response->header->l11n->language)
+            ->executeGetArray();
+
+        $view->data['apps'] = WikiAppMapper::getAll()
+            ->where('unit', [$this->app->unitId, null])
+            ->executeGetArray();
+
         return $view;
     }
 
@@ -481,6 +490,15 @@ final class BackendController extends Controller
 
         $view->data['doc'] = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
 
+        $view->data['categories'] = WikiCategoryMapper::getAll()
+            ->with('name')
+            ->where('name/language', $response->header->l11n->language)
+            ->executeGetArray();
+
+        $view->data['apps'] = WikiAppMapper::getAll()
+            ->where('unit', [$this->app->unitId, null])
+            ->executeGetArray();
+
         return $view;
     }
 }
diff --git a/Theme/Backend/wiki-app-view.tpl.php b/Theme/Backend/wiki-app-view.tpl.php
index cfa335b..9fe8552 100644
--- a/Theme/Backend/wiki-app-view.tpl.php
+++ b/Theme/Backend/wiki-app-view.tpl.php
@@ -24,7 +24,7 @@ echo $this->data['nav']->render();
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <section class="portlet">
-            <form method="<?= $isNew ? 'PUT' : 'POST'; ?>" action="<?= UriFactory::build('{/api}wiki/app?csrf={$CSRF}'); ?>">
+            <form id="fApp" method="<?= $isNew ? 'PUT' : 'POST'; ?>" action="<?= UriFactory::build('{/api}wiki/app?csrf={$CSRF}'); ?>">
                 <div class="portlet-head"><?= $this->getHtml('App'); ?></div>
                 <div class="portlet-body">
                     <div class="form-group">
diff --git a/Theme/Backend/wiki-category-view.tpl.php b/Theme/Backend/wiki-category-view.tpl.php
index ea2fed7..3ac41ea 100644
--- a/Theme/Backend/wiki-category-view.tpl.php
+++ b/Theme/Backend/wiki-category-view.tpl.php
@@ -25,7 +25,9 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12 col-md-6">
         <section class="portlet">
-            <form method="<?= $isNew ? 'PUT' : 'POST'; ?>" action="<?= UriFactory::build('{/api}wiki/category?csrf={$CSRF}'); ?>">
+            <form id="iCategoryForm" method="<?= $isNew ? 'PUT' : 'POST'; ?>"
+                action="<?= UriFactory::build('{/api}wiki/category?csrf={$CSRF}'); ?>"
+                <?= $isNew ? 'data-redirect="' . UriFactory::build('{/base}/wiki/category/view') . '?id={/0/response/id}"' : ''; ?>>
                 <div class="portlet-head"><?= $this->getHtml('Category'); ?></div>
                 <div class="portlet-body">
                     <div class="form-group">
@@ -73,7 +75,8 @@ echo $this->data['nav']->render(); ?>
     <?= $this->data['l11nView']->render(
         $this->data['l11nValues'],
         [],
-        '{/api}wiki/category/l11n?csrf={$CSRF}'
+        '{/api}wiki/category/l11n?csrf={$CSRF}',
+        (string) $category->id
     );
     ?>
 </div>
diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php
index bf91c44..607a22d 100755
--- a/Theme/Backend/wiki-doc-create.tpl.php
+++ b/Theme/Backend/wiki-doc-create.tpl.php
@@ -50,29 +50,28 @@ echo $this->data['nav']->render(); ?>
             <form id="docForm" method="<?= $isNewDoc ? 'PUT' : 'POST'; ?>" action="<?= UriFactory::build('{/api}wiki/doc?' . ($isNewDoc ? '' : 'id={?id}&') . 'csrf={$CSRF}'); ?>">
                 <div class="portlet-head"><?= $this->getHtml('Status'); ?></div>
                 <div class="portlet-body">
-                    <table class="layout wf-100">
-                        <tr><td>
-                                <select name="status" id="iStatus">
-                                    <option value="<?= WikiStatus::DRAFT; ?>"<?= $wiki->status === WikiStatus::DRAFT ? ' selected' : ''; ?>><?= $this->getHtml('Draft'); ?>
-                                    <option value="<?= WikiStatus::ACTIVE; ?>"<?= $wiki->status === WikiStatus::ACTIVE ? ' selected' : ''; ?>><?= $this->getHtml('Active'); ?>
-                                </select>
-                        <tr><td><label for="iLanguages"><?= $this->getHtml('Language'); ?></label>
-                        <tr><td>
-                                <select id="iLanguages" name="lang">
-                                    <?php foreach ($languages as $code => $language) : $code = \strtolower(\substr($code, 1)); ?>
-                                    <option value="<?= $this->printHtml($code); ?>"<?= $code === $wiki->language ? ' selected' : ''; ?>><?= $this->printHtml($language); ?>
-                                    <?php endforeach; ?>
-                                </select>
-                    </table>
+                    <div class="form-group">
+                        <select name="status" id="iStatus">
+                            <option value="<?= WikiStatus::DRAFT; ?>"<?= $wiki->status === WikiStatus::DRAFT ? ' selected' : ''; ?>><?= $this->getHtml('Draft'); ?>
+                            <option value="<?= WikiStatus::ACTIVE; ?>"<?= $wiki->status === WikiStatus::ACTIVE ? ' selected' : ''; ?>><?= $this->getHtml('Active'); ?>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="iLanguages"><?= $this->getHtml('Language'); ?></label>
+                        <select id="iLanguages" name="lang">
+                            <?php foreach ($languages as $code => $language) : $code = \strtolower(\substr($code, 1)); ?>
+                            <option value="<?= $this->printHtml($code); ?>"<?= $code === $wiki->language ? ' selected' : ''; ?>><?= $this->printHtml($language); ?>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
                 </div>
                 <div class="portlet-foot">
                     <table class="layout wf-100">
                         <tr>
                             <td>
-                                <?php if ($isNewDoc) : ?>
-                                    <a href="<?= UriFactory::build('{/base}/wiki/dashboard'); ?>" class="button"><?= $this->getHtml('Delete', '0', '0'); ?></a>
-                                <?php else : ?>
-                                    <input type="submit" name="deleteButton" id="iDeleteButton" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
+                                <?php if (!$isNewDoc) : ?>
+                                    <input type="submit" formmethod="DELETE" name="deleteButton" id="iDeleteButton" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
                                 <?php endif; ?>
                             <td class="rT">
                                 <input type="submit" name="saveButton" id="iSaveButton" value="<?= $this->getHtml('Save', '0', '0'); ?>">
@@ -84,14 +83,30 @@ echo $this->data['nav']->render(); ?>
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Categories'); ?></div>
             <div class="portlet-body">
-                <table class="layout wf-100">
-                    <tr><td><label for="iApp"><?= $this->getHtml('App'); ?></label>
-                    <tr><td><select id="iApp" name="app"></select>
-                    <tr><td><label for="iCategory"><?= $this->getHtml('Category'); ?></label>
-                    <tr><td><select id="iCategory" name="category"></select>
-                    <tr><td><?= $this->getHtml('Tags', 'Tag'); ?>
-                    <tr><td><?= $this->getData('tagSelector')->render('iTag', 'tag', 'fEditor', false); ?>
-                </table>
+                <div class="form-group">
+                    <label for="iApp"><?= $this->getHtml('App'); ?></label>
+                    <select id="iApp" form="docForm" name="app">
+                        <?php foreach ($this->data['apps'] as $app) : ?>
+                            <option value="<?= $app->id; ?>"<?= $app->id === $wiki->app?->id ? ' selected' : ''; ?>><?= $this->printHtml($app->name); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="iCategory"><?= $this->getHtml('Category'); ?></label>
+                    <select id="iCategory" form="docForm" name="category">
+                        <?php foreach ($this->data['categories'] as $category) : ?>
+                            <option value="<?= $category->id; ?>"<?= $category->id === $wiki->category?->id ? ' selected' : ''; ?>><?= $this->printHtml($category->name); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <!--
+                <div class="form-group">
+                    <?= $this->getHtml('Tags', 'Tag'); ?>
+                    <?= $this->getData('tagSelector')->render('iTag', 'tag', 'fEditor', false); ?>
+                </div>
+                -->
             </div>
         </section>
     </div>