diff --git a/Layout/default/UserProfile/Index.php b/Layout/default/UserProfile/Index.php
index 7a69cfb52..937ecc0fc 100644
--- a/Layout/default/UserProfile/Index.php
+++ b/Layout/default/UserProfile/Index.php
@@ -1,8 +1,29 @@
 <?php
+
 ?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
-<?php var_dump($userprofile); ?>
+    <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css?<?= date('U') ?>" rel="stylesheet"
+          type="text/css"/>
     <!-- start page title -->
+    <style>
+        .fa-exclamation-triangle {
+            font-size: 19px;
+            color: red;
+        }
+
+        .fa-new-code {
+            cursor: pointer;
+            color: #007bff;
+            font-size: 16px;
+            margin-left: 5px;
+        }
+
+        .fa-envelope, .fa-mobile-retro {
+            font-size: 25px;
+            vertical-align: sub;
+            margin-right: 5px;
+        }
+    </style>
     <div class="row">
         <div class="col-12">
             <div class="page-title-box">
@@ -10,97 +31,66 @@
                     <ol class="breadcrumb m-0">
                         <li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
                         </li>
-                        <li class="breadcrumb-item active">Gerätetyp</li>
                     </ol>
                 </div>
-                <h4 class="page-title">Gerätetyp</h4>
+                <h4 class="page-title">Benutzerprofil</h4>
             </div>
         </div>
     </div>
+
     <!-- end page title -->
 
+<?php
+if ($userprofile->twofactor == 0) {
+    $twoFactorsym = '<i class="fa fa-exclamation-triangle mr-1"></i>';
+    $twoFactorbtn = '<button class="btn btn-success mb-3 ">Aktivieren</button>';
+    $twoFactortype = '<div class="col-lg-2">
+                        <select class="select2 form-control" name="twofactor" id="twofactor">
+                          <option value="1">Email</option>
+                          <option value="2">SMS</option>
+                      </select></div>';
+    $twoFactorFormaction = "code2faaction";
+} else if ($userprofile->twofactor == 1) {
+    $twoFactorsym = '<i class="fa-regular fa-circle-check mr-1"></i>';
+    $twoFactorbtn = '<button class="btn btn-success mb-3 ">Ändern zu SMS</button>';
+    $twoFactortype = '<label class="col-lg-2 col-form-label"><input type="hidden" name="twofactor" value="2"/><i class="fa-light fa-envelope"></i> Email</label>';
+    $twoFactorFormaction = "change2faaction";
+} else if ($userprofile->twofactor == 2) {
+    $twoFactorsym = '<i class="fa-regular fa-circle-check mr-1"></i>';
+    $twoFactorbtn = '<button class="btn btn-success mb-3 ">Ändern zu Email</button>';
+    $twoFactortype = '<label class="col-lg-2 col-form-label"><input type="hidden" name="twofactor" value="1"/><i class="fa-light fa-mobile-retro"></i> Mobiltelefon (SMS)</label>';
+    $twoFactorFormaction = "change2faaction";
+}
 
-    <div class="card">
-        <div class="card-body mb-3">
-            <div class="row">
-                <div class="col-12">
-                    <div class="float-left">
-                        <h4 class="header-title">Liste aller Gerätetypen</h4>
-                    </div>
-                    <div class="float-right">
-                        <a class="btn btn-primary mb-2" href="<?= self::getUrl("Devicetype", "add") ?>"><i
-                                class="fas fa-plus"></i> Neuen Gerätetyp anlegen</a>
-                    </div>
-                </div>
-            </div>
-
-            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination.php"); ?>
-            <!--            --><?php //include(realpath(dirname(__FILE__) . "/../") . "/tpl/pagination-summary.php"); ?>
-
-            <table id="datatable" class="table table-striped table-hover">
-                <thead>
-                <tr>
-                    <th>Name</th>
-                    <th class="text-center">Hersteller</th>
-                    <th class="text-right">Preis</th>
-                    <th class="text-right">max. Leistung</th>
-                    <th class="text-right">erstellt von</th>
-                    <th class="edit-weight"></th>
-                </tr>
-                <tr id="filterrow">
-                    <th>Name</th>
-                    <th>Hersteller</th>
-                    <th>Preis</th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                </tr>
-
-                <thead>
-
-                <tbody>
-                <?php foreach ($devicetypes as $devicetype): ?>
-
-                    <tr>
-                        <td><?= $devicetype->name ?></td>
-                        <td class="text-center"><?= $devicetype->devicemanufactor->name ?></td>
-
-                        <td class="text-right"><?= $devicetype->price ?> €</td>
-                        <td class="text-right"><?= $devicetype->power ?> Watt</td>
-                        <td class="text-right"><?= $devicetype->creator->name ?>
-                            (<?= date("d.m.Y , H:i", $devicetype->create) ?>)
-                        </td>
-
-                        <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                            <a href="<?= self::getUrl("Devicetype", "edit", ["id" => $devicetype->id]) ?>"><i
-                                    class="far fa-edit" title="Bearbeiten"></i></a>
-                            <a href="<?= self::getUrl("Devicetype", "delete", ["id" => $devicetype->id]) ?>"
-                               onclick="if(!confirm('Gerätetyp wirklich löschen?')) return false;" class="text-danger"
-                               title="Löschen"><i class="fas fa-trash"></i></a>
-                        </td>
-                    </tr>
-
-                <?php endforeach; ?>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    </div>
-    </div>
-
-
-
-    <script type="text/javascript">
-        var hidesearch=[5];
-
-        $(document).ready(function () {
-
-        });
-    </script>
-
-
-<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>                  <div class="col-lg-10">
+?>
+    <i class="bi bi-exclamation-triangle"></i>
+    <div class="row">
+        <div class="col-lg">
+            <div class="card">
+                <div class="card-body">
+                    <h4 class=" mb-2">Allgemeine Daten</h4>
+                    <div class="card">
+                        <div class="card-body">
+                            <div class="form-group row">
+                                <div class="col-lg-2 font-weight-500">Name</div>
+                                <div class="col-lg-10">
+                                    <?= $userprofile->name ?>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <div class="col-lg-2 font-weight-500">Email</div>
+                                <div class="col-lg-10">
+                                    <?= $userprofile->email ?>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <div class="col-lg-2 font-weight-500">Mobiltelefon</div>
+                                <div class="col-lg-10">
+                                    <?= $userprofile->mobile ?>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <div class="col-lg-10">
                                     <a class="btn btn-primary mb-2"
                                        href="<?= self::getUrl("UserProfile", "edit") ?>">Bearbeiten</a>
                                 </div>