diff --git a/FrontendWebApi/Startup.cs b/FrontendWebApi/Startup.cs
index 627983f..79d0ded 100644
--- a/FrontendWebApi/Startup.cs
+++ b/FrontendWebApi/Startup.cs
@@ -170,7 +170,11 @@ namespace FrontendWebApi
             app.UseAuthentication();
             app.UseAuthorization();
 
+            app.Use(async (context, next) =>
+            {
                 context.Response.Headers.Add("X-Frame-Options", "SAMEORIGIN");
+                await next();
+            });
 
             //app.UseEndpoints(endpoints =>
             //{
diff --git a/FrontendWebApi/Views/Shared/_Layout.cshtml b/FrontendWebApi/Views/Shared/_Layout.cshtml
index ea4b6d5..9765833 100644
--- a/FrontendWebApi/Views/Shared/_Layout.cshtml
+++ b/FrontendWebApi/Views/Shared/_Layout.cshtml
@@ -843,8 +843,8 @@
 
      <!-- 警戒值設定 -->
     <div class="modal" tabindex="-1" id="warning-value-modal" role="dialog" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-dialog-centered" style="width:40%">
-            <div class="modal-content">
+        <div class="modal-dialog modal-dialog-centered" style="max-width:45%;">
+            <div class="modal-content" style="height:600px;">
                 <div class="modal-header">
                     <h5 class="modal-title">警戒值設定</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -852,11 +852,7 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                    <div class="row">
-                        <div class="col-md-12">
-                            <iframe src="@ViewBag.WarningValuePxPath" style="width:100%;height:100%;"></iframe>
-                        </div>
-                    </div>
+                   <iframe id="warningValueIframe" src="@ViewBag.WarningValuePxPath" style="width:100%;height:100%;"></iframe>
 
                 </div>
                
@@ -903,6 +899,14 @@
         }
 
         $("body").on("click","#warningValueBtn",showWarningValueModal);
+
+        $("body").on("hidden.bs.modal","#warning-value-modal",function() {
+            $("#warningValueIframe").attr("src","#");
+        });
+        
+        $("body").on("shown.bs.modal","#warning-value-modal",function() {
+            $("#warningValueIframe").attr("src","@ViewBag.WarningValuePxPath");
+        });
     </script>
 </body>
 </html>