diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index ef05676..4be7261 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -48,13 +48,13 @@
                 "pid": "/qa",
                 "type": 3,
                 "subtype": 1,
-                "name": "Badges",
-                "uri": "{/base}/qa/badge/list?{?}",
+                "name": "Apps",
+                "uri": "{/base}/qa/app/list?{?}",
                 "target": "self",
                 "icon": null,
-                "order": 10,
+                "order": 20,
                 "from": "QA",
-                "permission": { "permission": 2, "category": null, "element": null },
+                "permission": { "permission": 4, "category": null, "element": null },
                 "parent": 1006001001,
                 "children": []
             }
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 5c4c26b..12f5224 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -22,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiQAAppCreate',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -31,6 +32,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiQAAppUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -42,6 +44,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiQAQuestionCreate',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -51,6 +54,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiQuestionUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -62,6 +66,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiChangeQAQuestionVote',
             'verb'       => RouteVerb::PUT | RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -73,6 +78,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiQAAnswerCreate',
             'verb'       => RouteVerb::PUT,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -82,6 +88,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiAnswerUpdate',
             'verb'       => RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -93,6 +100,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiChangeQAAnswerVote',
             'verb'       => RouteVerb::PUT | RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -104,6 +112,7 @@ return [
         [
             'dest'       => '\Modules\QA\Controller\ApiController:apiChangeAnsweredStatus',
             'verb'       => RouteVerb::PUT | RouteVerb::SET,
+            'csrf'       => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 82ee328..db68399 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -73,4 +73,37 @@ return [
             ],
         ],
     ],
+    '^.*/qa/app/list(\?.*$|$)' => [
+        [
+            'dest'       => '\Modules\QA\Controller\BackendController:viewQAAppList',
+            'verb'       => RouteVerb::GET,
+            'permission' => [
+                'module' => BackendController::NAME,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionCategory::APP,
+            ],
+        ],
+    ],
+    '^.*/qa/app/view(\?.*$|$)' => [
+        [
+            'dest'       => '\Modules\QA\Controller\BackendController:viewQAApp',
+            'verb'       => RouteVerb::GET,
+            'permission' => [
+                'module' => BackendController::NAME,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionCategory::APP,
+            ],
+        ],
+    ],
+    '^.*/qa/app/create(\?.*$|$)' => [
+        [
+            'dest'       => '\Modules\QA\Controller\BackendController:viewQAAppCreate',
+            'verb'       => RouteVerb::GET,
+            'permission' => [
+                'module' => BackendController::NAME,
+                'type'   => PermissionType::CREATE,
+                'state'  => PermissionCategory::APP,
+            ],
+        ],
+    ],
 ];
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 7f2279e..70d0685 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -358,7 +358,7 @@ final class ApiController extends Controller
         }
 
         /** @var \Modules\QA\Models\QAAnswer $newAccepted */
-        $newAccepted    = QAAnswerMapper::get()->with('profile')->where('id', (int) $request->getData('id'))->execute();
+        $newAccepted    = QAAnswerMapper::get()->with('createdBy')->where('id', (int) $request->getData('id'))->execute();
         $oldNewAccepted = clone $newAccepted;
 
         /** @var \Modules\QA\Models\QAQuestion $question */