diff --git a/site/plugins/admin/app/Controllers/ApiController.php b/site/plugins/admin/app/Controllers/ApiController.php
index 44c7e3aa..5e8f716e 100644
--- a/site/plugins/admin/app/Controllers/ApiController.php
+++ b/site/plugins/admin/app/Controllers/ApiController.php
@@ -4,15 +4,17 @@ declare(strict_types=1);
 
 namespace Flextype;
 
+use Ramsey\Uuid\Uuid;
 use function Flextype\Component\I18n\__;
 use Flextype\Component\Filesystem\Filesystem;
+use Flextype\Component\Session\Session;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
 class ApiController extends Controller
 {
     /**
-     * Index page
+     * Index page for API's
      *
      * @param Request  $request  PSR7 request
      * @param Response $response PSR7 response
@@ -21,18 +23,14 @@ class ApiController extends Controller
      */
     public function index(Request $request, Response $response) : Response
     {
-        $api_list             = ['delivery' => 'Delivery'];
-        $delivery_tokens_list =  Filesystem::listContents(PATH['tokens'] . '/delivery');
-
         return $this->view->render(
             $response,
             'plugins/admin/templates/system/api/index.html',
             [
                 'menu_item' => 'api',
-                'api_list' => $api_list,
-                'delivery_tokens_list' => $delivery_tokens_list,
+                'api_list' => ['delivery' => 'Delivery'],
                 'links' =>  [
-                    'themes' => [
+                    'api' => [
                         'link' => $this->router->pathFor('admin.api.index'),
                         'title' => __('admin_api'),
                         'attributes' => ['class' => 'navbar-item active'],
@@ -42,6 +40,48 @@ class ApiController extends Controller
         );
     }
 
+    /**
+     * Index page for tokens
+     *
+     * @param Request  $request  PSR7 request
+     * @param Response $response PSR7 response
+     *
+     * @return Response
+     */
+    public function tokensIndex(Request $request, Response $response) : Response
+    {
+        $api = $request->getQueryParams()['api'];
+
+        return $this->view->render(
+            $response,
+            'plugins/admin/templates/system/api/delivery/index.html',
+            [
+                'menu_item' => 'api',
+                'api' => $api,
+                'delivery_tokens_list' => Filesystem::listContents(PATH['tokens'] . '/delivery'),
+                'links' =>  [
+                    'api' => [
+                        'link' => $this->router->pathFor('admin.api.index'),
+                        'title' => __('admin_api'),
+                        'attributes' => ['class' => 'navbar-item'],
+                    ],
+                    'api_tokens' => [
+                        'link' => $this->router->pathFor('admin.api_tokens.index') . '?api=' . $api,
+                        'title' => __('admin_'.$api),
+                        'attributes' => ['class' => 'navbar-item active'],
+                    ]
+                ],
+                'buttons' => [
+                    'api_tokens_add' => [
+                        'link' => $this->router->pathFor('admin.api_tokens.add') . '?api=' . $api,
+                        'title' => __('admin_create_new_'.$api.'_token'),
+                        'attributes' => ['class' => 'float-right btn'],
+                    ],
+                ],
+            ]
+        );
+    }
+
     /**
      * Add token page
      *
@@ -52,7 +92,33 @@ class ApiController extends Controller
      */
     public function add(Request $request, Response $response) : Response
     {
+        $api = $request->getQueryParams()['api'];
 
+        return $this->view->render(
+            $response,
+            'plugins/admin/templates/system/api/delivery/add.html',
+            [
+                'menu_item' => 'api',
+                'api' => $api,
+                'links' =>  [
+                    'api' => [
+                        'link' => $this->router->pathFor('admin.api.index'),
+                        'title' => __('admin_api'),
+                        'attributes' => ['class' => 'navbar-item'],
+                    ],
+                    'api_tokens' => [
+                        'link' => $this->router->pathFor('admin.api_tokens.index') . '?api=' . $api,
+                        'title' => __('admin_'.$api),
+                        'attributes' => ['class' => 'navbar-item'],
+                    ],
+                    'api_tokens_add' => [
+                        'link' => $this->router->pathFor('admin.api_tokens.add') . '?api=' . $api,
+                        'title' => __('admin_create_new_'.$api.'_token'),
+                        'attributes' => ['class' => 'navbar-item active'],
+                    ]
+                ],
+            ]
+        );
     }
 
     /**
@@ -63,35 +129,53 @@ class ApiController extends Controller
      *
      * @return Response
      */
-    public function addProccess(Request $request, Response $response) : Response
+    public function addProcess(Request $request, Response $response) : Response
     {
+        // Get POST data
+        $post_data = $request->getParsedBody();
 
-    }
+        // Generate API token
+        $api_token = bin2hex(random_bytes(16));
 
-    /**
-     * Rename token page
-     *
-     * @param Request  $request  PSR7 request
-     * @param Response $response PSR7 response
-     *
-     * @return Response
-     */
-    public function rename(Request $request, Response $response) : Response
-    {
+        $api_token_dir_path  = PATH['tokens'] . '/' . $post_data['api'] . '/' . $api_token;
+        $api_token_file_path = $api_token_dir_path . '/' . 'token.yaml';
 
-    }
+        if (! Filesystem::has($api_token_dir_path)) {
 
-    /**
-     * Rename token - process
-     *
-     * @param Request  $request  PSR7 request
-     * @param Response $response PSR7 response
-     *
-     * @return Response
-     */
-    public function renameProccess(Request $request, Response $response) : Response
-    {
+            // Generate UUID
+            $uuid = Uuid::uuid4()->toString();
 
+            // Get time
+            $time = date($this->registry->get('settings.date_format'), time());
+
+            // Create API Token directory
+            Filesystem::createDir($api_token_dir_path);
+
+            // Create API Token account
+            if (Filesystem::write(
+                        $api_token_file_path,
+                        $this->parser->encode([
+                            'title' => $post_data['title'],
+                            'icon' => $post_data['icon'],
+                            'limit_calls' => (int)$post_data['limit_calls'],
+                            'limit_rate' => $post_data['limit_rate'],
+                            'state' => $post_data['state'],
+                            'uuid' => $uuid,
+                            'created_by' => Session::get('uuid'),
+                            'created_at' => $time,
+                            'updated_by' => Session::get('uuid'),
+                            'updated_at' => $time
+                        ], 'yaml')
+                    )) {
+                $this->flash->addMessage('success', __('admin_message_'.$post_data['api'].'_api_token_created'));
+            } else {
+                $this->flash->addMessage('error', __('admin_message_'.$post_data['api'].'_api_token_was_not_created'));
+            }
+        } else {
+            $this->flash->addMessage('error', __('admin_message_'.$post_data['api'].'_api_token_was_not_created'));
+        }
+
+        return $response->withRedirect($this->router->pathFor('admin.api_tokens.index') . '?api=' . $post_data['api']);
     }
 
     /**
@@ -104,7 +188,37 @@ class ApiController extends Controller
      */
     public function edit(Request $request, Response $response) : Response
     {
+        $api            = $request->getQueryParams()['api'];
+        $api_token      = $request->getQueryParams()['api_token'];
+        $api_token_data = $this->parser->decode(Filesystem::read(PATH['tokens'] . '/' . $api . '/' . $api_token . '/token.yaml'), 'yaml');
 
+        return $this->view->render(
+            $response,
+            'plugins/admin/templates/system/api/delivery/edit.html',
+            [
+                'menu_item' => 'api',
+                'api' => $api,
+                'api_token' => $api_token,
+                'api_token_data' => $api_token_data,
+                'links' =>  [
+                    'api' => [
+                        'link' => $this->router->pathFor('admin.api.index'),
+                        'title' => __('admin_api'),
+                        'attributes' => ['class' => 'navbar-item'],
+                    ],
+                    'api_tokens' => [
+                        'link' => $this->router->pathFor('admin.api_tokens.index') . '?api=' . $api,
+                        'title' => __('admin_'.$api),
+                        'attributes' => ['class' => 'navbar-item'],
+                    ],
+                    'api_tokens_add' => [
+                        'link' => $this->router->pathFor('admin.api_tokens.add') . '?api=' . $api,
+                        'title' => __('admin_create_new_'.$api.'_token'),
+                        'attributes' => ['class' => 'navbar-item active'],
+                    ]
+                ],
+            ]
+        );
     }
 
     /**
@@ -115,9 +229,38 @@ class ApiController extends Controller
      *
      * @return Response
      */
-    public function editProccess(Request $request, Response $response) : Response
+    public function editProcess(Request $request, Response $response) : Response
     {
+        // Get POST data
+        $post_data = $request->getParsedBody();
 
+        $api_token_dir_path  = PATH['tokens'] . '/' . $post_data['api'] . '/' . $post_data['api_token'];
+        $api_token_file_path = $api_token_dir_path . '/' . 'token.yaml';
+
+        // Update API Token File
+        if (Filesystem::has($api_token_file_path)) {
+            if (Filesystem::write(
+                        $api_token_file_path,
+                        $this->parser->encode([
+                            'title' => $post_data['title'],
+                            'icon' => $post_data['icon'],
+                            'limit_calls' => (int)$post_data['limit_calls'],
+                            'limit_rate' => $post_data['limit_rate'],
+                            'state' => $post_data['state'],
+                            'uuid' => $post_data['uuid'],
+                            'created_by' => $post_data['created_by'],
+                            'created_at' => $post_data['created_at'],
+                            'updated_by' => Session::get('uuid'),
+                            'updated_at' => date($this->registry->get('settings.date_format'), time())
+                        ], 'yaml')
+                    )) {
+                $this->flash->addMessage('success', __('admin_message_'.$post_data['api'].'_api_token_updated'));
+            }
+        } else {
+            $this->flash->addMessage('error', __('admin_message_'.$post_data['api'].'_api_token_was_not_updated'));
+        }
+
+        return $response->withRedirect($this->router->pathFor('admin.api_tokens.index') . '?api=' . $data['api']);
     }
 
     /**
@@ -128,8 +271,19 @@ class ApiController extends Controller
      *
      * @return Response
      */
-    public function deleteProccess(Request $request, Response $response) : Response
+    public function deleteProcess(Request $request, Response $response) : Response
     {
+        // Get POST data
+        $post_data = $request->getParsedBody();
 
+        $api_token_dir_path  = PATH['tokens'] . '/' . $post_data['api'] . '/' . $post_data['api_token'];
+
+        if (Filesystem::deleteDir($api_token_dir_path)) {
+            $this->flash->addMessage('success', __('admin_message_'.$post_data['api'].'_api_token_deleted'));
+        } else {
+            $this->flash->addMessage('error', __('admin_message_'.$post_data['api'].'_api_token_was_not_deleted'));
+        }
+
+        return $response->withRedirect($this->router->pathFor('admin.api_tokens.index') . '?api=' . $post_data['api']);
     }
 }