diff --git a/osu-framework b/osu-framework
index 5dbb4a5134..798409058a 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 5dbb4a5134dacb2e98ab8f2af219039a72bd32e6
+Subproject commit 798409058a421307b5a92aeea4cd60a065f5a0d4
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
index 990b8b3775..8545e50c69 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs
@@ -2,8 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Logging;
-using osu.Game.Overlays.Pause;
 using osu.Framework.Screens.Testing;
+using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
index 36cbebf8de..0a1fc5f331 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
@@ -52,7 +52,6 @@ namespace osu.Game.Beatmaps.Drawables
                         },
                         artist = new OsuSpriteText
                         {
-                            Margin = new MarginPadding { Top = -1 },
                             Font = @"Exo2.0-SemiBoldItalic",
                             Text = beatmap.BeatmapSetInfo.Metadata.Artist,
                             TextSize = 17,
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index 85b1a1a338..df48694249 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Graphics.UserInterface
     {
         protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize);
 
+        public override bool AllowClipboardExport => false;
+
         public class PasswordMaskChar : Container
         {
             private CircularContainer circle;
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index bd3574b625..25bc7037eb 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -57,10 +57,7 @@ namespace osu.Game.Graphics.UserInterface
                 c1.Origin = c1.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopLeft : Anchor.TopRight;
                 c2.Origin = c2.Anchor = (value & Anchor.x2) > 0 ? Anchor.TopRight : Anchor.TopLeft;
 
-                Margin = new MarginPadding
-                {
-                    Right = (value & Anchor.x2) > 0 ? -SIZE_RETRACTED.X * shear * 0.5f : 0
-                };
+                X = (value & Anchor.x2) > 0 ? SIZE_RETRACTED.X * shear * 0.5f : 0;
 
                 c1.Depth = (value & Anchor.x2) > 0 ? 0 : 1;
                 c2.Depth = (value & Anchor.x2) > 0 ? 1 : 0;
diff --git a/osu.Game/Overlays/Pause/PauseProgressBar.cs b/osu.Game/Screens/Play/Pause/PauseProgressBar.cs
similarity index 96%
rename from osu.Game/Overlays/Pause/PauseProgressBar.cs
rename to osu.Game/Screens/Play/Pause/PauseProgressBar.cs
index bd32147e35..8d124706b1 100644
--- a/osu.Game/Overlays/Pause/PauseProgressBar.cs
+++ b/osu.Game/Screens/Play/Pause/PauseProgressBar.cs
@@ -1,15 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps;
+using OpenTK.Graphics;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class PauseProgressBar : Container
     {
diff --git a/osu.Game/Overlays/Pause/PauseProgressGraph.cs b/osu.Game/Screens/Play/Pause/PauseProgressGraph.cs
similarity index 86%
rename from osu.Game/Overlays/Pause/PauseProgressGraph.cs
rename to osu.Game/Screens/Play/Pause/PauseProgressGraph.cs
index faee80a863..89b9b42b86 100644
--- a/osu.Game/Overlays/Pause/PauseProgressGraph.cs
+++ b/osu.Game/Screens/Play/Pause/PauseProgressGraph.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class PauseProgressGraph : Container
     {
diff --git a/osu.Game/Overlays/Pause/QuitButton.cs b/osu.Game/Screens/Play/Pause/QuitButton.cs
similarity index 90%
rename from osu.Game/Overlays/Pause/QuitButton.cs
rename to osu.Game/Screens/Play/Pause/QuitButton.cs
index 18b7c4eda9..7b71b4b2fc 100644
--- a/osu.Game/Overlays/Pause/QuitButton.cs
+++ b/osu.Game/Screens/Play/Pause/QuitButton.cs
@@ -1,13 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using OpenTK.Graphics;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class QuitButton : DialogButton
     {
diff --git a/osu.Game/Overlays/Pause/ResumeButton.cs b/osu.Game/Screens/Play/Pause/ResumeButton.cs
similarity index 91%
rename from osu.Game/Overlays/Pause/ResumeButton.cs
rename to osu.Game/Screens/Play/Pause/ResumeButton.cs
index a5179cb58a..d4f7555d3c 100644
--- a/osu.Game/Overlays/Pause/ResumeButton.cs
+++ b/osu.Game/Screens/Play/Pause/ResumeButton.cs
@@ -6,7 +6,7 @@ using osu.Framework.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class ResumeButton : DialogButton
     {
diff --git a/osu.Game/Overlays/Pause/RetryButton.cs b/osu.Game/Screens/Play/Pause/RetryButton.cs
similarity index 91%
rename from osu.Game/Overlays/Pause/RetryButton.cs
rename to osu.Game/Screens/Play/Pause/RetryButton.cs
index ceab835915..8f660525c3 100644
--- a/osu.Game/Overlays/Pause/RetryButton.cs
+++ b/osu.Game/Screens/Play/Pause/RetryButton.cs
@@ -6,7 +6,7 @@ using osu.Framework.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play.Pause
 {
     public class RetryButton : DialogButton
     {
diff --git a/osu.Game/Overlays/Pause/PauseOverlay.cs b/osu.Game/Screens/Play/PauseOverlay.cs
similarity index 96%
rename from osu.Game/Overlays/Pause/PauseOverlay.cs
rename to osu.Game/Screens/Play/PauseOverlay.cs
index 5c85f3db9e..8004f967ad 100644
--- a/osu.Game/Overlays/Pause/PauseOverlay.cs
+++ b/osu.Game/Screens/Play/PauseOverlay.cs
@@ -2,19 +2,20 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using OpenTK;
-using OpenTK.Input;
-using OpenTK.Graphics;
-using osu.Game.Graphics;
-using osu.Framework.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
+using osu.Framework.Input;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.Pause;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
 
-namespace osu.Game.Overlays.Pause
+namespace osu.Game.Screens.Play
 {
     public class PauseOverlay : OverlayContainer
     {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0a094d2050..4dc6db7aac 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -16,7 +16,6 @@ using osu.Framework.Screens;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Ranking;
 using osu.Game.Configuration;
-using osu.Game.Overlays.Pause;
 using osu.Framework.Configuration;
 using System;
 using System.Linq;
diff --git a/osu.Game/Screens/Select/BeatmapDeleteDialog.cs b/osu.Game/Screens/Select/BeatmapDeleteDialog.cs
index a8216d3e4e..49f864d4e0 100644
--- a/osu.Game/Screens/Select/BeatmapDeleteDialog.cs
+++ b/osu.Game/Screens/Select/BeatmapDeleteDialog.cs
@@ -8,7 +8,7 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Dialog;
 
-namespace osu.Game
+namespace osu.Game.Screens.Select
 {
     public class BeatmapDeleteDialog : PopupDialog
     {
diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs
index bb391c2eb7..5d8c11d223 100644
--- a/osu.Game/Screens/Select/CarouselContainer.cs
+++ b/osu.Game/Screens/Select/CarouselContainer.cs
@@ -192,8 +192,10 @@ namespace osu.Game.Screens.Select
             ScrollTo(selectedY, animated);
         }
 
-        public void Sort(FilterControl.SortMode mode) {
-            switch (mode) { 
+        public void Sort(FilterControl.SortMode mode)
+        {
+            switch (mode)
+            {
                 case FilterControl.SortMode.Artist:
                     groups.Sort((x, y) => string.Compare(x.BeatmapSet.Metadata.Artist, y.BeatmapSet.Metadata.Artist));
                     break;
@@ -206,15 +208,17 @@ namespace osu.Game.Screens.Select
                 case FilterControl.SortMode.Difficulty:
                     groups.Sort((x, y) =>
                     {
-                        float xAverage=0, yAverage=0;
-                        int counter=0;
-                        foreach (BeatmapInfo set in x.BeatmapSet.Beatmaps) {
+                        float xAverage = 0, yAverage = 0;
+                        int counter = 0;
+                        foreach (BeatmapInfo set in x.BeatmapSet.Beatmaps)
+                        {
                             xAverage += set.StarDifficulty;
                             counter++;
                         }
                         xAverage /= counter;
                         counter = 0;
-                        foreach (BeatmapInfo set in y.BeatmapSet.Beatmaps) {
+                        foreach (BeatmapInfo set in y.BeatmapSet.Beatmaps)
+                        {
                             yAverage += set.StarDifficulty;
                             counter++;
                         }
@@ -241,7 +245,7 @@ namespace osu.Game.Screens.Select
                     scrollableContent.Add(panel);
                 }
             }
-            SelectGroup(groups.FirstOrDefault(), groups.First().BeatmapPanels.FirstOrDefault());
+
         }
 
         private static float offsetX(float dist, float halfHeight)
@@ -344,7 +348,7 @@ namespace osu.Game.Screens.Select
 
         public void SelectNext(int direction = 1, bool skipDifficulties = true)
         {
-            if (!skipDifficulties)
+            if (!skipDifficulties && SelectedGroup != null)
             {
                 int i = SelectedGroup.BeatmapPanels.IndexOf(SelectedPanel) + direction;
 
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 8bc8d75932..017fe44685 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Select
 {
     public class PlaySongSelect : OsuScreen
     {
-        private Bindable<PlayMode> playMode;
+        private Bindable<PlayMode> playMode = new Bindable<PlayMode>();
         private BeatmapDatabase database;
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
 
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Select
 
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapDatabase beatmaps, AudioManager audio, DialogOverlay dialog, Framework.Game game,
-            OsuGame osuGame, OsuColour colours)
+            OsuGame osu, OsuColour colours)
         {
             const float carousel_width = 640;
             const float filter_height = 100;
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = filter_height,
-                    FilterChanged = filterChanged,
+                    FilterChanged = () => filterChanged(),
                     Exit = Exit,
                 },
                 beatmapInfoWedge = new BeatmapInfoWedge
@@ -159,11 +159,9 @@ namespace osu.Game.Screens.Select
             footer.AddButton(@"random", colours.Green, carousel.SelectRandom);
             footer.AddButton(@"options", colours.Blue, null);
 
-            if (osuGame != null)
-            {
-                playMode = osuGame.PlayMode;
-                playMode.ValueChanged += playMode_ValueChanged;
-            }
+            if (osu != null)
+                playMode.BindTo(osu.PlayMode);
+            playMode.ValueChanged += playMode_ValueChanged;
 
             if (database == null)
                 database = beatmaps;
@@ -184,7 +182,7 @@ namespace osu.Game.Screens.Select
 
         private ScheduledDelegate filterTask;
 
-        private void filterChanged()
+        private void filterChanged(bool debounce = true, bool eagerSelection = true)
         {
             filterTask?.Cancel();
             filterTask = Scheduler.AddDelayed(() =>
@@ -196,25 +194,42 @@ namespace osu.Game.Screens.Select
                 foreach (var beatmapGroup in carousel)
                 {
                     var set = beatmapGroup.BeatmapSet;
-                    bool match = string.IsNullOrEmpty(search)
+
+                    bool hasCurrentMode = set.Beatmaps.Any(bm => bm.Mode == playMode);
+
+                    bool match = hasCurrentMode;
+
+                    match &= string.IsNullOrEmpty(search)
                         || (set.Metadata.Artist ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
                         || (set.Metadata.ArtistUnicode ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
                         || (set.Metadata.Title ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
                         || (set.Metadata.TitleUnicode ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1;
+
                     if (match)
                     {
-                        beatmapGroup.State = BeatmapGroupState.Collapsed;
                         if (newSelection == null || beatmapGroup.BeatmapSet.OnlineBeatmapSetID == Beatmap.BeatmapSetInfo.OnlineBeatmapSetID)
+                        {
+                            if (newSelection != null)
+                                newSelection.State = BeatmapGroupState.Collapsed;
                             newSelection = beatmapGroup;
+                        }
+                        else
+                            beatmapGroup.State = BeatmapGroupState.Collapsed;
                     }
                     else
                     {
                         beatmapGroup.State = BeatmapGroupState.Hidden;
                     }
                 }
+
                 if (newSelection != null)
-                    carousel.SelectBeatmap(newSelection.BeatmapSet.Beatmaps[0], false);
-            }, 250);
+                {
+                    if (newSelection.BeatmapPanels.Any(b => b.Beatmap.ID == Beatmap.BeatmapInfo.ID))
+                        carousel.SelectBeatmap(Beatmap.BeatmapInfo, false);
+                    else if (eagerSelection)
+                        carousel.SelectBeatmap(newSelection.BeatmapSet.Beatmaps[0], false);
+                }
+            }, debounce ? 250 : 0);
         }
 
         private void onBeatmapSetAdded(BeatmapSetInfo s) => Schedule(() => addBeatmapSet(s, Game, true));
@@ -275,8 +290,6 @@ namespace osu.Game.Screens.Select
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            if (playMode != null)
-                playMode.ValueChanged -= playMode_ValueChanged;
 
             database.BeatmapSetAdded -= onBeatmapSetAdded;
             database.BeatmapSetRemoved -= onBeatmapSetRemoved;
@@ -286,6 +299,7 @@ namespace osu.Game.Screens.Select
 
         private void playMode_ValueChanged(object sender, EventArgs e)
         {
+            filterChanged(false);
         }
 
         private void changeBackground(WorkingBeatmap beatmap)
@@ -371,6 +385,8 @@ namespace osu.Game.Screens.Select
 
                 carousel.AddGroup(group);
 
+                filterChanged(false, false);
+
                 if (Beatmap == null || select)
                     carousel.SelectBeatmap(beatmapSet.Beatmaps.First());
                 else
@@ -404,7 +420,6 @@ namespace osu.Game.Screens.Select
                 if (token.IsCancellationRequested) return;
                 addBeatmapSet(beatmapSet, game);
             }
-            filterChanged();
         }
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0adad1499a..6cf21e9443 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -273,12 +273,12 @@
     <Compile Include="Screens\Select\SearchTextBox.cs" />
     <Compile Include="Screens\Select\FooterButton.cs" />
     <Compile Include="Screens\Select\Footer.cs" />
-    <Compile Include="Overlays\Pause\PauseOverlay.cs" />
-    <Compile Include="Overlays\Pause\PauseProgressBar.cs" />
-    <Compile Include="Overlays\Pause\PauseProgressGraph.cs" />
-    <Compile Include="Overlays\Pause\ResumeButton.cs" />
-    <Compile Include="Overlays\Pause\RetryButton.cs" />
-    <Compile Include="Overlays\Pause\QuitButton.cs" />
+    <Compile Include="Screens\Play\PauseOverlay.cs" />
+    <Compile Include="Screens\Play\Pause\PauseProgressBar.cs" />
+    <Compile Include="Screens\Play\Pause\PauseProgressGraph.cs" />
+    <Compile Include="Screens\Play\Pause\ResumeButton.cs" />
+    <Compile Include="Screens\Play\Pause\RetryButton.cs" />
+    <Compile Include="Screens\Play\Pause\QuitButton.cs" />
     <Compile Include="Overlays\Mods\ModSelectOverlay.cs" />
     <Compile Include="Modes\Mod.cs" />
     <Compile Include="Overlays\Mods\ModButton.cs" />
@@ -316,9 +316,6 @@
   <ItemGroup />
   <ItemGroup />
   <ItemGroup />
-  <ItemGroup>
-    <Folder Include="Overlays\Dialog\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.