diff --git a/emhttp/plugins/dynamix.docker.manager/AddContainer.page b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
old mode 100644
new mode 100755
index e0d6efbbe..6a4b65895
--- a/emhttp/plugins/dynamix.docker.manager/AddContainer.page
+++ b/emhttp/plugins/dynamix.docker.manager/AddContainer.page
@@ -1,6 +1,7 @@
 Title="Add Container"
 Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
+Eval="true"
 ---
 <?PHP
 /* Copyright 2005-2023, Lime Technology
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
old mode 100644
new mode 100755
index cc5e088a4..dd7070b5d
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -78,6 +78,7 @@ if (count($pages)) {
         @unlink($nchan_pid);
     }
 }
+
 ?>
 <!DOCTYPE html>
 <html <?= $display['rtl'] ?>lang="<?= strtok($locale, '_') ?: 'en' ?>" class="<?= $themeHelper->getThemeHtmlClass() ?>">
@@ -132,22 +133,30 @@ if (count($pages)) {
 
   <?php require_once "$docroot/webGui/include/DefaultPageLayout/HeadInlineJS.php"; ?>
   <?php
-  foreach ($buttonPages as $button) {
-      annotate($button['file']);
-      includePageStylesheets($button);
-      eval('?>' . parse_text($button['text']));
-  }
+    foreach ($buttonPages as $button) {
+        annotate($button['file']);
+        includePageStylesheets($button);
+        $evalContent = '?>' . parse_text($button['text']);
+        $evalFile = $button['file'];
+        if ( filter_var($button['Eval']??false, FILTER_VALIDATE_BOOLEAN) ) {
+            eval($evalContent);
+        } else {
+            include "$docroot/webGui/include/DefaultPageLayout/evalContent.php";
+        }
+    }
+ 
 
-foreach ($pages as $page) {
-    annotate($page['file']);
-    includePageStylesheets($page);
-}
+    foreach ($pages as $page) {
+        annotate($page['file']);
+        includePageStylesheets($page);
+    }
 ?>
 
   <?php include "$docroot/plugins/dynamix.my.servers/include/myservers1.php" ?>
 </head>
 
 <body>
+<unraid-modals></unraid-modals>
   <?php include "$docroot/webGui/include/DefaultPageLayout/MiscElementsTop.php"; ?>
   <?php include "$docroot/webGui/include/DefaultPageLayout/Header.php"; ?>
   <?php include "$docroot/webGui/include/DefaultPageLayout/Navigation/Main.php"; ?>
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabbed.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabbed.php
old mode 100644
new mode 100755
index 7f251740e..f8f982341
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabbed.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabbed.php
@@ -43,7 +43,13 @@
                 if (isset($page['text'])) {
                     $skipIndexIncrement = true;
                     annotate($page['file']);
-                    eval('?>'.generateContent($page));
+                    $evalContent = '?>'.generateContent($page);
+                    $evalFile = $page['file'];
+                    if ( filter_var($page['Eval']??false, FILTER_VALIDATE_BOOLEAN) ) {
+                        eval($evalContent);
+                    } else {    
+                        include "$docroot/webGui/include/DefaultPageLayout/evalContent.php";
+                    }
                 }
                 continue;
             }
@@ -60,7 +66,15 @@
         >
             <?= generatePanels($page, $path, $defaultIcon, $docroot) ?>
 
-            <? eval('?>'.generateContent($page)); ?>
+            <? 
+            $evalContent = '?>'.generateContent($page);
+            $evalFile = $page['file'];
+            if ( filter_var($page['Eval']??false, FILTER_VALIDATE_BOOLEAN) ) {
+                eval($evalContent);
+            } else {
+                include "$docroot/webGui/include/DefaultPageLayout/evalContent.php";
+            }
+            ?>
         </section>
         <?
             if ($skipIndexIncrement) {
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php
old mode 100644
new mode 100755
index 5290dfcd7..1c035b574
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php
@@ -19,7 +19,15 @@
 
             <?= generatePanels($page, $path, $defaultIcon, $docroot, true) ?>
 
-            <? eval('?>'.generateContent($page)); ?>
+            <? 
+            $evalContent = '?>'.generateContent($page);
+            $evalFile = $page['file'];
+            if ( filter_var($page['Eval']??false, FILTER_VALIDATE_BOOLEAN) ) {
+                eval($evalContent);
+            } else {
+                include "$docroot/webGui/include/DefaultPageLayout/evalContent.php";
+            }
+            ?>
         <? endforeach; ?>
     </div>
 </div>
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/evalContent.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/evalContent.php
new file mode 100755
index 000000000..8badcb43e
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/evalContent.php
@@ -0,0 +1,35 @@
+<?php
+// This evaluates the contents of PHP code.  Has to be "included" because the code is evaluated in the context of the calling page.
+// $evalContent is the PHP code to evaluate.
+// $evalFile is the file that the code is being evaluated in
+// If an error occurs, a banner warning (disappearing in 10 seconds) is added to the page.
+// The PHP error logged will also include the path of the .page file for easier debugging
+ob_start();
+try {
+    set_error_handler(function($severity, $message, $file, $line) {
+        throw new ErrorException($message, 0, $severity, $file, $line);
+    });
+    eval($evalContent);
+    restore_error_handler();
+    ob_end_flush();
+} catch (Throwable $e) {
+    restore_error_handler();
+    error_log("Error evaluating content in $evalFile: " . $e->getMessage() . "\nStack trace:\n" . $e->getTraceAsString());
+    ob_clean();
+    echo "
+        <script>
+        $(function() {
+            try {
+                console.log('Fatal error in ".htmlspecialchars($evalFile)."  Code not executed.');
+                let phpErrorBanner = addBannerWarning('Fatal error in ".htmlspecialchars($evalFile)."  Code not executed.',true,true);
+                setTimeout(function() {
+                    removeBannerWarning(phpErrorBanner);
+                }, 10000);
+            } catch (e) {
+                console.error('Failed to add banner warning: ' + e);
+            }
+        });
+        </script>";
+    ob_end_flush();   
+}
+?>      
\ No newline at end of file
