diff --git a/MP.MONO.UI/Components/AlarmsOverview.razor b/MP.MONO.UI/Components/AlarmsOverview.razor
index f04c4e2..3633eea 100644
--- a/MP.MONO.UI/Components/AlarmsOverview.razor
+++ b/MP.MONO.UI/Components/AlarmsOverview.razor
@@ -18,97 +18,100 @@
         else
         {
             <div class="card-header">
-                <h5 class="@css() fw-bold"><i class="bi bi-exclamation-triangle pe-2" aria-hidden="true"></i>  ALARMS</h5>
+                <h5 class="@css() fw-bold"><i class="fa-thumbs-up fa-regular pe-2 text-success" aria-hidden="true"></i> NO ALARMS</h5>
             </div>
         }
-        <div class="card-body" style="@cardHeight">
-            <div class="px-0 mx-1 py-1 text-start  rounded">
+        @if (!compMode)
+        {
 
-                <div class="card-body px-0 py-0 align-content-center rounded">
-                    <div>
-                        <div class="px-2 text-center">
-                            @if (!compMode)
-                            {
-                                <b>Current alarms</b>
-                                @if (ListRecords.Count == 0)
+
+            <div class="card-body" style="@cardHeight">
+                <div class="px-0 mx-1 py-1 text-start  rounded">
+
+                    <div class="card-body px-0 py-0 align-content-center rounded">
+                        <div>
+                            <div class="px-2 text-center">
+                                @if (!compMode)
                                 {
-                                    <span class="badge m-2 bg-success text-dark"><b>@ListRecords.Count</b></span>
-                                }@*
+                                    <b>Current alarms</b>
+                                    @if (ListRecords.Count == 0)
+                                    {
+                                        <span class="badge m-2 bg-success text-dark"><b>@ListRecords.Count</b></span>
+                                    }@*
                         else
                         {
                         <span class="badge m-2 bg-danger text-warning"><b>@ListRecords.Count</b></span>
                         }*@
-                            }
-                            else
-                            {
-
-                                @if (ListRecords.Count == 0)
+                                }
+                                else
                                 {
 
-                                    <h6 class="text-dark"><b>ACTIVE ALARMS:</b><span class="badge m-2 bg-success text-light fs-6"><b>@ListRecords.Count</b></span></h6>
+                                    @if (ListRecords.Count == 0)
+                                    {
 
-                                }
-                                @*else
+                                        <h6 class="text-dark"><b>ACTIVE ALARMS:</b><span class="badge m-2 bg-success text-light fs-6"><b>@ListRecords.Count</b></span></h6>
+
+                                    }
+                                    @*else
                         {
                         <h6 class="text-warning"><b>ACTIVE ALARMS:</b><span class="badge m-2 bg-danger text-warning fs-6"><b>@ListRecords.Count</b></span></h6>
 
                         }*@
-                            }
-                        </div>
+                                }
+                            </div>
 
-                    </div>
+                        </div>
                         <div class="d-grid p-0">
                             <NavLink class="btn btn-outline-dark btn-block fw-bold" href="AlarmsAnalysis">
                                 <i class="bi bi-bar-chart pe-2" aria-hidden="true"></i> Alarm Analysis
                             </NavLink>
                         </div>
-                </div>
+                    </div>
                     @if (ListRecords.Count == 0)
                     {
                         <div class="alert alert-success text-center display-4 mb-0">All OK</div>
                     }
                     else
                     {
-                        @if (compMode)
-                        {
+                        @*@if (compMode)
+            {
 
-                            <ul class="list-group">
-                                @foreach (var item in ListRecords.Take(4).ToList())
-                                {
-                                    <li class="list-group-item alarms list-group-item-action text-warning bg-danger px-2">
-                                        <div class="textConsensed w-100 small" title="order">
-                                            <div class="small">
-                                                @item.Title
-                                            </div>
-                                            <div class="">
-                                                <span class="text-break">@item.Value</span>
-                                            </div>
-                                        </div>
-                                    </li>
-                                }
-                            </ul>
-                        }
-                        else
-                        {
-                            <ul class="list-group">
-                                @foreach (var item in ListRecords)
-                                {
-                                    <li class="list-group-item alarms list-group-item-action text-warning bg-danger px-2">
-                                        <div class="textConsensed w-100 small" title="order">
-                                            <div class="small">
-                                                @item.Title
-                                            </div>
-                                            <div class="">
-                                                <span class="text-break">@item.Value</span>
-                                            </div>
-                                        </div>
-                                    </li>
-                                }
-                            </ul>
-                        }
-                    }
+            <ul class="list-group">
+            @foreach (var item in ListRecords.Take(4).ToList())
+            {
+            <li class="list-group-item alarms list-group-item-action text-warning bg-danger px-2">
+            <div class="textConsensed w-100 small" title="order">
+            <div class="small">
+            @item.Title
             </div>
-        </div>
+            <div class="">
+            <span class="text-break">@item.Value</span>
+            </div>
+            </div>
+            </li>
+            }
+            </ul>
+            }
+            else*@
+                        <ul class="list-group">
+                            @foreach (var item in ListRecords)
+                            {
+                                <li class="list-group-item alarms list-group-item-action text-warning bg-danger px-2">
+                                    <div class="textConsensed w-100 small" title="order">
+                                        <div class="small">
+                                            @item.Title
+                                        </div>
+                                        <div class="">
+                                            <span class="text-break">@item.Value</span>
+                                        </div>
+                                    </div>
+                                </li>
+                            }
+                        </ul>
+                    }
+                </div>
+            </div>
+        }
     </div>
 }
 else
diff --git a/MP.MONO.UI/Pages/Index.razor b/MP.MONO.UI/Pages/Index.razor
index cd41762..773ef41 100644
--- a/MP.MONO.UI/Pages/Index.razor
+++ b/MP.MONO.UI/Pages/Index.razor
@@ -5,7 +5,7 @@
 <div class="card">
     <div class="card-header">
         <div class="d-flex justify-content-between">
-            <h1 class="col-9">@AppName</h1>
+            <h1 class="col-10">@AppName</h1>
 
             @*<div class="col-3">
             <div class="px-0 mx-1 py-1 text-center rounded">
@@ -14,6 +14,9 @@
             </NavLink>
             </div>
             </div>*@
+            <NavLink href="Alarms" class="text-decoration-none col-2" title="ALARMS Detail Page">
+                <AlarmsOverview compMode="true"></AlarmsOverview>
+            </NavLink>
         </div>
     </div>
     <div class="card-body">
@@ -52,11 +55,9 @@
             </div>
 
             <div class="col-3">
-                <div class="px-0 mx-1 py-1 text-center rounded">
-                    <NavLink href="Alarms" class="text-decoration-none" title="ALARMS Detail Page">
-                        <AlarmsOverview compMode="true"></AlarmsOverview>
-                    </NavLink>
-                </div>
+                @*<div class="px-0 mx-1 py-1 text-center rounded">
+
+                </div>*@
                 <NavLink href="Tools" class="text-decoration-none" title="TOOLS Detail Page">
                     <div class="card text-dark mb-3" style="box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;">
                         <h5 class="card-header text-center fw-bold"><i class="fa-solid fa-toolbox"></i> TOOLS</h5>