diff --git a/Resources/Resources.Designer.cs b/Resources/Resources.Designer.cs
index 70676da..fe21247 100644
--- a/Resources/Resources.Designer.cs
+++ b/Resources/Resources.Designer.cs
@@ -943,7 +943,7 @@ namespace unison.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to  done!.
+        ///   Looks up a localized string similar to done!.
         /// </summary>
         public static string Stats_UpdateDBMessage2 {
             get {
diff --git a/Resources/Resources.fr-FR.resx b/Resources/Resources.fr-FR.resx
index 63abdb0..892512d 100644
--- a/Resources/Resources.fr-FR.resx
+++ b/Resources/Resources.fr-FR.resx
@@ -160,7 +160,7 @@
     <value>minutes</value>
   </data>
   <data name="Operator_Contains" xml:space="preserve">
-    <value>continent</value>
+    <value>contient</value>
   </data>
   <data name="Operator_Is" xml:space="preserve">
     <value>est</value>
diff --git a/Resources/Resources.resx b/Resources/Resources.resx
index 6bd53a6..d0b88ce 100644
--- a/Resources/Resources.resx
+++ b/Resources/Resources.resx
@@ -412,7 +412,7 @@
     <value>Updating database...</value>
   </data>
   <data name="Stats_UpdateDBMessage2" xml:space="preserve">
-    <value> done!</value>
+    <value>done!</value>
   </data>
   <data name="Stats_Uptime" xml:space="preserve">
     <value>MPD uptime:</value>
diff --git a/Views/Settings.xaml b/Views/Settings.xaml
index 556ad58..8ab2618 100644
--- a/Views/Settings.xaml
+++ b/Views/Settings.xaml
@@ -225,7 +225,7 @@
                     </DockPanel>
                 </TabItem>
 
-                <TabItem Header="{x:Static properties:Resources.Database}">
+                <TabItem Header="{x:Static properties:Resources.Database}" Height="20" VerticalAlignment="Bottom">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
@@ -250,11 +250,8 @@
 
                                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                                     <Button x:Name="UpdateDatabaseButton" Content="{x:Static properties:Resources.Settings_UpdateDatabase}" Click="MPDDatabaseUpdate_Clicked" MinWidth="120" Padding="3,1,3,1" FocusVisualStyle="{x:Null}"/>
-
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock x:Name="UpdateDBMessage" Text="{x:Static properties:Resources.Stats_UpdateDBMessage1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
-                                        <TextBlock x:Name="UpdateDBMessage2" Text="{x:Static properties:Resources.Stats_UpdateDBMessage2}" Margin="0,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
-                                    </StackPanel>
+                                    <TextBlock x:Name="UpdateDBMessage" Text="{x:Static properties:Resources.Stats_UpdateDBMessage1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
+                                     <TextBlock x:Name="UpdateDBMessage2" Text="{x:Static properties:Resources.Stats_UpdateDBMessage2}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
                                 </StackPanel>
                             </StackPanel>
                         </GroupBox>
diff --git a/Views/Shuffle.xaml b/Views/Shuffle.xaml
index 466a138..ff23f8c 100644
--- a/Views/Shuffle.xaml
+++ b/Views/Shuffle.xaml
@@ -69,6 +69,7 @@
                                 <Button Content="{x:Static properties:Resources.Shuffle_FilterQuery}" Click="UpdateFilter_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}" Margin="0,0,10,0"/>
                                 <Button Content="{x:Static properties:Resources.Shuffle_FilterReset}" Click="Reset_Clicked" Padding="5, 2" VerticalAlignment="Bottom" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
                                 <TextBlock x:Name="QueryFilterText" Text="{x:Static properties:Resources.Shuffle_Querying1}" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
+                                <TextBlock x:Name="QueryFilterText2" Text="{x:Static properties:Resources.Shuffle_Querying2}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed" />
                             </StackPanel>
                         </StackPanel>
                     </StackPanel>
@@ -76,7 +77,7 @@
 
 
                 <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
-                    <GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="248">
+                    <GroupBox DockPanel.Dock="Right" Padding="0,4,0,0" Width="270">
                         <GroupBox.Header>
                             <TextBlock>
                             <emoji:EmojiInline Text="➕"/>
@@ -93,11 +94,12 @@
                                 <TextBlock x:Name="SearchStatus" Margin="15,3,0,0" FontStyle="Italic" Visibility="Collapsed">
                                     <Run Text="{x:Static properties:Resources.Shuffle_ButtonMessage1}"/><Run Text=" "/><Run x:Name="NumberAddedSongs"/><Run Text=" "/><Run Text="{x:Static properties:Resources.Shuffle_ButtonMessage2}"/>
                                 </TextBlock>
+                                <TextBlock x:Name="SearchStatus2" Text="{x:Static properties:Resources.Shuffle_ButtonMessage3}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed"/>
                             </StackPanel>
                         </StackPanel>
                     </GroupBox>
                     
-                    <GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="248" Margin="0,0,5,0">
+                    <GroupBox DockPanel.Dock="Left" Padding="0,4,0,0" Width="230" Margin="0,0,5,0">
                         <GroupBox.Header>
                             <TextBlock>
                                 <emoji:EmojiInline Text="♾️"/>
diff --git a/Views/Shuffle.xaml.cs b/Views/Shuffle.xaml.cs
index ed634b5..86f0704 100644
--- a/Views/Shuffle.xaml.cs
+++ b/Views/Shuffle.xaml.cs
@@ -217,9 +217,13 @@ namespace unison
         {
             QueryFilterText.Visibility = Visibility.Visible;
             await UpdateFilter();
+
+            QueryFilterText2.Visibility = Visibility.Visible;
+
             TimedText(QueryFilterText, 1);
+            TimedText(QueryFilterText2, 1);
         }
-        
+
         private void TimedText(TextBlock textBlock, int time)
         {
             DispatcherTimer Timer = new DispatcherTimer();
@@ -330,18 +334,16 @@ namespace unison
             await UpdateFilter();
             QueueValidationNumber();
 
-            // TODO
-            // Added => Adding songs...
-            // to
-            // Added X songs! (display for 5 seconds)
-
             NumberAddedSongs.Text = SongNumber.Text;
             SearchStatus.Visibility = Visibility.Visible;
 
             int Num = int.Parse(SongNumber.Text);
             await AddToQueue_Internal(Num);
 
+            SearchStatus2.Visibility = Visibility.Visible;
+
             TimedText(SearchStatus, 2);
+            TimedText(SearchStatus2, 2);
         }
 
         private async Task AddToQueue_Internal(int Num)