diff --git a/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor b/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor
index ac2b08266..759fb4e47 100644
--- a/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor
+++ b/src/core/src/AXOpen.Core.Blazor/AxoComponent/AxoComponentView.razor
@@ -4,7 +4,8 @@
 @using AXSharp.Presentation.Blazor.Controls.Layouts.TabControlComponents;
 @inherits RenderableComplexComponentBase<AxoComponent>;
 
-<div class="card">
+
+<div class="card border border-4 m-3 p-3 rounded-3">
     <div class="card-header d-flex">
         <div class="p-0 w-100"><h5>@Component.AttributeName</h5></div>
         <div class="p-1 flex-shrink-1">
diff --git a/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor b/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor
index 3db2ff19c..4fd0417e8 100644
--- a/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor
+++ b/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor
@@ -6,9 +6,9 @@
 
 @if (Component.State > eAxoMessengerState.Idle)
 {
-    <div class="container text-center">
-        @if (!OnlyAlarmView)
-        {
+    <div class="container text-center border border-2 m-3 rounded-3 border-danger">
+        
+        
             <div class="row">
                 <div class="d-flex align-end me-2 mt-2 mb-2">
                     <div class="btn-group">
@@ -31,15 +31,14 @@
                         </button>
                     </div>
                 </div>
-            </div>
-        }
-        else
+            </div>        
+        @if (!OnlyAlarmView)
         {
             <div class="row">
                 <RenderableContentControl Context="Component.Component" Presentation="Command"></RenderableContentControl>
-                <button class="btn @BackgroundColor" type="button" @onclick="ToggleComponentView">
+               @*  <button class="btn @BackgroundColor" type="button" @onclick="ToggleComponentView">
                     <span class="oi oi-x" aria-hidden="true" />
-                </button>
+                </button> *@
             </div>
             
         }
diff --git a/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor.cs b/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor.cs
index 5a4611df0..aa36cf132 100644
--- a/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor.cs
+++ b/src/core/src/AXOpen.Core.Blazor/AxoMessenger/Static/AxoMessengerDetailedView.razor.cs
@@ -237,7 +237,7 @@ private string GetHelpText()
             return retVal;
         }
 
-        private bool OnlyAlarmView { get; set; }
+        private bool OnlyAlarmView { get; set; } = true;
 
         private void ToggleComponentView()
         {
@@ -246,7 +246,7 @@ private void ToggleComponentView()
 
         private void ToggleAlarmView()
         {
-            this.OnlyAlarmView = true;
+            this.OnlyAlarmView = !this.OnlyAlarmView;
         }
     }