diff --git a/CUE4Parse b/CUE4Parse
index 1a5ba822..13cc381f 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit 1a5ba822bd3bf09edaecae40075fa0705d5436df
+Subproject commit 13cc381f9f88c4396a63a59c81445baea03693d3
diff --git a/FModel/Settings/DirectorySettings.cs b/FModel/Settings/DirectorySettings.cs
index d96a735b..6b977cbb 100644
--- a/FModel/Settings/DirectorySettings.cs
+++ b/FModel/Settings/DirectorySettings.cs
@@ -113,6 +113,11 @@ public class DirectorySettings : ViewModel, ICloneable
         return HashCode.Combine(GameDirectory, (int) UeVersion);
     }
 
+    public override string ToString()
+    {
+        return GameName;
+    }
+
     public object Clone()
     {
         return this.MemberwiseClone();
diff --git a/FModel/Views/DirectorySelector.xaml b/FModel/Views/DirectorySelector.xaml
index 64eeed8b..f268e0a1 100644
--- a/FModel/Views/DirectorySelector.xaml
+++ b/FModel/Views/DirectorySelector.xaml
@@ -52,14 +52,17 @@
                     </Grid.ColumnDefinitions>
 
                     <TextBlock Grid.Row="0" Grid.Column="0" Text="Detected Game" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <ComboBox Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3" ItemsSource="{Binding DetectedDirectories}" Margin="0 0 0 5"
-                              VerticalAlignment="Center" SelectedItem="{Binding SelectedDirectory, Mode=TwoWay}">
+                    <controls:FilterableComboBox Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3"
+                                                 ItemsSource="{Binding DetectedDirectories}" Margin="0 0 0 5"
+                                                 Style="{StaticResource UComboBox}"
+                                                 adonisExtensions:WatermarkExtension.Watermark="Search for a game..."
+                                                 VerticalAlignment="Center" SelectedItem="{Binding SelectedDirectory, Mode=TwoWay}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding GameName, Converter={x:Static converters:StringToGameConverter.Instance}}" />
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
-                    </ComboBox>
+                    </controls:FilterableComboBox>
 
                     <TextBlock Grid.Row="1" Grid.Column="0" Text="UE Versions" VerticalAlignment="Center" Margin="0 0 0 5" />
                     <controls:FilterableComboBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="3" Margin="0 0 0 5"
diff --git a/FModel/Views/Resources/Controls/CommitControl.xaml b/FModel/Views/Resources/Controls/CommitControl.xaml
index c1cf82b4..6d597d9c 100644
--- a/FModel/Views/Resources/Controls/CommitControl.xaml
+++ b/FModel/Views/Resources/Controls/CommitControl.xaml
@@ -65,18 +65,66 @@
                 </Grid>
             </Grid>
 
-            <controls:CommitDownloaderControl Grid.Column="1" Commit="{Binding}">
-                <controls:CommitDownloaderControl.Style>
-                    <Style TargetType="controls:CommitDownloaderControl">
-                        <Setter Property="Visibility" Value="Collapsed" />
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsDownloadable}" Value="True">
-                                <Setter Property="Visibility" Value="Visible"/>
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </controls:CommitDownloaderControl.Style>
-            </controls:CommitDownloaderControl>
+            <Grid Grid.Column="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="15" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Border Grid.Column="0"
+                        BorderThickness="1"
+                        CornerRadius="2.5"
+                        Padding="5,2"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                    <TextBlock FontSize="9" Foreground="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=Border}}">
+                        <TextBlock.Style>
+                            <Style TargetType="TextBlock">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
+                                        <Setter Property="Text" Value="Latest" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding IsCurrent}" Value="True">
+                                        <Setter Property="Text" Value="Current" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TextBlock.Style>
+                    </TextBlock>
+
+                    <Border.Style>
+                        <Style TargetType="Border">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible" />
+                                    <Setter Property="BorderBrush" Value="#3fb950" />
+                                    <Setter Property="Background" Value="#0f3fb950" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding IsCurrent}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible" />
+                                    <Setter Property="BorderBrush" Value="#3f92b9" />
+                                    <Setter Property="Background" Value="#0f3f92b9" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Border.Style>
+                </Border>
+
+                <controls:CommitDownloaderControl Grid.Column="2" Commit="{Binding}">
+                    <controls:CommitDownloaderControl.Style>
+                        <Style TargetType="controls:CommitDownloaderControl">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding IsDownloadable}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible"/>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </controls:CommitDownloaderControl.Style>
+                </controls:CommitDownloaderControl>
+            </Grid>
         </Grid>
     </Border>
 </UserControl>
diff --git a/FModel/Views/Resources/Controls/CommitDownloaderControl.xaml b/FModel/Views/Resources/Controls/CommitDownloaderControl.xaml
index 256ce0a4..954d64e7 100644
--- a/FModel/Views/Resources/Controls/CommitDownloaderControl.xaml
+++ b/FModel/Views/Resources/Controls/CommitDownloaderControl.xaml
@@ -15,51 +15,9 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="15" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="15" />
-            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-        <Border Grid.Column="0"
-                BorderThickness="1"
-                CornerRadius="2.5"
-                Padding="5,2"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-            <TextBlock FontSize="9" Foreground="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=Border}}">
-                <TextBlock.Style>
-                    <Style TargetType="TextBlock">
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
-                                <Setter Property="Text" Value="Latest" />
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding IsCurrent}" Value="True">
-                                <Setter Property="Text" Value="Current" />
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </TextBlock.Style>
-            </TextBlock>
-
-            <Border.Style>
-                <Style TargetType="Border">
-                    <Setter Property="Visibility" Value="Collapsed" />
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding Asset.IsLatest}" Value="True">
-                            <Setter Property="Visibility" Value="Visible" />
-                            <Setter Property="BorderBrush" Value="#3fb950" />
-                            <Setter Property="Background" Value="#0f3fb950" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding IsCurrent}" Value="True">
-                            <Setter Property="Visibility" Value="Visible" />
-                            <Setter Property="BorderBrush" Value="#3f92b9" />
-                            <Setter Property="Background" Value="#0f3f92b9" />
-                        </DataTrigger>
-                    </Style.Triggers>
-                </Style>
-            </Border.Style>
-        </Border>
-
-        <Grid Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="5" />
@@ -78,7 +36,7 @@
             </StackPanel>
         </Grid>
 
-        <Button Grid.Column="4" Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}" ToolTip="Download"
+        <Button Grid.Column="2" Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarButton}}" ToolTip="Download"
                 Height="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=Grid}}"
                 Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
                 IsEnabled="{Binding IsCurrent, Converter={x:Static converters:InvertBooleanConverter.Instance}}"