diff --git a/Admin/Activate.php b/Admin/Activate.php
index 4af9316..33f3830 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\RiskManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\ActivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function activate(Pool $dbPool, InfoManager $info)
+    public static function activate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::activate($dbPool, $info);
     }
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index 919a800..26f02e3 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\RiskManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\DeactivateAbstract;
 use phpOMS\Module\InfoManager;
 
@@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function deactivate(Pool $dbPool, InfoManager $info)
+    public static function deactivate(DatabasePool $dbPool, InfoManager $info)
     {
         parent::deactivate($dbPool, $info);
     }
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index fd5feec..3c98ee4 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -14,7 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\RiskManagement\Admin\Install;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 
 /**
  * Navigation class.
@@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
  */
 class Navigation
 {
-    public static function install(Pool $dbPool)
+    public static function install(string $path, DatabasePool $dbPool)
     {
         $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index ca344be..d6ff85b 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\RiskManagement\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
@@ -37,9 +37,9 @@ class Installer extends InstallerAbstract
     /**
      * {@inheritdoc}
      */
-    public static function install(Pool $dbPool, InfoManager $info)
+    public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
     {
-        parent::install($dbPool, $info);
+        parent::install($path, $dbPool, $info);
 
         switch ($dbPool->get('core')->getType()) {
             case DatabaseType::MYSQL:
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index f9f0406..cc2b3d9 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -15,6 +15,12 @@ return [
             'verb' => RouteVerb::GET,
         ],
     ],
+    '^.*/backend/controlling/riskmanagement/risk/create.*$' => [
+        [
+            'dest' => '\Modules\RiskManagement\Controller:viewRiskCreate', 
+            'verb' => RouteVerb::GET,
+        ],
+    ],
     '^.*/backend/controlling/riskmanagement/cause/list.*$' => [
         [
             'dest' => '\Modules\RiskManagement\Controller:viewRiskCauseList', 
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index 276d25b..e2a3ac0 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\RiskManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
 use phpOMS\Module\UninstallAbstract;
 
@@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract
     /**
      * {@inheritdoc}
      */
-    public static function uninstall(Pool $dbPool, InfoManager $info)
+    public static function uninstall(DatabasePool $dbPool, InfoManager $info)
     {
         parent::uninstall($dbPool, $info);
 
diff --git a/Admin/Update.php b/Admin/Update.php
index f5ce798..225372d 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,7 +16,7 @@
 namespace Modules\RiskManagement\Admin;
 
 
-use phpOMS\DataStorage\Database\Pool;
+use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdateAbstract;
 use phpOMS\System\File\Directory;
 
@@ -37,7 +37,7 @@ class Update extends UpdateAbstract
     /**
      * {@inheritdoc}
      */
-    public static function update(Pool $dbPool, array $info)
+    public static function update(DatabasePool $dbPool, array $info)
     {
         Directory::deletePath(__DIR__ . '/Update');
         mkdir('Update');
diff --git a/Controller.php b/Controller.php
index f32ba4c..3e31c69 100644
--- a/Controller.php
+++ b/Controller.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_PATH = __DIR__;
+    /* public */ const MODULE_PATH = __DIR__;
 
     /**
      * Module version.
@@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_VERSION = '1.0.0';
+    /* public */ const MODULE_VERSION = '1.0.0';
 
     /**
      * Module name.
@@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    const MODULE_NAME = 'RiskManagement';
+    /* public */ const MODULE_NAME = 'RiskManagement';
 
     /**
      * Providing.
@@ -78,6 +78,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since 1.0.0
      */
     protected static $dependencies = [
+        'Media'
     ];
 
     /**
@@ -118,6 +119,25 @@ class Controller extends ModuleAbstract implements WebInterface
         return $view;
     }
 
+    /**
+     * @param RequestAbstract  $request  Request
+     * @param ResponseAbstract $response Response
+     * @param mixed            $data     Generic data
+     *
+     * @return RenderableInterface
+     *
+     * @since  1.0.0
+     * @author Dennis Eichhorn <d.eichhorn@oms.com>
+     */
+    public function viewRiskCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
+    {
+        $view = new View($this->app, $request, $response);
+        $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-create');
+        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response));
+
+        return $view;
+    }
+
     /**
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index b9648b4..d03c751 100644
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/category-list.tpl.php
+++ b/Theme/Backend/category-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/cause-create.tpl.php b/Theme/Backend/cause-create.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/cause-create.tpl.php
+++ b/Theme/Backend/cause-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/cause-list.tpl.php
+++ b/Theme/Backend/cause-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php
index 6d22aca..fe116f6 100644
--- a/Theme/Backend/cockpit.tpl.php
+++ b/Theme/Backend/cockpit.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -38,6 +38,7 @@ echo $this->getData('nav')->render(); ?>
                 <td><?= $this->getText('Category'); ?>
                 <td><?= $this->getText('Process'); ?>
                 <td><?= $this->getText('Project'); ?>
+                <td><?= $this->getText('Unit'); ?>
             <tfoot>
             <tr><td colspan="6"><?= $footerView->render(); ?>
             <tbody>
@@ -48,15 +49,22 @@ echo $this->getData('nav')->render(); ?>
                 <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
                 <td>
                 <td>
+                <td>
                 <td>
                     <?php endforeach; ?>
                     <?php if($c === 0) : ?>
-            <tr><td colspan="6" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+            <tr><td colspan="7" class="empty"><?= $this->getText('Empty', 0, 0); ?>
                     <?php endif; ?>
         </table>
     </div>
 </section>
 <section class="wf-25 floatLeft">
+    <section class="box w-100">
+        <div class="inner">
+            <a class="button" href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/controlling/riskmanagement/risk/create'); ?>"><?= $this->getText('NewRisk'); ?></a>
+        </div>
+    </section>
+
     <section class="box w-100">
         <header><h1><?= $this->getText('Statistics'); ?></h1></header>
         <div class="inner">
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php
index b4092da..273ce88 100644
--- a/Theme/Backend/risk-create.tpl.php
+++ b/Theme/Backend/risk-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -14,3 +14,258 @@
  * @link       http://orange-management.com
  */
 echo $this->getData('nav')->render(); ?>
+
+<div class="tabular-2">
+    <div class="box">
+        <ul class="tab-links">
+            <li><label for="c-tab-1"><?= $this->getText('Risk') ?></label>
+            <li><label for="c-tab-2"><?= $this->getText('RiskStatus') ?></label>
+            <li><label for="c-tab-3"><?= $this->getText('RiskObjects') ?></label>
+            <li><label for="c-tab-4"><?= $this->getText('RiskObjectStatus') ?></label>
+            <li><label for="c-tab-5"><?= $this->getText('Solutions') ?></label>
+        </ul>
+    </div>
+    <div class="tab-content">
+        <input type="radio" id="c-tab-1" name="tabular-2" checked>
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Risk'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iName"><?= $this->getText('Name'); ?></label>
+                            <tr><td><input type="text" id="iName" name="name" placeholder="&#xf040; <?= $this->getText('Name'); ?>" required>
+                            <tr><td><label for="iDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iDescription" name="description"></textarea>
+                            <tr><td><label for="iCategory"><?= $this->getText('Category'); ?></label>
+                            <tr><td><input type="text" id="iCategory" name="category" placeholder="&#xf040; <?= $this->getText('Category'); ?>">
+                            <tr><td><label for="iDepartment"><?= $this->getText('Department'); ?></label>
+                            <tr><td><input type="text" id="iDepartment" name="department" placeholder="&#xf040; <?= $this->getText('Department'); ?>">
+                            <tr><td><label for="iProcess"><?= $this->getText('Process'); ?></label>
+                            <tr><td><input type="text" id="iProcess" name="process" placeholder="&#xf040; <?= $this->getText('Process'); ?>">
+                            <tr><td><label for="iProject"><?= $this->getText('Project'); ?></label>
+                            <tr><td><input type="text" id="iProject" name="project" placeholder="&#xf040; <?= $this->getText('Project'); ?>">
+                            <tr><td><label for="iReview"><?= $this->getText('Review'); ?></label>
+                            <tr><td><input type="datetime-local" id="iReview" name="Review" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Responsibility'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iResponsibility"><?= $this->getText('Responsibility'); ?></label><td><label for="iUser"><?= $this->getText('UserGroup'); ?></label><td>
+                            <tr><td><select id="iStatus" name="status">
+                                        <option value="">
+                                    </select>
+                                <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iUser" name="user" placeholder=""></span><td><button><?= $this->getText('Add', 0, 0); ?></button>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-2" name="tabular-2">
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('RiskStatus'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iRiskConsequence"><?= $this->getText('RiskConsequence'); ?></label>
+                            <tr><td><select id="iRiskConsequence" name="riskconsequence">
+
+                                    </select>
+                            <tr><td><label for="iRiskLikelihood"><?= $this->getText('RiskLikelihood'); ?></label>
+                            <tr><td><select id="iRiskLikelihood" name="risklikelihood">
+
+                                    </select>
+                            <tr><td><label for="iRiskConsequence"><?= $this->getText('RiskConsequence'); ?></label>
+                            <tr><td><select id="iRiskConsequence" name="riskconsequence">
+
+                                    </select>
+                            <tr><td><label for="iRiskLikelihood"><?= $this->getText('RiskLikelihood'); ?></label>
+                            <tr><td><select id="iRiskLikelihood" name="risklikelihood">
+
+                                    </select>
+                            <tr><td><label for="iRiskStatusDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iRiskStatusDescription" name="riskstatusdescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-3" name="tabular-2">
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('RiskObjects'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iRiskObjectName"><?= $this->getText('Name'); ?></label>
+                            <tr><td><input type="text" id="iRiskObjectName" name="riskobjectname" placeholder="&#xf040; <?= $this->getText('Name'); ?>">
+                            <tr><td><label for="iRiskObjectDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iRiskObjectDescription" name="riskobjectdescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-4" name="tabular-2">
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('RiskObjectStatus'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iRiskObjectNameValue"><?= $this->getText('RiskObject'); ?></label>
+                            <tr><td><select id="iRiskObjectNameValue" name="riskobjectnamevalue">
+
+                                    </select>
+                            <tr><td><label for="iRiskObjecValue"><?= $this->getText('Value'); ?></label>
+                            <tr><td><input type="text" id="iRiskObjecValue" name="riskobjectvalue">
+                            <tr><td><label for="iRiskObjecValueDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iRiskObjecValueDescription" name="riskobjectvaluedescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-5" name="tabular-2">
+        <div class="tab">
+             <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Solution'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iSolutionName"><?= $this->getText('Name'); ?></label>
+                            <tr><td><input type="text" id="iSolutionName" name="solutionname">
+                            <tr><td><label for="iSolutioType"><?= $this->getText('Type'); ?></label>
+                            <tr><td><select id="iSolutioType" name="solutiontype">
+                                        <option>Preventing
+                                        <option>Disclosing
+                                    </select>
+                            <tr><td><label for="iSolutioFrequency"><?= $this->getText('Frequency'); ?></label>
+                            <tr><td><select id="iSolutioFrequency" name="solutionfrequency">
+                                        <option>Permanently
+                                        <option>Daily
+                                        <option>Weekly
+                                        <option>Monthly
+                                        <option>Quarterly
+                                        <option>Semiannual
+                                        <option>Annual
+                                    </select>
+                            <tr><td><label for="iSolutioAssessment"><?= $this->getText('Assessment'); ?></label>
+                            <tr><td><select id="iSolutioAssessment" name="solutionassessment">
+                                        <option>Manual
+                                        <option>IT-dependent
+                                        <option>IT
+                                    </select>
+                            <tr><td><label for="iSolutionDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iSolutionDescription" name="solutionDescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/Theme/Backend/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/risk-list.tpl.php
+++ b/Theme/Backend/risk-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/risk-single-cause.tpl.php b/Theme/Backend/risk-single-cause.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/risk-single-cause.tpl.php
+++ b/Theme/Backend/risk-single-cause.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/risk-single-dashboard.tpl.php b/Theme/Backend/risk-single-dashboard.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/risk-single-dashboard.tpl.php
+++ b/Theme/Backend/risk-single-dashboard.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/risk-single-solution.tpl.php b/Theme/Backend/risk-single-solution.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/risk-single-solution.tpl.php
+++ b/Theme/Backend/risk-single-solution.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/settings-dashboard.tpl.php b/Theme/Backend/settings-dashboard.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/settings-dashboard.tpl.php
+++ b/Theme/Backend/settings-dashboard.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/solution-list.tpl.php
+++ b/Theme/Backend/solution-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/Backend/unit-list.tpl.php
+++ b/Theme/Backend/unit-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php
index 876fd3b..a8d1209 100644
--- a/Theme/backend/Lang/en.lang.php
+++ b/Theme/backend/Lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -16,6 +16,7 @@
 return ['RiskManagement' => [
     'Active'            => 'Active',
     'All'               => 'All',
+    'Assessment'               => 'Assessment',
     'AvgRiskAmount'     => 'Avg. Risk Amount',
     'Basic'             => 'Basic',
     'Categories'        => 'Categories',
@@ -31,6 +32,7 @@ return ['RiskManagement' => [
     'Due'               => 'Due',
     'Evaluation'        => 'Evaluation',
     'Export'            => 'Export',
+    'Frequency'             => 'Frequency',
     'Front'             => 'Front',
     'History'           => 'History',
     'Interval'          => 'Interval',
@@ -42,9 +44,11 @@ return ['RiskManagement' => [
     'MainCategory'      => 'Main Category',
     'MainDepartment'    => 'Main Department',
     'Manager'           => 'Manager',
+    'Media'           => 'Media',
     'Name'              => 'Name',
     'Navigation'        => 'Navigation',
     'New'               => 'New',
+    'NewRisk'               => 'New Risk',
     'NextReevaluation'  => 'Next Reevaluation',
     'Outdated'          => 'Outdated',
     'OverallRisk'       => 'Overall Risk',
@@ -59,13 +63,22 @@ return ['RiskManagement' => [
     'Reduction'         => 'Reduction',
     'RemainingRisk'     => 'Remaining Risk',
     'Responsible'       => 'Responsible',
+    'Responsibility'       => 'Responsibility',
+    'Review'            => 'Review',
     'Risk'              => 'Risk',
     'RiskAcceptance'    => 'Risk Acceptance',
+    'RiskConsequence'    => 'Risk Consequence',
     'RiskIndex'         => 'Risk Index',
     'RiskLevels'        => 'Risk Levels',
+    'RiskLikelihood'    => 'Risk Likelihood',
+    'RiskObject'        => 'Risk Object',
+    'RiskObjects'        => 'Risk Objects',
+    'RiskObjectStatus'        => 'Risk Object Status',
     'RiskProbabilities' => 'Risk Probabilities',
     'RiskProtection'    => 'Risk Protection',
+    'RiskStatus'    => 'Risk Status',
     'Risks'             => 'Risks',
+    'Select'          => 'Select',
     'Severity'          => 'Severity',
     'Solution'          => 'Solution',
     'Solutions'         => 'Solutions',
@@ -78,5 +91,8 @@ return ['RiskManagement' => [
     'Type'              => 'Type',
     'Unit'              => 'Unit',
     'Units'             => 'Units',
+    'Upload'             => 'Upload',
+    'UserGroup'             => 'User/Group',
+    'Value'         => 'Value',
     'Watchlist'         => 'Watchlist',
 ]];
diff --git a/Theme/backend/category-list.tpl.php b/Theme/backend/category-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/category-list.tpl.php
+++ b/Theme/backend/category-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/cause-create.tpl.php b/Theme/backend/cause-create.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/cause-create.tpl.php
+++ b/Theme/backend/cause-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/cause-list.tpl.php b/Theme/backend/cause-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/cause-list.tpl.php
+++ b/Theme/backend/cause-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/cockpit.tpl.php b/Theme/backend/cockpit.tpl.php
index 6d22aca..fe116f6 100644
--- a/Theme/backend/cockpit.tpl.php
+++ b/Theme/backend/cockpit.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -38,6 +38,7 @@ echo $this->getData('nav')->render(); ?>
                 <td><?= $this->getText('Category'); ?>
                 <td><?= $this->getText('Process'); ?>
                 <td><?= $this->getText('Project'); ?>
+                <td><?= $this->getText('Unit'); ?>
             <tfoot>
             <tr><td colspan="6"><?= $footerView->render(); ?>
             <tbody>
@@ -48,15 +49,22 @@ echo $this->getData('nav')->render(); ?>
                 <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
                 <td>
                 <td>
+                <td>
                 <td>
                     <?php endforeach; ?>
                     <?php if($c === 0) : ?>
-            <tr><td colspan="6" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+            <tr><td colspan="7" class="empty"><?= $this->getText('Empty', 0, 0); ?>
                     <?php endif; ?>
         </table>
     </div>
 </section>
 <section class="wf-25 floatLeft">
+    <section class="box w-100">
+        <div class="inner">
+            <a class="button" href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/controlling/riskmanagement/risk/create'); ?>"><?= $this->getText('NewRisk'); ?></a>
+        </div>
+    </section>
+
     <section class="box w-100">
         <header><h1><?= $this->getText('Statistics'); ?></h1></header>
         <div class="inner">
diff --git a/Theme/backend/process-list.tpl.php b/Theme/backend/process-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/process-list.tpl.php
+++ b/Theme/backend/process-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/project-list.tpl.php b/Theme/backend/project-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/project-list.tpl.php
+++ b/Theme/backend/project-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/risk-create.tpl.php b/Theme/backend/risk-create.tpl.php
index b4092da..273ce88 100644
--- a/Theme/backend/risk-create.tpl.php
+++ b/Theme/backend/risk-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -14,3 +14,258 @@
  * @link       http://orange-management.com
  */
 echo $this->getData('nav')->render(); ?>
+
+<div class="tabular-2">
+    <div class="box">
+        <ul class="tab-links">
+            <li><label for="c-tab-1"><?= $this->getText('Risk') ?></label>
+            <li><label for="c-tab-2"><?= $this->getText('RiskStatus') ?></label>
+            <li><label for="c-tab-3"><?= $this->getText('RiskObjects') ?></label>
+            <li><label for="c-tab-4"><?= $this->getText('RiskObjectStatus') ?></label>
+            <li><label for="c-tab-5"><?= $this->getText('Solutions') ?></label>
+        </ul>
+    </div>
+    <div class="tab-content">
+        <input type="radio" id="c-tab-1" name="tabular-2" checked>
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Risk'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iName"><?= $this->getText('Name'); ?></label>
+                            <tr><td><input type="text" id="iName" name="name" placeholder="&#xf040; <?= $this->getText('Name'); ?>" required>
+                            <tr><td><label for="iDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iDescription" name="description"></textarea>
+                            <tr><td><label for="iCategory"><?= $this->getText('Category'); ?></label>
+                            <tr><td><input type="text" id="iCategory" name="category" placeholder="&#xf040; <?= $this->getText('Category'); ?>">
+                            <tr><td><label for="iDepartment"><?= $this->getText('Department'); ?></label>
+                            <tr><td><input type="text" id="iDepartment" name="department" placeholder="&#xf040; <?= $this->getText('Department'); ?>">
+                            <tr><td><label for="iProcess"><?= $this->getText('Process'); ?></label>
+                            <tr><td><input type="text" id="iProcess" name="process" placeholder="&#xf040; <?= $this->getText('Process'); ?>">
+                            <tr><td><label for="iProject"><?= $this->getText('Project'); ?></label>
+                            <tr><td><input type="text" id="iProject" name="project" placeholder="&#xf040; <?= $this->getText('Project'); ?>">
+                            <tr><td><label for="iReview"><?= $this->getText('Review'); ?></label>
+                            <tr><td><input type="datetime-local" id="iReview" name="Review" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Responsibility'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iResponsibility"><?= $this->getText('Responsibility'); ?></label><td><label for="iUser"><?= $this->getText('UserGroup'); ?></label><td>
+                            <tr><td><select id="iStatus" name="status">
+                                        <option value="">
+                                    </select>
+                                <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iUser" name="user" placeholder=""></span><td><button><?= $this->getText('Add', 0, 0); ?></button>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-2" name="tabular-2">
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('RiskStatus'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iRiskConsequence"><?= $this->getText('RiskConsequence'); ?></label>
+                            <tr><td><select id="iRiskConsequence" name="riskconsequence">
+
+                                    </select>
+                            <tr><td><label for="iRiskLikelihood"><?= $this->getText('RiskLikelihood'); ?></label>
+                            <tr><td><select id="iRiskLikelihood" name="risklikelihood">
+
+                                    </select>
+                            <tr><td><label for="iRiskConsequence"><?= $this->getText('RiskConsequence'); ?></label>
+                            <tr><td><select id="iRiskConsequence" name="riskconsequence">
+
+                                    </select>
+                            <tr><td><label for="iRiskLikelihood"><?= $this->getText('RiskLikelihood'); ?></label>
+                            <tr><td><select id="iRiskLikelihood" name="risklikelihood">
+
+                                    </select>
+                            <tr><td><label for="iRiskStatusDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iRiskStatusDescription" name="riskstatusdescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-3" name="tabular-2">
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('RiskObjects'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iRiskObjectName"><?= $this->getText('Name'); ?></label>
+                            <tr><td><input type="text" id="iRiskObjectName" name="riskobjectname" placeholder="&#xf040; <?= $this->getText('Name'); ?>">
+                            <tr><td><label for="iRiskObjectDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iRiskObjectDescription" name="riskobjectdescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-4" name="tabular-2">
+        <div class="tab">
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('RiskObjectStatus'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iRiskObjectNameValue"><?= $this->getText('RiskObject'); ?></label>
+                            <tr><td><select id="iRiskObjectNameValue" name="riskobjectnamevalue">
+
+                                    </select>
+                            <tr><td><label for="iRiskObjecValue"><?= $this->getText('Value'); ?></label>
+                            <tr><td><input type="text" id="iRiskObjecValue" name="riskobjectvalue">
+                            <tr><td><label for="iRiskObjecValueDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iRiskObjecValueDescription" name="riskobjectvaluedescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+        <input type="radio" id="c-tab-5" name="tabular-2">
+        <div class="tab">
+             <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Solution'); ?></h1></header>
+
+                <div class="inner">
+                    <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/controlling/riskmanagement?csrf={$CSRF}'); ?>">
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td><label for="iSolutionName"><?= $this->getText('Name'); ?></label>
+                            <tr><td><input type="text" id="iSolutionName" name="solutionname">
+                            <tr><td><label for="iSolutioType"><?= $this->getText('Type'); ?></label>
+                            <tr><td><select id="iSolutioType" name="solutiontype">
+                                        <option>Preventing
+                                        <option>Disclosing
+                                    </select>
+                            <tr><td><label for="iSolutioFrequency"><?= $this->getText('Frequency'); ?></label>
+                            <tr><td><select id="iSolutioFrequency" name="solutionfrequency">
+                                        <option>Permanently
+                                        <option>Daily
+                                        <option>Weekly
+                                        <option>Monthly
+                                        <option>Quarterly
+                                        <option>Semiannual
+                                        <option>Annual
+                                    </select>
+                            <tr><td><label for="iSolutioAssessment"><?= $this->getText('Assessment'); ?></label>
+                            <tr><td><select id="iSolutioAssessment" name="solutionassessment">
+                                        <option>Manual
+                                        <option>IT-dependent
+                                        <option>IT
+                                    </select>
+                            <tr><td><label for="iSolutionDescription"><?= $this->getText('Description'); ?></label>
+                            <tr><td><textarea id="iSolutionDescription" name="solutionDescription"></textarea>
+                            <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                        </table>
+                    </form>
+                </div>
+            </section>
+
+            <section class="box w-50 floatLeft">
+                <header><h1><?= $this->getText('Media'); ?></h1></header>
+
+                <div class="inner">
+                    <form>
+                        <table class="layout wf-100">
+                            <tbody>
+                            <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                            <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                            <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                            <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        </table>
+                    </form>
+                </div>
+            </section>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/Theme/backend/risk-list.tpl.php b/Theme/backend/risk-list.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/risk-list.tpl.php
+++ b/Theme/backend/risk-list.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/risk-single-cause.tpl.php b/Theme/backend/risk-single-cause.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/risk-single-cause.tpl.php
+++ b/Theme/backend/risk-single-cause.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/risk-single-dashboard.tpl.php b/Theme/backend/risk-single-dashboard.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/risk-single-dashboard.tpl.php
+++ b/Theme/backend/risk-single-dashboard.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
diff --git a/Theme/backend/solution-create.tpl.php b/Theme/backend/solution-create.tpl.php
index b4092da..01c1a1e 100644
--- a/Theme/backend/solution-create.tpl.php
+++ b/Theme/backend/solution-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD