diff --git a/Layout/default/Device/Detail.php b/Layout/default/Device/Detail.php
index bb57d97bc..26b6a060f 100644
--- a/Layout/default/Device/Detail.php
+++ b/Layout/default/Device/Detail.php
@@ -1,6 +1,3 @@
-<?php
-
-?>
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
     <link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet"
           type="text/css"/>
@@ -154,11 +151,14 @@
                     </ol>
                 </div>
                 <h4 class="page-title">Device: <span class="font-weight-normal ml-1"><?= $devices->data->name ?></span>
-                    <span class="ml-2">
+                    <?php if ($me->is('Admin')) : ?>
+                        <span class="ml-2">
                         <a href="<?= self::getUrl("Device", "edit", ["id" => $devices->id, 'returnto' => "device-detail"]) ?>">
                         <button class="btn btn-primary">Bearbeiten</button>
                             </a>
-                    </span></h4>
+                    </span>
+                    <?php endif; ?>
+                </h4>
             </div>
         </div>
     </div>
@@ -289,7 +289,7 @@ foreach ($devicesall as $deviceall) {
                                         <tr>
                                             <th class="w-30">Pop Name</th>
                                             <td>
-                                                <a href="<?= self::getUrl("Pop", "Detail", ["id" => $devices->pop->id]) ?>"><?= $devices->pop->name ?></a>
+                                                <?= ($me->is('Admin')) ? '<a href="' . self::getUrl("Pop", "Detail", ["id" => $devices->pop->id]) . '">' . $devices->pop->name . '</a>' : $devices->pop->name ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -344,13 +344,16 @@ foreach ($devicesall as $deviceall) {
                                 <?php if ($devices->devicetype->devicemanufactor->config_backup > count()): ?>
                                     <span><i title="Switch config" class="fa-light fa-rectangle-code code-ico"
                                              data-toggle="modal" data-target="#configCode"></i></span>
+                                <?php endif;
+                                if ($me->is('Admin')):
+                                    ?>
+                                    <div class="float-right">
+                                        <a id="create-backup-href"
+                                           href="<?= self::getUrl("Device", "api", ['do' => 'createconfig', 'ip' => $devices->ip, 'id' => $devices->id]) ?>"
+                                        <button class="btn btn-primary "><span id="create-backup-button-text">Backup erstellen</span>
+                                            <span id="create-backup-load"></i></span></button>
+                                        </a></div>
                                 <?php endif; ?>
-                                <div class="float-right">
-                                    <a id="create-backup-href"
-                                       href="<?= self::getUrl("Device", "api", ['do' => 'createconfig', 'ip' => $devices->ip, 'id' => $devices->id]) ?>"
-                                    <button class="btn btn-primary "><span id="create-backup-button-text">Backup erstellen</span>
-                                        <span id="create-backup-load"></i></span></button>
-                                    </a></div>
                             </div>
                             <?php
                             if ($devicesconfig->success == "true" && $devicesconfig->data > count()) {
@@ -647,6 +650,7 @@ foreach ($devicesall as $deviceall) {
     $config = str_replace("&&YEAR&&", $year, $config);
     $config = str_replace("&&MONTH&&", $month, $config);
     $config = str_replace("&&DAY&&", $day, $config);
+    $config = str_replace("&&IP&&", $devices->ip, $config);
 
     ?>