diff --git a/EliteBGS/MainWindow.xaml b/EliteBGS/MainWindow.xaml
index ea7327a..bf55bbf 100644
--- a/EliteBGS/MainWindow.xaml
+++ b/EliteBGS/MainWindow.xaml
@@ -60,7 +60,10 @@
                             <HierarchicalDataTemplate DataType="{x:Type local:Objective}" ItemsSource="{Binding UITransactions}" ItemContainerStyle="{StaticResource StretchingTreeViewStyle}">
                                 <StackPanel Orientation="Horizontal">
                                     <CheckBox Focusable="False" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center"/>
-                                    <TextBlock Text="{Binding Name}" Margin="5,0" />
+                                    <TextBlock Text="System: " Visibility="{Binding HasSystem}" Margin="5,0,0,0"/>
+                                    <TextBlock Text="{Binding System}" FontWeight="DemiBold" Visibility="{Binding HasSystem}"/>
+                                    <TextBlock Text="Faction: " Visibility="{Binding HasFaction}" Margin="5,0,0,0"/>
+                                    <TextBlock Text="{Binding Faction}" FontWeight="DemiBold" Visibility="{Binding HasFaction}"/>
                                 </StackPanel>
                                 <HierarchicalDataTemplate.ItemTemplate>
                                     <HierarchicalDataTemplate>
diff --git a/EliteBGS/Objective.cs b/EliteBGS/Objective.cs
index 40fd53e..f3b2ca4 100644
--- a/EliteBGS/Objective.cs
+++ b/EliteBGS/Objective.cs
@@ -79,6 +79,14 @@ public class Objective : IComparable<Objective> {
         get { return UITransactions.Select(x => x.Transaction).ToList<Transaction>(); }
     }
 
+    public Visibility HasSystem {
+        get { return string.IsNullOrEmpty(System) ? Visibility.Hidden : Visibility.Visible; }
+    }
+
+    public Visibility HasFaction {
+        get { return string.IsNullOrEmpty(Faction) ? Visibility.Hidden : Visibility.Visible; }
+    }
+
     public string Name {
         get { return this.ToString(); }
     }