diff --git a/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs b/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs
index c0efc0b..ded03f2 100644
--- a/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent.SimConnectMSFS/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("1f9cbede-669d-4510-bca2-e6ad29d6a498")]
-[assembly: AssemblyVersion("0.5.12")]
-[assembly: AssemblyFileVersion("0.5.12")]
+[assembly: AssemblyVersion("0.5.13")]
+[assembly: AssemblyFileVersion("0.5.13")]
diff --git a/OpenSky.Agent.Simulator/OpenSkyColors.xaml b/OpenSky.Agent.Simulator/OpenSkyColors.xaml
index 87c900e..5bc81e4 100644
--- a/OpenSky.Agent.Simulator/OpenSkyColors.xaml
+++ b/OpenSky.Agent.Simulator/OpenSkyColors.xaml
@@ -20,7 +20,7 @@
     <SolidColorBrush x:Key="OpenSkyWarningOrangeBrush" Color="{StaticResource OpenSkyWarningOrange}" />
     <Color x:Key="OpenSkyWarningOrangeLight">Orange</Color>
     <SolidColorBrush x:Key="OpenSkyWarningOrangeLightBrush" Color="{StaticResource OpenSkyWarningOrangeLight}" />
-    <Color x:Key="OpenSkySimBrief">Black</Color>
+    <Color x:Key="OpenSkySimBrief">#666</Color>
     <SolidColorBrush x:Key="OpenSkySimBriefBrush" Color="{StaticResource OpenSkySimBrief}" />
     <Color x:Key="OpenSkySimBriefText">White</Color>
     <SolidColorBrush x:Key="OpenSkySimBriefTextBrush" Color="{StaticResource OpenSkySimBriefText}" />
diff --git a/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs b/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs
index d589778..7c4dde2 100644
--- a/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs
@@ -18,6 +18,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("30c467e8-2eee-41e5-be01-0142a61ba171")]
-[assembly: AssemblyVersion("0.5.12")]
-[assembly: AssemblyFileVersion("0.5.12")]
+[assembly: AssemblyVersion("0.5.13")]
+[assembly: AssemblyFileVersion("0.5.13")]
 [assembly: InternalsVisibleTo("OpenSky.Agent")]
diff --git a/OpenSky.Agent.Simulator/Simulator.Flight.cs b/OpenSky.Agent.Simulator/Simulator.Flight.cs
index 16a13d3..2054096 100644
--- a/OpenSky.Agent.Simulator/Simulator.Flight.cs
+++ b/OpenSky.Agent.Simulator/Simulator.Flight.cs
@@ -332,7 +332,6 @@ public Flight Flight
                         {
                             if (value.NavlogFixes?.Count > 0)
                             {
-                                this.SimbriefOfpLoaded = true;
                                 foreach (var flightNavlogFix in value.NavlogFixes)
                                 {
                                     this.SimbriefRouteLocations.Add(new Location(flightNavlogFix.Latitude, flightNavlogFix.Longitude));
@@ -397,7 +396,6 @@ public Flight Flight
                     this.flightLoadingTempModels = null;
                     this.StopTracking(false);
                     this.lastFlightLogAutoSave = DateTime.MinValue;
-                    this.simbriefOfpLoaded = false;
                     this.OnlineNetworkConnectionDuration = TimeSpan.Zero;
                     this.OnlineNetworkConnectionStarted = null;
                     this.VatsimClientConnection = null;
diff --git a/OpenSky.Agent.Simulator/Simulator.simBrief.cs b/OpenSky.Agent.Simulator/Simulator.simBrief.cs
index 29a28ac..1049588 100644
--- a/OpenSky.Agent.Simulator/Simulator.simBrief.cs
+++ b/OpenSky.Agent.Simulator/Simulator.simBrief.cs
@@ -8,15 +8,10 @@ namespace OpenSky.Agent.Simulator
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Windows;
-    using System.Xml.Linq;
 
     using Microsoft.Maps.MapControl.WPF;
 
     using OpenSky.Agent.Simulator.Models;
-    using OpenSky.Agent.Simulator.Tools;
 
     /// -------------------------------------------------------------------------------------------------
     /// <content>
@@ -32,20 +27,6 @@ public partial class Simulator
         /// -------------------------------------------------------------------------------------------------
         private readonly List<SimbriefWaypointMarker> simbriefWaypointMarkers = new();
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// True if simbrief ofp was loaded for this flight.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        private bool simbriefOfpLoaded;
-
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Occurs when simbrief ofp loaded property changed.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        public event EventHandler<bool> SimbriefOfpLoadedChanged;
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Occurs when SimConnect adds a new simbrief waypoint marker.
@@ -53,201 +34,11 @@ public partial class Simulator
         /// -------------------------------------------------------------------------------------------------
         public event EventHandler<SimbriefWaypointMarker> SimbriefWaypointMarkerAdded;
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Gets a value indicating whether a simbrief ofp was loaded for the current flight.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        public bool SimbriefOfpLoaded
-        {
-            get => this.simbriefOfpLoaded;
-
-            private set
-            {
-                if (Equals(this.simbriefOfpLoaded, value))
-                {
-                    return;
-                }
-
-                this.simbriefOfpLoaded = value;
-                this.OnPropertyChanged();
-                this.SimbriefOfpLoadedChanged?.Invoke(this, value);
-            }
-        }
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Gets the Simbrief route location collection to draw a poly line on the map.
         /// </summary>
         /// -------------------------------------------------------------------------------------------------
         public LocationCollection SimbriefRouteLocations { get; }
-
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Import simbrief flight plan navlog fixes.
-        /// </summary>
-        /// <remarks>
-        /// sushi.at, 22/03/2021.
-        /// </remarks>
-        /// <param name="ofp">
-        /// The ofp.
-        /// </param>
-        /// -------------------------------------------------------------------------------------------------
-        [SuppressMessage("ReSharper", "PossibleNullReferenceException")]
-        public void ImportSimbrief(XElement ofp)
-        {
-            if (this.SimbriefOfpLoaded)
-            {
-                return;
-            }
-
-            Debug.WriteLine("SimConnect is importing simbrief flight plan");
-
-            // Departure airport is not part of the navlog so add a position for the polyline for it
-            var originLat = double.Parse((string)ofp.Element("origin").Element("pos_lat"));
-            var originLon = double.Parse((string)ofp.Element("origin").Element("pos_long"));
-            UpdateGUIDelegate addOriginLocation = () => this.SimbriefRouteLocations.Add(new Location(originLat, originLon));
-            Application.Current.Dispatcher.Invoke(addOriginLocation);
-
-            var fixes = ofp.Element("navlog").Elements("fix");
-            foreach (var fix in fixes)
-            {
-                var ident = (string)fix.Element("ident");
-                var latitude = double.Parse((string)fix.Element("pos_lat"));
-                var longitude = double.Parse((string)fix.Element("pos_long"));
-                var type = (string)fix.Element("type");
-
-                UpdateGUIDelegate addLocation = () =>
-                {
-                    this.SimbriefRouteLocations.Add(new Location(latitude, longitude));
-                    if (type != "apt")
-                    {
-                        Debug.WriteLine($"SimConnect creating simbrief waypoint marker {ident}");
-                        var newMarker = new SimbriefWaypointMarker(latitude, longitude, ident, type);
-                        this.simbriefWaypointMarkers.Add(newMarker);
-                        this.SimbriefWaypointMarkerAdded?.Invoke(this, newMarker);
-                    }
-                };
-                Application.Current.Dispatcher.BeginInvoke(addLocation);
-            }
-
-            // Route
-            var sbOriginICAO = (string)ofp.Element("origin")?.Element("icao_code");
-            var sbDestinationICAO = (string)ofp.Element("destination")?.Element("icao_code");
-            var sbRoute = (string)ofp.Element("general")?.Element("route");
-            if (!string.IsNullOrEmpty(sbRoute))
-            {
-                // Add airports and runways to route
-                var sbOriginRunway = (string)ofp.Element("origin")?.Element("plan_rwy");
-                var sbDestinationRunway = (string)ofp.Element("destination")?.Element("plan_rwy");
-                if (!string.IsNullOrEmpty(sbOriginICAO))
-                {
-                    var prefix = sbOriginICAO;
-                    if (!string.IsNullOrEmpty(sbOriginRunway))
-                    {
-                        prefix += $"/{sbOriginRunway}";
-                    }
-
-                    sbRoute = $"{prefix} {sbRoute}";
-                }
-
-                if (!string.IsNullOrEmpty(sbDestinationICAO))
-                {
-                    var postFix = sbDestinationICAO;
-                    if (!string.IsNullOrEmpty(sbDestinationRunway))
-                    {
-                        postFix += $"/{sbDestinationRunway}";
-                    }
-
-                    sbRoute += $" {postFix}";
-                }
-
-                UpdateGUIDelegate updateRoute = () =>
-                {
-                    this.Flight.Route = sbRoute;
-                    this.OnPropertyChanged(nameof(this.Flight));
-                };
-                Application.Current.Dispatcher.BeginInvoke(updateRoute);
-            }
-
-            // Alternate route
-            var sbAlternateICAO = (string)ofp.Element("alternate")?.Element("icao_code");
-            var sbAlternateRoute = (string)ofp.Element("alternate")?.Element("route");
-            if (!string.IsNullOrEmpty(sbAlternateRoute))
-            {
-                // Add airport and runway to route
-                var sbAlternateRunway = (string)ofp.Element("alternate")?.Element("plan_rwy");
-                if (!string.IsNullOrEmpty(sbAlternateICAO))
-                {
-                    var postFix = sbAlternateICAO;
-                    if (!string.IsNullOrEmpty(sbAlternateRunway))
-                    {
-                        postFix += $"/{sbAlternateRunway}";
-                    }
-
-                    sbAlternateRoute += $" {postFix}";
-                }
-
-                UpdateGUIDelegate updateAlternateRoute = () =>
-                {
-                    this.Flight.AlternateRoute = sbAlternateRoute;
-                    this.OnPropertyChanged(nameof(this.Flight));
-                };
-                Application.Current.Dispatcher.BeginInvoke(updateAlternateRoute);
-            }
-
-            var sbOfpHtml = (string)ofp.Element("text")?.Element("plan_html");
-            if (!string.IsNullOrEmpty(sbOfpHtml))
-            {
-                // todo maybe can use this in the future if we find more performant html rendering control
-                //if (!sbOfpHtml.StartsWith("<html>"))
-                //{
-                //    const string style = "body { background-color: #29323c; color: #c2c2c2; margin: -1px; } div { margin-top: 10px; margin-left: 10px; margin-bottom: -10px; }";
-                //    sbOfpHtml = $"<html><head><style type=\"text/css\">{style}</style></head><body>{sbOfpHtml}</body></html>";
-                //}
-
-                // Remove comments
-                while (sbOfpHtml.Contains("<!--"))
-                {
-                    var start = sbOfpHtml.IndexOf("<!--", StringComparison.InvariantCultureIgnoreCase);
-                    var end = sbOfpHtml.IndexOf("-->", start, StringComparison.InvariantCultureIgnoreCase);
-                    if (start != -1 && end != -1)
-                    {
-                        sbOfpHtml = sbOfpHtml.Substring(0, start) + sbOfpHtml.Substring(end + 3);
-                    }
-                }
-
-                // Replace page breaks
-                sbOfpHtml = sbOfpHtml.Replace("<h2 style=\"page-break-after: always;\"> </h2>", "\r\n\r\n");
-
-                // Remove html tags
-                while (sbOfpHtml.Contains("<"))
-                {
-                    var start = sbOfpHtml.IndexOf("<", StringComparison.InvariantCultureIgnoreCase);
-                    var end = sbOfpHtml.IndexOf(">", start, StringComparison.InvariantCultureIgnoreCase);
-                    if (start != -1 && end != -1)
-                    {
-                        // Are we removing an image?
-                        if (sbOfpHtml.Substring(start, 4) == "<img")
-                        {
-                            sbOfpHtml = sbOfpHtml.Substring(0, start) + "---Image removed---" + sbOfpHtml.Substring(end + 1);
-                        }
-                        else
-                        {
-                            sbOfpHtml = sbOfpHtml.Substring(0, start) + sbOfpHtml.Substring(end + 1);
-                        }
-                    }
-                }
-
-                UpdateGUIDelegate setOfp = () =>
-                {
-                    this.Flight.OfpHtml = sbOfpHtml;
-                    this.OnPropertyChanged(nameof(this.Flight));
-                };
-                Application.Current.Dispatcher.BeginInvoke(setOfp);
-            }
-
-            this.SimbriefOfpLoaded = true;
-        }
     }
 }
\ No newline at end of file
diff --git a/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs b/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs
index 21d7209..718e1a2 100644
--- a/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent.UdpXPlane11/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("dfbda2b8-5775-4766-be86-d729fcf20de1")]
-[assembly: AssemblyVersion("0.5.12")]
-[assembly: AssemblyFileVersion("0.5.12")]
+[assembly: AssemblyVersion("0.5.13")]
+[assembly: AssemblyFileVersion("0.5.13")]
diff --git a/OpenSky.Agent/Properties/AssemblyInfo.cs b/OpenSky.Agent/Properties/AssemblyInfo.cs
index 64bfb2c..d63e246 100644
--- a/OpenSky.Agent/Properties/AssemblyInfo.cs
+++ b/OpenSky.Agent/Properties/AssemblyInfo.cs
@@ -21,8 +21,8 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: AssemblyVersion("0.5.12")]
-[assembly: AssemblyFileVersion("0.5.12")]
+[assembly: AssemblyVersion("0.5.13")]
+[assembly: AssemblyFileVersion("0.5.13")]
 
 // This allows us to detect debug mode in XAML
 #if DEBUG
diff --git a/OpenSky.Agent/Views/FlightTracking.xaml b/OpenSky.Agent/Views/FlightTracking.xaml
index 1745919..211d4d4 100644
--- a/OpenSky.Agent/Views/FlightTracking.xaml
+++ b/OpenSky.Agent/Views/FlightTracking.xaml
@@ -59,7 +59,7 @@
         <converters:AircraftRegistryConverter x:Key="AircraftRegistryConverter" />
         <converters:CollectionEmptyVisibilityConverter x:Key="CollectionEmptyVisibilityConverter" />
     </Window.Resources>
-    <Grid Margin="20">
+    <Grid Margin="00">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -77,7 +77,7 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <GroupBox Grid.Row="0" Grid.Column="0">
+        <GroupBox Grid.Row="0" Grid.Column="0" Margin="10,10,0,0">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Flight plan</TextBlock>
             </GroupBox.Header>
@@ -86,7 +86,6 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -107,10 +106,9 @@
                     <Button Content="{Binding Simulator.Flight.Alternate.Icao, FallbackValue=?}" FontSize="10" Height="24" FontWeight="Bold" Style="{StaticResource OpenSkyOrangeButtonStyle}" Width="55" Margin="0,2" Command="{Binding MoveMapToCoordinateCommand}" CommandParameter="{Binding Simulator.Flight.Alternate, FallbackValue={x:Null}}" />
                     <TextBlock Text="{Binding Simulator.Flight.Alternate.Name, FallbackValue=''}" Margin="5,0,0,0" VerticalAlignment="Center" />
                 </StackPanel>
-                <Button Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,5,0,0" HorizontalAlignment="Stretch" Style="{StaticResource OpenSkyButtonStyle}" Foreground="White" FontSize="14" FontWeight="SemiBold" Command="{Binding ImportSimbriefCommand}" Visibility="{Binding ImportSimbriefVisibility}">Import waypoints from Simbrief flight plan</Button>
             </Grid>
         </GroupBox>
-        <GroupBox Grid.Row="1" Grid.Column="0" Visibility="{Binding TrackingConditionsVisibility}">
+        <GroupBox Grid.Row="1" Grid.Column="0" Visibility="{Binding TrackingConditionsVisibility}" Margin="10,0,0,0">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Tracking conditions</TextBlock>
             </GroupBox.Header>
@@ -234,7 +232,7 @@
                 </UniformGrid>
             </Grid>
         </GroupBox>
-        <GroupBox Grid.Row="2" Grid.Column="0" Visibility="{Binding TrackingStatusVisibility}">
+        <GroupBox Grid.Row="2" Grid.Column="0" Visibility="{Binding TrackingStatusVisibility}" Margin="10,0,0,0">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Tracking Status</TextBlock>
             </GroupBox.Header>
@@ -288,7 +286,7 @@
                 <TextBlock Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="2" TextWrapping="Wrap" MaxWidth="330" HorizontalAlignment="Left" Foreground="Black" Margin="10,10">Note: You can close this window and OpenSky will monitor your flight in the background...</TextBlock>
             </Grid>
         </GroupBox>
-        <GroupBox Grid.Row="3" Grid.Column="0" IsEnabled="{Binding Simulator.TrackingStatus, Converter={StaticResource CanSetWeightAndBalancesConverter}}" Visibility="{Binding WeightAndBalancesVisibility}">
+        <GroupBox Grid.Row="3" Grid.Column="0" IsEnabled="{Binding Simulator.TrackingStatus, Converter={StaticResource CanSetWeightAndBalancesConverter}}" Visibility="{Binding WeightAndBalancesVisibility}" Margin="10,0,0,0">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Weights and Balances</TextBlock>
             </GroupBox.Header>
@@ -323,7 +321,7 @@
                 <Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" Command="{Binding ToggleAdvancedWeightAndBalanceCommand}" Content="{Binding ShowHideAdvancedWeightAndBalanceButtonText}" />
             </Grid>
         </GroupBox>
-        <GroupBox Grid.Row="5" Grid.Column="0" Visibility="{Binding Simulator.GroundHandlingComplete, Converter={StaticResource InvertedBooleanVisibilityConverter}}">
+        <GroupBox Grid.Row="5" Grid.Column="0" Visibility="{Binding Simulator.GroundHandlingComplete, Converter={StaticResource InvertedBooleanVisibilityConverter}}" Margin="10,0,0,0">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Ground Handling</TextBlock>
             </GroupBox.Header>
@@ -365,19 +363,19 @@
                 </Grid>
             </Grid>
         </GroupBox>
-        <GroupBox Grid.Row="6" Grid.Column="0">
+        <GroupBox Grid.Row="6" Grid.Column="0" Margin="10,0,0,0">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Payload</TextBlock>
             </GroupBox.Header>
             <TextBlock Text="{Binding Simulator.Flight.PayloadSummary, FallbackValue=None}" FontSize="12" Margin="5,0" />
         </GroupBox>
-        <GroupBox Grid.Row="7" Grid.Column="0">
+        <GroupBox Grid.Row="7" Grid.Column="0" Margin="10,0,0,10">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Crew</TextBlock>
             </GroupBox.Header>
             <TextBlock Text="{Binding Simulator.Flight.CrewSummary, FallbackValue=None}" FontSize="12" Margin="5,0" />
         </GroupBox>
-        <GroupBox Grid.Row="0" Grid.RowSpan="8" Grid.Column="1" IsEnabled="{Binding Simulator.TrackingStatus, Converter={StaticResource CanSetWeightAndBalancesConverter}}" Visibility="{Binding WeightAndBalancesAdvancedVisibility}">
+        <GroupBox Grid.Row="0" Grid.RowSpan="8" Grid.Column="1" IsEnabled="{Binding Simulator.TrackingStatus, Converter={StaticResource CanSetWeightAndBalancesConverter}}" Visibility="{Binding WeightAndBalancesAdvancedVisibility}" Margin="0,10,0,10">
             <GroupBox.Header>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock FontSize="15" FontWeight="DemiBold">Weights and Balances</TextBlock>
@@ -540,7 +538,7 @@
                 </StackPanel>
             </ScrollViewer>
         </GroupBox>
-        <GroupBox Grid.Row="0" Grid.RowSpan="8" Grid.Column="3" Visibility="{Binding OfpVisibility}">
+        <GroupBox Grid.Row="0" Grid.RowSpan="8" Grid.Column="3" Visibility="{Binding OfpVisibility}" Margin="0,10,0,10">
             <GroupBox.Header>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock FontSize="15" FontWeight="DemiBold">OFP</TextBlock>
@@ -549,7 +547,7 @@
             </GroupBox.Header>
             <TextBox Text="{Binding Simulator.Flight.OfpHtml, FallbackValue=''}" IsReadOnly="True" FontFamily="Consolas" FontSize="13" />
         </GroupBox>
-        <Grid Grid.Column="4" Grid.Row="0" Grid.RowSpan="8">
+        <Grid Grid.Column="4" Grid.Row="0" Grid.RowSpan="8" Margin="0,7,10,7">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -666,7 +664,7 @@
                 </Grid>
             </GroupBox>
         </Grid>
-        <GroupBox Grid.Column="2" Grid.Row="0" Grid.RowSpan="8" Margin="5,3">
+        <GroupBox Grid.Column="2" Grid.Row="0" Grid.RowSpan="8" Margin="5,10,5,10">
             <GroupBox.Header>
                 <TextBlock FontSize="15" FontWeight="DemiBold">Map</TextBlock>
             </GroupBox.Header>
@@ -704,7 +702,7 @@
                 <Image Source="/Resources/osm25.png" Width="25" Height="25" Margin="65,0,0,12" HorizontalAlignment="Left" VerticalAlignment="Bottom" />
             </Grid>
         </GroupBox>
-        <Border Grid.Row="0" Grid.Column="0" Grid.RowSpan="8" Grid.ColumnSpan="5" Background="#CC000000" Margin="-20" Visibility="{Binding NoFlightVisibility, Mode=OneWay}">
+        <Border Grid.Row="0" Grid.Column="0" Grid.RowSpan="8" Grid.ColumnSpan="5" Background="#CC000000" Visibility="{Binding NoFlightVisibility, Mode=OneWay}">
             <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
                 <TextBlock FontSize="40" HorizontalAlignment="Center">No flight ready for tracking</TextBlock>
                 <TextBlock HorizontalAlignment="Center" MaxWidth="550" FontSize="13">Please start a new flight from the OpenSky client first, or resume a saved one:</TextBlock>
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs
index 3c1e150..e96fd2c 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.Map.cs
@@ -9,17 +9,11 @@ namespace OpenSky.Agent.Views.Models
     using System;
     using System.Device.Location;
     using System.Diagnostics;
-    using System.IO;
-    using System.Net;
-    using System.Text;
     using System.Windows;
-    using System.Xml.Linq;
 
     using Microsoft.Maps.MapControl.WPF;
 
     using OpenSky.Agent.MVVM;
-    using OpenSky.Agent.Simulator.Controls;
-    using OpenSky.Agent.Simulator.Controls.Models;
     using OpenSky.Agent.Simulator.Models;
     using OpenSky.Agent.Simulator.Tools;
 
@@ -53,13 +47,6 @@ public partial class FlightTrackingViewModel
         /// -------------------------------------------------------------------------------------------------
         private bool followPlane = true;
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// The import simbrief visibility.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        private Visibility importSimbriefVisibility = Visibility.Visible;
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// The last aircraft position update.
@@ -157,13 +144,6 @@ public bool FollowPlane
             }
         }
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Gets the import simbrief command.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        public AsynchronousCommand ImportSimbriefCommand { get; }
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Gets or sets the date/time of the last user map interaction.
@@ -192,101 +172,6 @@ public DateTime LastUserMapInteraction
         /// -------------------------------------------------------------------------------------------------
         public Command MoveMapToCoordinateCommand { get; }
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Import simbrief waypoints.
-        /// </summary>
-        /// <remarks>
-        /// sushi.at, 22/03/2021.
-        /// </remarks>
-        /// -------------------------------------------------------------------------------------------------
-        private void ImportSimbrief()
-        {
-            using var client = new WebClient();
-            try
-            {
-                Debug.WriteLine("Importing sim brief flight plan waypoints");
-                if (string.IsNullOrEmpty(UserSessionService.Instance.LinkedAccounts?.SimbriefUsername))
-                {
-                    throw new Exception("No Simbrief user name configured, please configure it using the OpenSky client!");
-                }
-
-                if (this.Simulator.Flight == null)
-                {
-                    throw new Exception("No flight loaded!");
-                }
-
-                var xml = client.DownloadString($"https://www.simbrief.com/api/xml.fetcher.php?username={UserSessionService.Instance.LinkedAccounts?.SimbriefUsername}");
-
-                var ofp = XElement.Parse(xml);
-                var originICAO = (string)ofp.Element("origin")?.Element("icao_code");
-                var destinationICAO = (string)ofp.Element("destination")?.Element("icao_code");
-
-                if (!this.Simulator.Flight.Origin.Icao.Trim().Equals(originICAO.Trim(), StringComparison.InvariantCultureIgnoreCase))
-                {
-                    throw new Exception("Departure airport doesn't match!");
-                }
-
-                if (!this.Simulator.Flight.Destination.Icao.Trim().Equals(destinationICAO.Trim(), StringComparison.InvariantCultureIgnoreCase))
-                {
-                    throw new Exception("Destination airport doesn't match!");
-                }
-
-                this.Simulator.ImportSimbrief(ofp);
-                this.ImportSimbriefVisibility = Visibility.Collapsed;
-            }
-            catch (WebException ex)
-            {
-                Debug.WriteLine("Web error received from simBrief api: " + ex);
-
-                var responseStream = ex.Response.GetResponseStream();
-                if (responseStream != null)
-                {
-                    var responseString = string.Empty;
-                    var reader = new StreamReader(responseStream, Encoding.UTF8);
-                    var buffer = new char[1024];
-                    var count = reader.Read(buffer, 0, buffer.Length);
-                    while (count > 0)
-                    {
-                        responseString += new string(buffer, 0, count);
-                        count = reader.Read(buffer, 0, buffer.Length);
-                    }
-
-                    Debug.WriteLine(responseString);
-                    if (responseString.Contains("<OFP>"))
-                    {
-                        var ofp = XElement.Parse(responseString);
-                        var status = ofp.Element("fetch")?.Element("status")?.Value;
-                        if (!string.IsNullOrWhiteSpace(status))
-                        {
-                            Debug.WriteLine("Error fetching flight plan from simBrief: " + status);
-                            this.ImportSimbriefCommand.ReportProgress(
-                                () =>
-                                {
-                                    var notification = new OpenSkyNotification("Error fetching flight plan from simBrief", status, MessageBoxButton.OK, ExtendedMessageBoxImage.Error, 30);
-                                    notification.SetErrorColorStyle();
-                                    this.ViewReference.ShowNotification(notification);
-                                });
-                            return;
-                        }
-                    }
-                }
-
-                throw;
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine("Error fetching flight plan from simBrief: " + ex);
-                this.ImportSimbriefCommand.ReportProgress(
-                    () =>
-                    {
-                        var notification = new OpenSkyNotification(new ErrorDetails { DetailedMessage = ex.Message, Exception = ex }, "Error fetching flight plan from simBrief", ex.Message, ExtendedMessageBoxImage.Error, 30);
-                        notification.SetErrorColorStyle();
-                        this.ViewReference.ShowNotification(notification);
-                    });
-            }
-        }
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Move the map to coordinate specified in command parameter (either Location or GeoCoordinate).
diff --git a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs
index 918a960..0ef3635 100644
--- a/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs
+++ b/OpenSky.Agent/Views/Models/FlightTrackingViewModel.cs
@@ -165,7 +165,6 @@ public FlightTrackingViewModel()
             this.Simulator.TrackingStatusChanged += this.SimulatorTrackingStatusChanged;
             this.Simulator.FlightChanged += this.SimulatortFlightChanged;
             this.Simulator.LocationChanged += this.SimulatorLocationChanged;
-            this.Simulator.SimbriefOfpLoadedChanged += this.SimulatorOfpLoadedChanged;
 
             // Create commands
             this.SetFuelAndPayloadCommand = new Command(this.SetFuelAndPayload);
@@ -178,7 +177,6 @@ public FlightTrackingViewModel()
             this.AbortFlightCommand = new AsynchronousCommand(this.AbortFlight, false);
             this.ToggleFlightPauseCommand = new AsynchronousCommand(this.ToggleFlightPause, false);
             this.StopTrackingCommand = new AsynchronousCommand(this.StopTracking, false);
-            this.ImportSimbriefCommand = new AsynchronousCommand(this.ImportSimbrief, false);
             this.MoveMapToCoordinateCommand = new Command(this.MoveMapToCoordinate);
             this.SlewIntoPositionCommand = new AsynchronousCommand(this.SlewIntoPosition);
             this.ToggleOfpCommand = new Command(this.ToggleOfp);
@@ -190,10 +188,6 @@ public FlightTrackingViewModel()
             // Are we already preparing/resuming/tracking?
             this.SimulatorTrackingStatusChanged(this, this.Simulator.TrackingStatus);
             this.SimulatortFlightChanged(this, this.Simulator.Flight);
-            if (this.Simulator.SimbriefOfpLoaded)
-            {
-                this.ImportSimbriefVisibility = Visibility.Collapsed;
-            }
         }
 
         /// -------------------------------------------------------------------------------------------------
@@ -238,27 +232,6 @@ private set
             }
         }
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Gets the import simbrief visibility.
-        /// </summary>
-        /// -------------------------------------------------------------------------------------------------
-        public Visibility ImportSimbriefVisibility
-        {
-            get => this.importSimbriefVisibility;
-
-            private set
-            {
-                if (Equals(this.importSimbriefVisibility, value))
-                {
-                    return;
-                }
-
-                this.importSimbriefVisibility = value;
-                this.NotifyPropertyChanged();
-            }
-        }
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Gets or sets the loading text.
@@ -699,25 +672,6 @@ private void SetFuelAndPayload()
             this.SetPayloadStations();
         }
 
-        /// -------------------------------------------------------------------------------------------------
-        /// <summary>
-        /// Simulator ofp loaded changed.
-        /// </summary>
-        /// <remarks>
-        /// sushi.at, 18/11/2023.
-        /// </remarks>
-        /// <param name="sender">
-        /// Source of the event.
-        /// </param>
-        /// <param name="loaded">
-        /// True if the data was loaded.
-        /// </param>
-        /// -------------------------------------------------------------------------------------------------
-        private void SimulatorOfpLoadedChanged(object sender, bool loaded)
-        {
-            this.ImportSimbriefVisibility = loaded ? Visibility.Collapsed : Visibility.Visible;
-        }
-
         /// -------------------------------------------------------------------------------------------------
         /// <summary>
         /// Simulator flight changed.
@@ -738,7 +692,6 @@ private void SimulatortFlightChanged(object sender, Flight e)
             {
                 this.AbortFlightCommand.CanExecute = e != null;
                 this.StartTrackingCommand.CanExecute = e != null;
-                this.ImportSimbriefCommand.CanExecute = e != null;
                 this.NoFlightVisibility = e != null ? Visibility.Collapsed : Visibility.Visible;
                 this.StartTrackingButtonText = e?.Resume == true ? "Resume Tracking" : "Start Tracking";
 
@@ -801,11 +754,6 @@ private void SimulatorTrackingStatusChanged(object sender, TrackingStatus e)
                 this.TrackingConditionsVisibility = Visibility.Visible;
                 this.TrackingStatusVisibility = Visibility.Collapsed;
                 this.SkipGroundHandlingVisibility = Visibility.Collapsed;
-                if (!this.Simulator.SimbriefOfpLoaded)
-                {
-                    this.ImportSimbriefVisibility = Visibility.Visible;
-                }
-
                 this.ResumeFlightTipsVisibility = Visibility.Collapsed;
                 this.GroundHandlingWarningVisibility = Visibility.Collapsed;
                 UpdateGUIDelegate updateTrackingCommands = () =>
@@ -823,7 +771,6 @@ private void SimulatorTrackingStatusChanged(object sender, TrackingStatus e)
                 this.WeightAndBalancesAdvancedVisibility = Visibility.Collapsed;
                 this.TrackingConditionsVisibility = Visibility.Visible;
                 this.TrackingStatusVisibility = Visibility.Collapsed;
-                this.ImportSimbriefVisibility = Visibility.Collapsed;
                 this.ResumeFlightTipsVisibility = Visibility.Visible;
                 this.GroundHandlingWarningVisibility = Visibility.Collapsed;
                 this.SkipGroundHandlingVisibility = Visibility.Collapsed;
@@ -835,7 +782,6 @@ private void SimulatorTrackingStatusChanged(object sender, TrackingStatus e)
                 this.WeightAndBalancesAdvancedVisibility = Visibility.Collapsed;
                 this.TrackingConditionsVisibility = Visibility.Collapsed;
                 this.TrackingStatusVisibility = Visibility.Visible;
-                this.ImportSimbriefVisibility = Visibility.Collapsed;
                 this.ResumeFlightTipsVisibility = Visibility.Collapsed;
                 this.GroundHandlingWarningVisibility = Visibility.Visible;
                 this.SkipGroundHandlingVisibility = Visibility.Visible;
@@ -853,7 +799,6 @@ private void SimulatorTrackingStatusChanged(object sender, TrackingStatus e)
                 this.WeightAndBalancesAdvancedVisibility = Visibility.Collapsed;
                 this.TrackingConditionsVisibility = Visibility.Collapsed;
                 this.TrackingStatusVisibility = Visibility.Visible;
-                this.ImportSimbriefVisibility = Visibility.Collapsed;
                 this.ResumeFlightTipsVisibility = Visibility.Collapsed;
                 this.GroundHandlingWarningVisibility = Visibility.Collapsed;
                 this.SkipGroundHandlingVisibility = Visibility.Collapsed;
@@ -871,7 +816,6 @@ private void SimulatorTrackingStatusChanged(object sender, TrackingStatus e)
                 this.WeightAndBalancesAdvancedVisibility = Visibility.Collapsed;
                 this.TrackingConditionsVisibility = Visibility.Visible;
                 this.TrackingStatusVisibility = Visibility.Collapsed;
-                this.ImportSimbriefVisibility = Visibility.Visible;
                 this.ResumeFlightTipsVisibility = Visibility.Collapsed;
                 this.GroundHandlingWarningVisibility = Visibility.Collapsed;
                 this.SkipGroundHandlingVisibility = Visibility.Collapsed;
diff --git a/changelog.txt b/changelog.txt
index e46b65f..dfb24a7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,14 @@
 OpenSky Flight Tracking Agent Changelog
 ======================================================================================
 
+--------------------------------------------------------------------------------------
+Version 0.5.13 (ALPHA5)
+--------------------------------------------------------------------------------------
+- Simbrief marker color updated to match client and dark map styles
+- Fixed border layout of flight tracking view
+- Removed import simbrief waypoints from agent, client has surpassed that
+  functionality
+
 --------------------------------------------------------------------------------------
 Version 0.5.12 (ALPHA5)
 --------------------------------------------------------------------------------------