diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor
index 24a90b6a..2c3eea33 100644
--- a/Oqtane.Client/Modules/Admin/Languages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor
@@ -85,10 +85,6 @@ else
                 <button type="button" class="btn btn-success" @onclick="InstallLanguages">@Localizer["Install"]</button>
                 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
             }
-            else
-            {
-                <ModuleMessage Type="MessageType.Info" Message="No Translations Are Available To Download"></ModuleMessage>
-            }
         </TabPanel>
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <table class="table table-borderless">
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index f4cb7680..803fd7ca 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -38,10 +38,6 @@
                 </Row>
             </Pager>
         }
-        else
-        {
-            <ModuleMessage Type="MessageType.Info" Message="No Modules Available For Download "></ModuleMessage>
-        }
     </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <table class="table table-borderless">
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 1ef14328..7c71b494 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -38,10 +38,6 @@
                 </Row>
             </Pager>
         }
-        else
-        {
-            <ModuleMessage Type="MessageType.Info" Message="No Themes Available For Download"></ModuleMessage>
-        }
     </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <table class="table table-borderless">
diff --git a/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
index 5b11d69f..e3ea4a00 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
@@ -166,6 +166,6 @@
     <value>Translation Downloaded Successfully. Click Install To Complete Installation.</value>
   </data>
   <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translations Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Translations Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
index e62f8156..8545439e 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
@@ -145,7 +145,7 @@
     <value>Error Downloading Translation</value>
   </data>
   <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translation Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Translation Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Upgrade" xml:space="preserve">
     <value>Upgrade</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
index 61d8cda8..6f9d702f 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -139,7 +139,7 @@
     <value>Once You Have Compiled The Module And Restarted The Application You Can Activate The Module Below</value>
   </data>
   <data name="Success.Module.Create" xml:space="preserve">
-    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Message.Require.ValidName" xml:space="preserve">
     <value>You Must Provide A Valid Owner Name And Module Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
index 58d2d1e8..e67f4e04 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
@@ -133,7 +133,7 @@
     <value>Error Loading Packages</value>
   </data>
   <data name="Success.Module.Install" xml:space="preserve">
-    <value>Module Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Success.Module.Download" xml:space="preserve">
     <value>Module Downloaded Successfully. Click Install To Complete Installation.</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
index b2924f9a..93bc475d 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -172,6 +172,6 @@
     <value>Location: </value>
   </data>
   <data name="Success.Module.Create" xml:space="preserve">
-    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
+    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
index 30fa708a..d42c19f1 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -130,7 +130,7 @@
     <value>Version</value>
   </data>
   <data name="Success.Module.Install" xml:space="preserve">
-    <value>Module Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Error.Module.Download" xml:space="preserve">
     <value>Error Downloading Module</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
index c9e04ebd..60da0ef3 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
@@ -133,7 +133,7 @@
     <value>Theme: </value>
   </data>
   <data name="Success.Theme.Install" xml:space="preserve">
-    <value>Theme Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Theme Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Success.Theme.Download" xml:space="preserve">
     <value>Theme Downloaded Successfully. Click Install To Complete Installation.</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
index b076cd1d..53e55f09 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -148,7 +148,7 @@
     <value>Please Note That The Theme Creator Is Only Intended To Be Used In A Development Environment</value>
   </data>
   <data name="Success.Theme.Create" xml:space="preserve">
-    <value>The Source Code For Your Theme Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
+    <value>The Source Code For Your Theme Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
   </data>
   <data name="Message.Required.ValidName" xml:space="preserve">
     <value>You Must Provide A Valid Owner Name And Theme Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
index 4ec76f5a..e9242f72 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -127,7 +127,7 @@
     <value>Upgrade</value>
   </data>
   <data name="Success.Theme.Install" xml:space="preserve">
-    <value>Theme Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Theme Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Error.Theme.Download" xml:space="preserve">
     <value>Error Downloading Theme</value>