diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index e7329d7a..f4d347e9 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -155,7 +155,7 @@
         <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&nbsp;
         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
         <br /><br />
-        <a class="btn btn-secondary" href="swagger/index.html" target="_new">@Localizer["Swagger"]</a>&nbsp;
+        <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Swagger"]</a>&nbsp;
         <a class="btn btn-secondary" href="api/endpoint" target="_new">@Localizer["Endpoints"]</a>
     </TabPanel>
     <TabPanel Name="Log" Heading="Log" ResourceKey="Log">
diff --git a/Oqtane.Server/Controllers/EndpointController.cs b/Oqtane.Server/Controllers/EndpointController.cs
index 5fea4619..5cfff917 100644
--- a/Oqtane.Server/Controllers/EndpointController.cs
+++ b/Oqtane.Server/Controllers/EndpointController.cs
@@ -48,7 +48,7 @@ namespace Oqtane.Controllers
                         ControllerMethod = controllerMethod
                     };
                 }
-            );
+            ).OrderBy(item => item.Route);
 
             return Json(output);
         }