diff --git a/ErsatzTV.Core/Iptv/ChannelGuide.cs b/ErsatzTV.Core/Iptv/ChannelGuide.cs
index d13127604..8465ff146 100644
--- a/ErsatzTV.Core/Iptv/ChannelGuide.cs
+++ b/ErsatzTV.Core/Iptv/ChannelGuide.cs
@@ -23,8 +23,8 @@ namespace ErsatzTV.Core.Iptv
 
         public string ToXml()
         {
-            var sb = new StringBuilder();
-            using var xml = XmlWriter.Create(sb);
+            using var ms = new MemoryStream();
+            using var xml = XmlWriter.Create(ms);
             xml.WriteStartDocument();
             
             xml.WriteStartElement("tv");
@@ -113,7 +113,8 @@ namespace ErsatzTV.Core.Iptv
             xml.WriteEndElement(); // tv
             xml.WriteEndDocument();
 
-            return sb.ToString();
+            xml.Flush();
+            return Encoding.UTF8.GetString(ms.ToArray());
         }
     }
 }
diff --git a/ErsatzTV.Core/Metadata/LocalMediaScanner.cs b/ErsatzTV.Core/Metadata/LocalMediaScanner.cs
index df3603b8b..54cf57a9c 100644
--- a/ErsatzTV.Core/Metadata/LocalMediaScanner.cs
+++ b/ErsatzTV.Core/Metadata/LocalMediaScanner.cs
@@ -60,7 +60,7 @@ namespace ErsatzTV.Core.Metadata
             var knownExtensions = new List<string>
             {
                 ".mpg", ".mp2", ".mpeg", ".mpe", ".mpv", ".ogg", ".mp4", ".m4p", ".m4v",
-                ".avi", ".wmv", ".mov", ".mkv"
+                ".avi", ".wmv", ".mov", ".mkv", ".ts"
             };
 
             var allFiles = Directory.GetFiles(localMediaSource.Folder, "*", SearchOption.AllDirectories)
diff --git a/ErsatzTV/Shared/MainLayout.razor b/ErsatzTV/Shared/MainLayout.razor
index 8e1a8ec37..221b2337a 100644
--- a/ErsatzTV/Shared/MainLayout.razor
+++ b/ErsatzTV/Shared/MainLayout.razor
@@ -9,21 +9,16 @@
         <MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@(_ => DrawerToggle())"/>
         <MudText Typo="Typo.h5" Class="ml-3">ErsatzTV</MudText>
         <MudAppBarSpacer/>
-        <MudTooltip Text="Channels M3U">
-            <MudIconButton Icon="@Icons.Custom.FileFormats.FileVideo" Color="Color.Inherit" Link="/iptv/channels.m3u" Target="_blank"/>
-        </MudTooltip>
-        <MudTooltip Text="EPG XMLTV">
-            <MudIconButton Icon="@Icons.Custom.FileFormats.FileCode" Color="Color.Inherit" Link="/iptv/xmltv.xml" Target="_blank"/>
-        </MudTooltip>
+        <MudLink Style="@($"color:{Colors.Shades.White}")" Color="Color.Inherit" Href="/iptv/channels.m3u" Target="_blank" Underline="Underline.None">M3U</MudLink>
+        <MudLink Style="@($"color:{Colors.Shades.White}")" Color="Color.Inherit" Href="/iptv/xmltv.xml" Target="_blank" Class="mx-4" Underline="Underline.None">XMLTV</MudLink>
+        <MudLink Style="@($"color:{Colors.Shades.White}")" Color="Color.Inherit" Href="/swagger" Target="_blank" Class="mr-4" Underline="Underline.None">API</MudLink>
+        <MudDivider Vertical="true" FlexItem="true" DividerType="DividerType.Middle" Class="mx-4 my-5" />
         <MudTooltip Text="Discord">
             <MudIconButton Icon="fab fa-discord" Color="Color.Inherit" Link="https://discord.gg/hHaJm3yGy6" Target="_blank"/>
         </MudTooltip>
         <MudTooltip Text="GitHub">
             <MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Inherit" Link="https://github.com/jasongdove/ErsatzTV" Target="_blank"/>
         </MudTooltip>
-        <MudTooltip Text="OpenAPI">
-            <MudIconButton Icon="@Icons.Material.Filled.Api" Color="Color.Inherit" Link="/swagger" Target="_blank"/>
-        </MudTooltip>
     </MudAppBar>
     <MudDrawer @bind-Open="_drawerOpen" Elevation="2">
         <MudNavMenu>