diff --git a/src/AzureNamingTool.csproj b/src/AzureNamingTool.csproj
index 53bacea2..df898aba 100644
--- a/src/AzureNamingTool.csproj
+++ b/src/AzureNamingTool.csproj
@@ -4,7 +4,7 @@
 		<TargetFramework>net10.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>5.0.0</Version>
+		<Version>5.0.1</Version>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);CS8602;CS8600;CS1998</NoWarn>
 		<UserSecretsId>eca63fb9-b7f9-454f-910b-5088ae877085</UserSecretsId>
diff --git a/src/Components/Modals/AddModal.razor b/src/Components/Modals/AddModal.razor
index 85e7b240..bac2de24 100644
--- a/src/Components/Modals/AddModal.razor
+++ b/src/Components/Modals/AddModal.razor
@@ -167,12 +167,10 @@
                                     </div>
                                 </div>
                                 <div id="typemetdadatacontainer" class="modern-card" style="margin-bottom: 1rem;">
-                                    <div class="modern-card-header">
-                                        <a id="typemetdadatalink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadata" role="button" aria-expanded="false" aria-controls="typemetdadata">
-                                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
-                                        </a>
+                                    <div class="modern-card-header collapsible @(GetCollapseClass("typemetdadata"))" @onclick="@(() => ToggleCollapse("typemetdadata"))">
+                                        <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resource Type Metadata
                                     </div>
-                                    <div class="collapse modern-card-body" id="typemetdadata">
+                                    <div class="modern-card-body @(GetCollapseClass("typemetdadata"))" id="typemetdadata">
                                         <div style="margin-bottom: 1rem;">
                                             <p>
                                             This section allows you to edit the Resouce Type metadata.
@@ -716,5 +714,25 @@
 
 
     async Task Cancel() => await ModalInstance.CancelAsync();
+    
+    // Collapse management for sections
+    private HashSet<string> collapsedSections = new HashSet<string> { "typemetdadata" };
+    
+    private void ToggleCollapse(string section)
+    {
+        if (collapsedSections.Contains(section))
+        {
+            collapsedSections.Remove(section);
+        }
+        else
+        {
+            collapsedSections.Add(section);
+        }
+    }
+
+    private string GetCollapseClass(string section)
+    {
+        return collapsedSections.Contains(section) ? "collapsed" : "";
+    }
 }
 
diff --git a/src/Components/Modals/EditModal.razor b/src/Components/Modals/EditModal.razor
index 7c4d9ff8..2de0dce1 100644
--- a/src/Components/Modals/EditModal.razor
+++ b/src/Components/Modals/EditModal.razor
@@ -28,7 +28,7 @@
                     </p>
                     @if (type == "ResourceType")
                     {
-                        if (Convert.ToBoolean(config.ResourceTypeEditingAllowed))
+                        if (Convert.ToBoolean(config.ResourceTypeEditingAllowed) && !isDangerAlertDismissed)
                     {
                         <div class="alert alert-danger alert-dismissible fade show" style="margin-bottom: 1rem;" role="alert">
                             <h4>ATTENTION</h4>
@@ -41,13 +41,13 @@
                                 </p>
                             </div>
                             <div>
-                                <button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
+                                <button type="button" class="close btn btn-light" @onclick="DismissDangerAlert" aria-label="Dismiss">
                                     <span aria-hidden="true">Dismiss</span>
                                 </button>
                             </div>
                         </div>
                     }
-                    else
+                    else if (!isWarningAlertDismissed)
                     {
                         <div class="alert alert-warning alert-dismissible fade show" style="margin-bottom: 1rem;" role="alert">
                             <h4>NOTE</h4>
@@ -55,7 +55,7 @@
                                 Resource Type settings are disabled by default. You can allow the editing of these values by enabling the "Resource Type Editing" setting in the Admin section.
                             </div>
                             <div>
-                                <button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
+                                <button type="button" class="close btn btn-light" @onclick="DismissWarningAlert" aria-label="Dismiss">
                                     <span aria-hidden="true">Dismiss</span>
                                 </button>
                             </div>
@@ -230,12 +230,10 @@
                                     </div>
                                 </div>
                                 <div id="typemetdadatacontainer" class="modern-card" style="margin-bottom: 1rem;">
-                                    <div class="modern-card-header">
-                                        <a id="typemetdadatalink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadata" role="button" aria-expanded="false" aria-controls="typemetdadata">
-                                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
-                                        </a>
+                                    <div class="modern-card-header collapsible @(GetCollapseClass("typemetdadata"))" @onclick="@(() => ToggleCollapse("typemetdadata"))">
+                                        <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resource Type Metadata
                                     </div>
-                                    <div class="collapse modern-card-body" id="typemetdadata">
+                                    <div class="modern-card-body @(GetCollapseClass("typemetdadata"))" id="typemetdadata">
                                         <div style="margin-bottom: 1rem;">
                                             <p>
                                                 This section allows you to edit the Resouce Type metadata.
@@ -348,12 +346,10 @@
                                     </div>
                                 </div>
                                 <div id="typemetdadatadisabledcontainer" class="modern-card" style="margin-bottom: 1rem;">
-                                    <div class="modern-card-header">
-                                        <a id="typemetdadatadisabledlink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadatadisabled" role="button" aria-expanded="false" aria-controls="typemetdadatadisabled">
-                                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
-                                        </a>
+                                    <div class="modern-card-header collapsible @(GetCollapseClass("typemetdadatadisabled"))" @onclick="@(() => ToggleCollapse("typemetdadatadisabled"))">
+                                        <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resource Type Metadata
                                     </div>
-                                    <div class="collapse modern-card-body" id="typemetdadatadisabled">
+                                    <div class="modern-card-body @(GetCollapseClass("typemetdadatadisabled"))" id="typemetdadatadisabled">
                                         <div style="margin-bottom: 1rem;">
                                             This section allows you to view the Resouce Type metadata.
                                         </div>
@@ -442,12 +438,10 @@
                 @if (type == "ResourceComponent")
                 {
                     <div id="globallyoptionalcontainer" class="modern-card" style="margin-bottom: 1rem;">
-                        <div class="modern-card-header">
-                            <a id="OptionalComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#globallyoptional" role="button" aria-expanded="false" aria-controls="globallyoptional">
-                                <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Optional Configuration
-                            </a>
+                        <div class="modern-card-header collapsible @(GetCollapseClass("globallyoptional"))" @onclick="@(() => ToggleCollapse("globallyoptional"))">
+                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Optional Configuration
                         </div>
-                        <div class="collapse modern-card-body" id="globallyoptional">
+                        <div class="modern-card-body @(GetCollapseClass("globallyoptional"))" id="globallyoptional">
                             <div style="margin-bottom: 1rem;">
                                 This section allows you to add/remove the component as OPTIONAL for all resource types.
                             </div>
@@ -458,7 +452,7 @@
                                             This option will ADD the component as OPTIONAL for all resource types.
                                         </td>
                                         <td>
-                                            <button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","optional-add"))" style="min-width:42px;" title="Add as OPTIONAL for all resoure types">
+                                            <button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","optional-add"))" style="min-width:42px;" title="Add as OPTIONAL for all Resource types">
                                                 ADD
                                             </button>
                                         </td>
@@ -468,7 +462,7 @@
                                             This option will REMOVE the component from OPTIONAL for all resource types.
                                         </td>
                                         <td>
-                                            <button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","optional-remove"))" style="min-width:42px;" title="Remove as OPTIONAL for all resoure types">
+                                            <button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","optional-remove"))" style="min-width:42px;" title="Remove as OPTIONAL for all Resource types">
                                                 REMOVE
                                             </button>
                                         </td>
@@ -478,12 +472,10 @@
                         </div>
                     </div>
                     <div id="globallyexcludecontainer" class="modern-card" style="margin-bottom: 1rem;">
-                        <div class="modern-card-header">
-                            <a id="OptionalComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#globallyexclude" role="button" aria-expanded="false" aria-controls="globallyexclude">
-                                <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Exclude Configuration
-                            </a>
+                        <div class="modern-card-header collapsible @(GetCollapseClass("globallyexclude"))" @onclick="@(() => ToggleCollapse("globallyexclude"))">
+                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Exclude Configuration
                         </div>
-                        <div class="collapse modern-card-body" id="globallyexclude">
+                        <div class="modern-card-body @(GetCollapseClass("globallyexclude"))" id="globallyexclude">
                             <div style="margin-bottom: 1rem;">
                                 This section allows you to add/remove the component as EXCLUDE for all resource types.
                             </div>
@@ -494,7 +486,7 @@
                                             This option will ADD the component as EXCLUDE for all resource types.
                                         </td>
                                         <td>
-                                            <button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-add"))" style="min-width:42px;" title="Add as EXCLUDE for all resoure types">
+                                            <button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-add"))" style="min-width:42px;" title="Add as EXCLUDE for all Resource types">
                                                 ADD
                                             </button>
                                         </td>
@@ -504,7 +496,7 @@
                                             This option will REMOVE the component from EXCLUDE for all resource types.
                                         </td>
                                         <td>
-                                            <button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-remove"))" style="min-width:42px;" title="Remove as EXCLUDE for all resoure types">
+                                            <button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-remove"))" style="min-width:42px;" title="Remove as EXCLUDE for all Resource types">
                                                 REMOVE
                                             </button>
                                         </td>
@@ -517,12 +509,10 @@
                 @if ((type == "ResourceType") && (GeneralHelper.IsNotNull(resourceComponents)))
                 {
                     <div id="optional" class="modern-card" style="margin-bottom: 1rem;">
-                        <div class="modern-card-header">
-                            <a id="OptionalComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#optionalcomponents" role="button" aria-expanded="false" aria-controls="optionalcomponents">
-                                <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Optional Components
-                            </a>
+                        <div class="modern-card-header collapsible @(GetCollapseClass("optionalcomponents"))" @onclick="@(() => ToggleCollapse("optionalcomponents"))">
+                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Optional Components
                         </div>
-                        <div class="collapse modern-card-body" id="optionalcomponents">
+                        <div class="modern-card-body @(GetCollapseClass("optionalcomponents"))" id="optionalcomponents">
                             @foreach (ResourceComponent resourceComponent in resourceComponents)
                             {
                                 if (resourceComponent.Name != "ResourceType")
@@ -549,12 +539,10 @@
                     </div>
 
                     <div id="excluded" class="modern-card" style="margin-bottom: 1rem;">
-                        <div class="modern-card-header">
-                            <a id="ExcludedComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#excludedcomponents" role="button" aria-expanded="false" aria-controls="excludedcomponents">
-                                <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Excluded Components
-                            </a>
+                        <div class="modern-card-header collapsible @(GetCollapseClass("excludedcomponents"))" @onclick="@(() => ToggleCollapse("excludedcomponents"))">
+                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Excluded Components
                         </div>
-                        <div class="collapse modern-card-body" id="excludedcomponents">
+                        <div class="modern-card-body @(GetCollapseClass("excludedcomponents"))" id="excludedcomponents">
                             @foreach (ResourceComponent resourceComponent in resourceComponents)
                             {
                                 //@if (resourceComponent.Name != "ResourceType")
@@ -645,6 +633,8 @@
     public IAdminLogService? AdminLogService { get; set; }
 
     private ServiceResponse serviceResponse = new();
+    private bool isDangerAlertDismissed = false;
+    private bool isWarningAlertDismissed = false;
     private string itemName = String.Empty;
     private string itemDisplayName = String.Empty;
     private string itemShortName = String.Empty;
@@ -1183,7 +1173,42 @@
 
 
     async Task Cancel() => await ModalInstance.CancelAsync();
-}
+    
+    // Collapse management for sections
+    private HashSet<string> collapsedSections = new HashSet<string>
+    {
+        "typemetdadata",
+        "typemetdadatadisabled",
+        "globallyoptional",
+        "globallyexclude",
+        "optionalcomponents",
+        "excludedcomponents"
+    };
+    
+    private void ToggleCollapse(string section)
+    {
+        if (collapsedSections.Contains(section))
+        {
+            collapsedSections.Remove(section);
+        }
+        else
+        {
+            collapsedSections.Add(section);
+        }
+    }
 
+    private string GetCollapseClass(string section)
+    {
+        return collapsedSections.Contains(section) ? "collapsed" : "";
+    }
 
+    private void DismissDangerAlert()
+    {
+        isDangerAlertDismissed = true;
+    }
 
+    private void DismissWarningAlert()
+    {
+        isWarningAlertDismissed = true;
+    }
+}
diff --git a/src/Components/Pages/AdminLog.razor b/src/Components/Pages/AdminLog.razor
index 0b28203a..55bc5818 100644
--- a/src/Components/Pages/AdminLog.razor
+++ b/src/Components/Pages/AdminLog.razor
@@ -64,12 +64,12 @@
                     </div>
                     
                     <div class="modern-card mb-4">
-                        <div class="modern-card-header collapsible collapsed" data-bs-toggle="collapse" data-bs-target="#adminlogfilter" aria-expanded="false">
+                        <div class="modern-card-header collapsible @(GetCollapseClass("adminlogfilter"))" @onclick="@(() => ToggleCollapse("adminlogfilter"))">
                             <h3>
                                 <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Filter Data
                             </h3>
                         </div>
-                        <div class="collapse modern-card-body" id="adminlogfilter">
+                        <div class="modern-card-body @(GetCollapseClass("adminlogfilter"))" id="adminlogfilter">
                             <div class="row mb-3">
                                 <div class="col-auto">
                                     <label class="modern-form-label">Start Date</label>
@@ -272,4 +272,24 @@
         enddate = DateTime.Today;
         filterData = "";
     }
+    
+    // Collapse management for sections
+    private HashSet<string> collapsedSections = new HashSet<string> { "adminlogfilter" };
+    
+    private void ToggleCollapse(string section)
+    {
+        if (collapsedSections.Contains(section))
+        {
+            collapsedSections.Remove(section);
+        }
+        else
+        {
+            collapsedSections.Add(section);
+        }
+    }
+
+    private string GetCollapseClass(string section)
+    {
+        return collapsedSections.Contains(section) ? "collapsed" : "";
+    }
 }
diff --git a/src/Components/Pages/Generate.razor b/src/Components/Pages/Generate.razor
index 7b08fdb3..880df310 100644
--- a/src/Components/Pages/Generate.razor
+++ b/src/Components/Pages/Generate.razor
@@ -35,12 +35,12 @@
 <div class="modern-card">
     <div class="modern-card-body">
         <div class="modern-card mb-4">
-            <div class="modern-card-header collapsible collapsed" data-bs-toggle="collapse" data-bs-target="#instructions" aria-expanded="false">
+            <div class="modern-card-header collapsible @(GetCollapseClass("instructions"))" @onclick="@(() => ToggleCollapse("instructions"))">
                 <h3>
                     <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Instructions
                 </h3>
             </div>
-            <div class="collapse modern-card-body" id="instructions">
+            <div class="modern-card-body @(GetCollapseClass("instructions"))" id="instructions">
                 <ol>
                     <li>
                         Select the desired Resource Type / Resource Types
@@ -150,11 +150,11 @@
                                     </div>
                                 }
                                 <div id="guidelines" class="modern-card mt-3">
-                                    <div class="modern-card-header modern-card-header-collapsible" data-bs-toggle="collapse" data-bs-target="#namingguidelines" aria-expanded="false">
+                                    <div class="modern-card-header modern-card-header-collapsible @(GetCollapseClass("namingguidelines"))" @onclick="@(() => ToggleCollapse("namingguidelines"))">
                                         <span class="oi oi-chevron-bottom modern-collapse-icon" aria-hidden="true"></span>
                                         <span class="modern-card-title">Naming Guidelines</span>
                                     </div>
-                                    <div class="collapse modern-card-body" id="namingguidelines">
+                                    <div class="modern-card-body @(GetCollapseClass("namingguidelines"))" id="namingguidelines">
                                         @if (!String.IsNullOrEmpty(currentResourceType.LengthMin))
                                         {
                                             <div class="mb-2"><strong>Minimum Length:</strong> @currentResourceType.LengthMin</div>
@@ -226,13 +226,13 @@
                         @if (componentsVisible == "collapse")
                         {
                             <div class="mt-3 mb-3">
-                                <button type="button" title="Show/Hide Components" class="modern-btn-primary" data-bs-toggle="collapse" data-bs-target="#components">
+                                <button type="button" title="Show/Hide Components" class="modern-btn-primary" @onclick="@(() => ToggleCollapse("components"))">
                                     <span class="oi oi-eye" aria-hidden="true"></span> Show/Hide Components
                                 </button>
                             </div>
                         }
 
-                        <div class="@componentsVisible" id="components">
+                        <div class="@componentsVisible @(GetCollapseClass("components"))" id="components">
                             @foreach (ResourceComponent resourceComponent in servicesData.ResourceComponents!)
                             {
                                 if ((!selectedResourceTypeExclude.ToLower().Split(',').Contains(GeneralHelper.NormalizeName(resourceComponent.Name, true))) || (multiselectedResourceTypes.Count > 0))
@@ -729,7 +729,7 @@
                 {
                     // Single type generation
                     StringBuilder sbName = new();
-                    selectedResourceTypeFull = GeneralHelper.FormatResoureType(selectedResourceTypeDisplayName);
+                    selectedResourceTypeFull = GeneralHelper.FormatResourceType(selectedResourceTypeDisplayName);
                     if (GeneralHelper.IsNotNull(selectedResourceTypeFull[1]))
                     {
                         selectedResourceType = selectedResourceTypeFull[1];
@@ -1096,7 +1096,7 @@
 
             if (!String.IsNullOrEmpty(selectedResourceTypeDisplayName))
             {
-                selectedResourceTypeFull = GeneralHelper.FormatResoureType(selectedResourceTypeDisplayName);
+                selectedResourceTypeFull = GeneralHelper.FormatResourceType(selectedResourceTypeDisplayName);
                 if (GeneralHelper.IsNotNull(selectedResourceTypeFull[1]))
                 {
                     selectedResourceType = selectedResourceTypeFull[1];
@@ -1802,6 +1802,26 @@
             await session.SetAsync("selectedCustomComponents", selectedCustomComponents);
         }
     }
+    
+    // Collapse management for sections
+    private HashSet<string> collapsedSections = new HashSet<string> { "instructions", "namingguidelines", "components" };
+    
+    private void ToggleCollapse(string section)
+    {
+        if (collapsedSections.Contains(section))
+        {
+            collapsedSections.Remove(section);
+        }
+        else
+        {
+            collapsedSections.Add(section);
+        }
+    }
+
+    private string GetCollapseClass(string section)
+    {
+        return collapsedSections.Contains(section) ? "collapsed" : "";
+    }
 }
 
 
diff --git a/src/Components/Pages/GeneratedNamesLog.razor b/src/Components/Pages/GeneratedNamesLog.razor
index 77e9be20..4b7a9f73 100644
--- a/src/Components/Pages/GeneratedNamesLog.razor
+++ b/src/Components/Pages/GeneratedNamesLog.razor
@@ -81,12 +81,12 @@
                         </div>
                     }
                     <div class="modern-card mb-3">
-                        <div class="modern-card-header collapsible collapsed" data-bs-toggle="collapse" data-bs-target="#filter" aria-expanded="false">
+                        <div class="modern-card-header collapsible @(GetCollapseClass("filter"))" @onclick="@(() => ToggleCollapse("filter"))">
                             <h3>
                                 <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Filter Data
                             </h3>
                         </div>
-                        <div class="collapse modern-card-body" id="filter">
+                        <div class="modern-card-body @(GetCollapseClass("filter"))" id="filter">
                             <div class="form-group row mb-3">
                                 <div style="width:auto;">
                                     <label class="modern-form-label">Start Date</label>
@@ -371,4 +371,24 @@
         enddate = DateTime.Today;
         filterData = "";
     }
+    
+    // Collapse management for sections
+    private HashSet<string> collapsedSections = new HashSet<string> { "filter" };
+    
+    private void ToggleCollapse(string section)
+    {
+        if (collapsedSections.Contains(section))
+        {
+            collapsedSections.Remove(section);
+        }
+        else
+        {
+            collapsedSections.Add(section);
+        }
+    }
+
+    private string GetCollapseClass(string section)
+    {
+        return collapsedSections.Contains(section) ? "collapsed" : "";
+    }
 }
diff --git a/src/Components/Pages/Instructions.razor b/src/Components/Pages/Instructions.razor
index dc785027..2877dbf7 100644
--- a/src/Components/Pages/Instructions.razor
+++ b/src/Components/Pages/Instructions.razor
@@ -34,79 +34,79 @@
         @if (admin)
         {
             <div class="modern-card mb-3">
-                <div class="modern-card-header collapsible @(collapsedSections.Contains("adminpassword") ? "collapsed" : "")" data-bs-toggle="collapse" data-bs-target="#adminpassword" aria-expanded="@(!collapsedSections.Contains("adminpassword"))">
+                <div class="modern-card-header collapsible @(GetCollapseClass("adminpassword"))" @onclick="@(() => ToggleCollapse("adminpassword"))">
                     <h3>
                         <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Global Admin Password
                     </h3>
                 </div>
-                <div class="collapse @(collapsedSections.Contains("adminpassword") ? "" : "show") modern-card-body" id="adminpassword">
+                <div class="modern-card-body @(GetCollapseClass("adminpassword"))">
                     <AdminPasswordInstructions theme="@theme" admin="@admin" />
                 </div>
             </div>
             
             <div class="modern-card mb-3">
-                <div class="modern-card-header collapsible @(collapsedSections.Contains("adminconfiguration") ? "collapsed" : "")" data-bs-toggle="collapse" data-bs-target="#adminconfiguration" aria-expanded="@(!collapsedSections.Contains("adminconfiguration"))">
+                <div class="modern-card-header collapsible @(GetCollapseClass("adminconfiguration"))" @onclick="@(() => ToggleCollapse("adminconfiguration"))">
                     <h3>
                         <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Admin Configuration
                     </h3>
                 </div>
-                <div class="collapse @(collapsedSections.Contains("adminconfiguration") ? "" : "show") modern-card-body" id="adminconfiguration">
+                <div class="modern-card-body @(GetCollapseClass("adminconfiguration"))">
                     <AdminConfigurationInstructions theme="@theme" admin="@admin" />
                 </div>
             </div>
             
             <div class="modern-card mb-3">
-                <div class="modern-card-header collapsible @(collapsedSections.Contains("adminlog") ? "collapsed" : "")" data-bs-toggle="collapse" data-bs-target="#adminlog" aria-expanded="@(!collapsedSections.Contains("adminlog"))">
+                <div class="modern-card-header collapsible @(GetCollapseClass("adminlog"))" @onclick="@(() => ToggleCollapse("adminlog"))">
                     <h3>
                         <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Admin Log
                     </h3>
                 </div>
-                <div class="collapse @(collapsedSections.Contains("adminlog") ? "" : "show") modern-card-body" id="adminlog">
+                <div class="modern-card-body @(GetCollapseClass("adminlog"))">
                     <AdminLogInstructions theme="@theme" admin="@admin" />
                 </div>
             </div>
         }
         
         <div class="modern-card mb-3">
-            <div class="modern-card-header collapsible @(collapsedSections.Contains("configuration") ? "collapsed" : "")" data-bs-toggle="collapse" data-bs-target="#configuration" aria-expanded="@(!collapsedSections.Contains("configuration"))">
+            <div class="modern-card-header collapsible @(GetCollapseClass("configuration"))" @onclick="@(() => ToggleCollapse("configuration"))">
                 <h3>
                     <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Configuration
                 </h3>
             </div>
-            <div class="collapse @(collapsedSections.Contains("configuration") ? "" : "show") modern-card-body" id="configuration">
+            <div class="modern-card-body @(GetCollapseClass("configuration"))">
                 <ConfigurationInstructions theme="@theme" admin="@admin" />
             </div>
         </div>
         
         <div class="modern-card mb-3">
-            <div class="modern-card-header collapsible @(collapsedSections.Contains("generate") ? "collapsed" : "")" data-bs-toggle="collapse" data-bs-target="#generate" aria-expanded="@(!collapsedSections.Contains("generate"))">
+            <div class="modern-card-header collapsible @(GetCollapseClass("generate"))" @onclick="@(() => ToggleCollapse("generate"))">
                 <h3>
                     <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Generate
                 </h3>
             </div>
-            <div class="collapse @(collapsedSections.Contains("generate") ? "" : "show") modern-card-body" id="generate">
+            <div class="modern-card-body @(GetCollapseClass("generate"))">
                 <GenerateInstructions theme="@theme" admin="@admin" />
             </div>
         </div>
         
         <div class="modern-card mb-3">
-            <div class="modern-card-header collapsible @(collapsedSections.Contains("generatednameslog") ? "collapsed" : "")" data-bs-toggle="collapse" data-bs-target="#generatednameslog" aria-expanded="@(!collapsedSections.Contains("generatednameslog"))">
+            <div class="modern-card-header collapsible @(GetCollapseClass("generatednameslog"))" @onclick="@(() => ToggleCollapse("generatednameslog"))">
                 <h3>
                     <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Generated Names Log
                 </h3>
             </div>
-            <div class="collapse @(collapsedSections.Contains("generatednameslog") ? "" : "show") modern-card-body" id="generatednameslog">
+            <div class="modern-card-body @(GetCollapseClass("generatednameslog"))">
                 <GeneratedNamesLogInstructions theme="@theme" admin="@admin" />
             </div>
         </div>
         
         <div class="modern-card mb-3">
-            <div class="modern-card-header collapsible @(collapsedSections.Contains("reference") ? "collapsed" : "")" data-bs-toggle="collapse" data-bs-target="#reference" aria-expanded="@(!collapsedSections.Contains("reference"))">
+            <div class="modern-card-header collapsible @(GetCollapseClass("reference"))" @onclick="@(() => ToggleCollapse("reference"))">
                 <h3>
                     <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Reference
                 </h3>
             </div>
-            <div class="collapse @(collapsedSections.Contains("reference") ? "" : "show") modern-card-body" id="reference">
+            <div class="modern-card-body @(GetCollapseClass("reference"))">
                 <ReferenceInstructions theme="@theme" admin="@admin" />
             </div>
         </div>
@@ -165,4 +165,21 @@
             "reference"
         };
     }
+    
+    private void ToggleCollapse(string section)
+    {
+        if (collapsedSections.Contains(section))
+        {
+            collapsedSections.Remove(section);
+        }
+        else
+        {
+            collapsedSections.Add(section);
+        }
+    }
+
+    private string GetCollapseClass(string section)
+    {
+        return collapsedSections.Contains(section) ? "collapsed" : "";
+    }
 }
diff --git a/src/Helpers/GeneralHelper.cs b/src/Helpers/GeneralHelper.cs
index e4860fbc..c8b97a07 100644
--- a/src/Helpers/GeneralHelper.cs
+++ b/src/Helpers/GeneralHelper.cs
@@ -171,7 +171,7 @@ public static string SetTextEnabledClass(bool enabled)
         /// </summary>
         /// <param name="type">The resource type string</param>
         /// <returns>An array containing the formatted resource type</returns>
-        public static string[] FormatResoureType(string type)
+        public static string[] FormatResourceType(string type)
         {
             String[] returntype = new String[4];
             returntype[0] = type;
diff --git a/src/Helpers/ValidationHelper.cs b/src/Helpers/ValidationHelper.cs
index 62bd4ef3..e24ba086 100644
--- a/src/Helpers/ValidationHelper.cs
+++ b/src/Helpers/ValidationHelper.cs
@@ -145,7 +145,7 @@ public static ValidateNameResponse ValidateGeneratedName(Models.ResourceType res
                         }
                         else
                         {
-                            sbMessage.Append("The specified delimiter was removed. This is often caused by the length of the name exceeding the max length and the delimiter removed to shorten the value or the delimiter is not an allowed character for the resoure type.");
+                            sbMessage.Append("The specified delimiter was removed. This is often caused by the length of the name exceeding the max length and the delimiter removed to shorten the value or the delimiter is not an allowed character for the Resource type.");
                             sbMessage.Append(Environment.NewLine);
                         }
                     }
diff --git a/src/Services/ResourceNamingRequestService.cs b/src/Services/ResourceNamingRequestService.cs
index 11c75abf..bff1afb7 100644
--- a/src/Services/ResourceNamingRequestService.cs
+++ b/src/Services/ResourceNamingRequestService.cs
@@ -68,7 +68,7 @@ public ResourceNamingRequestService(
         }
 
         /// <summary>
-        /// This function will generate a resoure type name for specifed component values. This function requires full definition for all components. It is recommended to use the ResourceNameRequest API function for name generation.   
+        /// This function will generate a Resource type name for specifed component values. This function requires full definition for all components. It is recommended to use the ResourceNameRequest API function for name generation.   
         /// </summary>
         /// <param name="request"></param>
         /// <returns>ResourceNameResponse - Response of name generation</returns>
diff --git a/src/Services/ResourceTypeService.cs b/src/Services/ResourceTypeService.cs
index 1d0b2ba3..3d1646dc 100644
--- a/src/Services/ResourceTypeService.cs
+++ b/src/Services/ResourceTypeService.cs
@@ -567,12 +567,12 @@ public async Task<ServiceResponse> ValidateResourceTypeNameAsync(ValidateNameReq
                             ResourceType? resourceType = null;
                             if (GeneralHelper.IsNotNull(validateNameRequest.ResourceTypeId))
                             {
-                                // Get the specified resoure type by id
+                                // Get the specified Resource type by id
                                 resourceType = resourceTypes.FirstOrDefault(x => x.Id == validateNameRequest.ResourceTypeId)!;
                             }
                             else
                             {
-                                // Get the specified resoure type by short name
+                                // Get the specified Resource type by short name
                                 resourceType = resourceTypes.FirstOrDefault(x => x.ShortName == validateNameRequest.ResourceType)!;
                             }
                             if (GeneralHelper.IsNotNull(resourceType))
diff --git a/src/programsettings.json b/src/programsettings.json
index cad73977..192317d6 100644
--- a/src/programsettings.json
+++ b/src/programsettings.json
@@ -1,5 +1,5 @@
 {
   "FeedbackURL": "https://forms.office.com/r/M2EZLg6zKq",  
   "latestNewsEnabled": "false",
-  "toolVersion":"5.0.0"
+  "toolVersion":"5.0.1"
 }
diff --git a/src/repository/resourcetypes.json b/src/repository/resourcetypes.json
index 316634cf..59214904 100644
--- a/src/repository/resourcetypes.json
+++ b/src/repository/resourcetypes.json
@@ -707,7 +707,7 @@
     "resource": "Authorization/policyAssignments",
     "optional": "UnitDept",
     "exclude": "Org,Function",
-    "property": "Resoure Name",
+    "property": "Resource Name",
     "ShortName": "pas",
     "scope": "scope of assignment",
     "lengthMin": "1",
@@ -745,7 +745,7 @@
     "resource": "Authorization/policyDefinitions",
     "optional": "UnitDept",
     "exclude": "Org,Function",
-    "property": "Resoure Name",
+    "property": "Resource Name",
     "ShortName": "policy",
     "scope": "scope of definition",
     "lengthMin": "1",
@@ -802,7 +802,7 @@
     "resource": "Authorization/policySetDefinitions",
     "optional": "UnitDept",
     "exclude": "Org,Function",
-    "property": "Resoure Name",
+    "property": "Resource Name",
     "ShortName": "init",
     "scope": "scope of definition",
     "lengthMin": "1",
diff --git a/tests/AzureNamingTool.UnitTests/GeneralHelperTests.cs b/tests/AzureNamingTool.UnitTests/GeneralHelperTests.cs
index aafae7df..4209cd75 100644
--- a/tests/AzureNamingTool.UnitTests/GeneralHelperTests.cs
+++ b/tests/AzureNamingTool.UnitTests/GeneralHelperTests.cs
@@ -31,7 +31,7 @@ public void FormatResourceType_SplitsInputIntoArray_WhenInputContains()
     {
         const string input = "Web/sites - Static Web App (stapp)";
 
-        var result = GeneralHelper.FormatResoureType(input);
+        var result = GeneralHelper.FormatResourceType(input);
 
         result.Length.Should().Be(4);
         result[0].Should().Be("Web/sites - Static Web App");
diff --git a/tests/AzureNamingTool.UnitTests/Helpers/GeneralHelperTests.cs b/tests/AzureNamingTool.UnitTests/Helpers/GeneralHelperTests.cs
index f99454c9..30268534 100644
--- a/tests/AzureNamingTool.UnitTests/Helpers/GeneralHelperTests.cs
+++ b/tests/AzureNamingTool.UnitTests/Helpers/GeneralHelperTests.cs
@@ -160,7 +160,7 @@ public void GenerateRandomString_ShouldContainAlphanumericCharacters_WhenAlphanu
     public void FormatResourceType_ShouldFormatCorrectly(string input, string expectedBase)
     {
         // Act
-        var result = GeneralHelper.FormatResoureType(input);
+        var result = GeneralHelper.FormatResourceType(input);
 
         // Assert
         result[0].Should().Be(expectedBase);