diff --git a/UserService.db b/UserService.db
index 8f92d56..6b7aa38 100644
Binary files a/UserService.db and b/UserService.db differ
diff --git a/UserService/Pages/SecurityGroups.razor b/UserService/Pages/SecurityGroups.razor
index e3bdce5..e407432 100644
--- a/UserService/Pages/SecurityGroups.razor
+++ b/UserService/Pages/SecurityGroups.razor
@@ -48,7 +48,7 @@ else
                 </Button>
             </SaveCommandTemplate>
             <CancelCommandTemplate>
-                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Cancel editing">
+                <Button Color="Color.Secondary" Clicked="@context.Clicked" title="Cancel editing">
                     <i class="far fa-times-circle"></i>
                 </Button>
             </CancelCommandTemplate>
diff --git a/UserService/Pages/Users.razor b/UserService/Pages/Users.razor
index 5553922..750e751 100644
--- a/UserService/Pages/Users.razor
+++ b/UserService/Pages/Users.razor
@@ -49,7 +49,7 @@ else
                 </Button>
             </SaveCommandTemplate>
             <CancelCommandTemplate>
-                <Button Color="Color.Danger" Clicked="@context.Clicked" title="Cancel editing">
+                <Button Color="Color.Secondary" Clicked="@context.Clicked" title="Cancel editing">
                     <i class="far fa-times-circle"></i>
                 </Button>
             </CancelCommandTemplate>
@@ -100,31 +100,11 @@ else
         </DataGridSelectColumn>
         <DataGridCheckColumn TItem="User" Field="@nameof(User.IsActive)" Caption="Active" Editable="true" >
             <DisplayTemplate>
-                @{
-                        if(((User) context ).IsActive){
-                            <span style="color: green;">
-                                <i class="far fa-check-circle"></i>
-                            </span>
-                        } else {
-                            <span style="color: red;">
-                                <i class="fas fa-ban"></i>
-                            </span>
-                        }
-                }
+                <UserIsActive IsActive="@(((User)context).IsActive)" />
             </DisplayTemplate>
             <EditTemplate>
                 <Switch TValue="bool" Checked="@((bool)(context.CellValue))" CheckedChanged="@(v => context.CellValue = v)">
-                    @{
-                        if((bool)(context.CellValue)){
-                            <span style="color: green;">
-                                <i class="far fa-check-circle"></i>
-                            </span>
-                        } else {
-                            <span style="color: red;">
-                                <i class="fas fa-ban"></i>
-                            </span>
-                        }
-                    }
+                    <UserIsActive IsActive="@((bool)(context.CellValue))" />
                 </Switch>
             </EditTemplate>
         </DataGridCheckColumn>
diff --git a/UserService/Shared/UserIsActive.razor b/UserService/Shared/UserIsActive.razor
new file mode 100644
index 0000000..d73de07
--- /dev/null
+++ b/UserService/Shared/UserIsActive.razor
@@ -0,0 +1,20 @@
+@{
+    if(IsActive)
+    {
+        <span style="color: green;">
+            <i class="far fa-check-circle"></i>
+        </span>
+    } 
+    else 
+    {
+        <span style="color: red;">
+            <i class="fas fa-ban"></i>
+        </span>
+    }
+}
+
+                    
+@code {
+    [Parameter]
+    public bool IsActive { get; set; }
+}
\ No newline at end of file