diff --git a/osu.Game.Tests/Visual/TestCasePlaybackControl.cs b/osu.Game.Tests/Visual/TestCasePlaybackControl.cs
new file mode 100644
index 0000000000..ff59bb7bfd
--- /dev/null
+++ b/osu.Game.Tests/Visual/TestCasePlaybackControl.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Edit.Components;
+using osu.Game.Tests.Beatmaps;
+using OpenTK;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCasePlaybackControl : OsuTestCase
+    {
+        public TestCasePlaybackControl()
+        {
+            var playback = new PlaybackControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(200,100)
+            };
+            playback.Beatmap.Value = new TestWorkingBeatmap(new Beatmap());
+
+            Add(playback);
+        }
+    }
+}
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 974bde9319..9bba09b1a7 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -124,6 +124,7 @@
     <Compile Include="Visual\TestCaseOnScreenDisplay.cs" />
     <Compile Include="Visual\TestCaseAllPlayers.cs" />
     <Compile Include="Visual\TestCaseOsuGame.cs" />
+    <Compile Include="Visual\TestCasePlaybackControl.cs" />
     <Compile Include="Visual\TestCasePlaySongSelect.cs" />
     <Compile Include="Visual\TestCaseReplay.cs" />
     <Compile Include="Visual\TestCaseReplaySettingsOverlay.cs" />
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 1d4ed75688..2a8178882e 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace osu.Game.Beatmaps
 {
@@ -29,10 +30,10 @@ namespace osu.Game.Beatmaps
 
             Mods.ValueChanged += mods => applyRateAdjustments();
 
-            beatmap = new Lazy<Beatmap>(populateBeatmap);
-            background = new Lazy<Texture>(populateBackground);
-            track = new Lazy<Track>(populateTrack);
-            waveform = new Lazy<Waveform>(populateWaveform);
+            beatmap = new AsyncLazy<Beatmap>(populateBeatmap);
+            background = new AsyncLazy<Texture>(populateBackground);
+            track = new AsyncLazy<Track>(populateTrack);
+            waveform = new AsyncLazy<Waveform>(populateWaveform);
         }
 
         protected abstract Beatmap GetBeatmap();
@@ -41,8 +42,10 @@ namespace osu.Game.Beatmaps
         protected virtual Waveform GetWaveform() => new Waveform();
 
         public bool BeatmapLoaded => beatmap.IsValueCreated;
-        public Beatmap Beatmap => beatmap.Value;
-        private readonly Lazy<Beatmap> beatmap;
+        public Beatmap Beatmap => beatmap.Value.Result;
+        public async Task<Beatmap> GetBeatmapAsync() => await beatmap.Value;
+
+        private readonly AsyncLazy<Beatmap> beatmap;
 
         private Beatmap populateBeatmap()
         {
@@ -55,14 +58,16 @@ namespace osu.Game.Beatmaps
         }
 
         public bool BackgroundLoaded => background.IsValueCreated;
-        public Texture Background => background.Value;
-        private Lazy<Texture> background;
+        public Texture Background => background.Value.Result;
+        public async Task<Texture> GetBackgroundAsync() => await background.Value;
+        private AsyncLazy<Texture> background;
 
         private Texture populateBackground() => GetBackground();
 
         public bool TrackLoaded => track.IsValueCreated;
-        public Track Track => track.Value;
-        private Lazy<Track> track;
+        public Track Track => track.Value.Result;
+        public async Task<Track> GetTrackAsync() => await track.Value;
+        private AsyncLazy<Track> track;
 
         private Track populateTrack()
         {
@@ -73,8 +78,9 @@ namespace osu.Game.Beatmaps
         }
 
         public bool WaveformLoaded => waveform.IsValueCreated;
-        public Waveform Waveform => waveform.Value;
-        private readonly Lazy<Waveform> waveform;
+        public Waveform Waveform => waveform.Value.Result;
+        public async Task<Waveform> GetWaveformAsync() => await waveform.Value;
+        private readonly AsyncLazy<Waveform> waveform;
 
         private Waveform populateWaveform() => GetWaveform();
 
@@ -107,5 +113,13 @@ namespace osu.Game.Beatmaps
             foreach (var mod in Mods.Value.OfType<IApplicableToClock>())
                 mod.ApplyToClock(t);
         }
+
+        public class AsyncLazy<T> : Lazy<Task<T>>
+        {
+            public AsyncLazy(Func<T> valueFactory)
+                : base(() => Task.Run(valueFactory))
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 7b26e50dd8..e129a81116 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -224,8 +224,8 @@ namespace osu.Game.Rulesets.Scoring
             OnNewJudgement(judgement);
             updateScore();
 
-            NotifyNewJudgement(judgement);
             UpdateFailed();
+            NotifyNewJudgement(judgement);
         }
 
         protected void RemoveJudgement(Judgement judgement)
diff --git a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
index d65355b5f4..0e57407928 100644
--- a/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
+++ b/osu.Game/Screens/Edit/Components/BottomBarContainer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Edit.Components
         private const float corner_radius = 5;
         private const float contents_padding = 15;
 
-        public Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
         protected Track Track => Beatmap.Value.Track;
 
         private readonly Drawable background;
diff --git a/osu.Game/Screens/Edit/Components/PlaybackContainer.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
similarity index 70%
rename from osu.Game/Screens/Edit/Components/PlaybackContainer.cs
rename to osu.Game/Screens/Edit/Components/PlaybackControl.cs
index a7d1db4802..5ffa66c43e 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackContainer.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -2,7 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -13,11 +15,11 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Edit.Components
 {
-    public class PlaybackContainer : BottomBarContainer
+    public class PlaybackControl : BottomBarContainer
     {
         private readonly IconButton playButton;
 
-        public PlaybackContainer()
+        public PlaybackControl()
         {
             PlaybackTabControl tabs;
 
@@ -30,7 +32,7 @@ namespace osu.Game.Screens.Edit.Components
                     Scale = new Vector2(1.4f),
                     IconScale = new Vector2(1.4f),
                     Icon = FontAwesome.fa_play_circle_o,
-                    Action = playPause,
+                    Action = togglePause,
                     Padding = new MarginPadding { Left = 20 }
                 },
                 new OsuSpriteText
@@ -52,14 +54,10 @@ namespace osu.Game.Screens.Edit.Components
                 }
             };
 
-            tabs.AddItem(0.25);
-            tabs.AddItem(0.75);
-            tabs.AddItem(1);
-
             tabs.Current.ValueChanged += newValue => Track.Tempo.Value = newValue;
         }
 
-        private void playPause()
+        private void togglePause()
         {
             if (Track.IsRunning)
                 Track.Stop();
@@ -76,6 +74,8 @@ namespace osu.Game.Screens.Edit.Components
 
         private class PlaybackTabControl : OsuTabControl<double>
         {
+            private static readonly double[] tempo_values = { 0.5, 0.75, 1 };
+
             protected override TabItem<double> CreateTabItem(double value) => new PlaybackTabItem(value);
 
             protected override Dropdown<double> CreateDropdown() => null;
@@ -83,20 +83,23 @@ namespace osu.Game.Screens.Edit.Components
             public PlaybackTabControl()
             {
                 RelativeSizeAxes = Axes.Both;
-                TabContainer.Spacing = new Vector2(20, 0);
+                TabContainer.Spacing = Vector2.Zero;
+
+                tempo_values.ForEach(AddItem);
             }
 
             public class PlaybackTabItem : TabItem<double>
             {
-                private const float fade_duration = 100;
+                private const float fade_duration = 200;
 
                 private readonly OsuSpriteText text;
                 private readonly OsuSpriteText textBold;
 
                 public PlaybackTabItem(double value) : base(value)
                 {
-                    AutoSizeAxes = Axes.X;
-                    RelativeSizeAxes = Axes.Y;
+                    RelativeSizeAxes = Axes.Both;
+
+                    Width = 1f / tempo_values.Length;
 
                     Children = new Drawable[]
                     {
@@ -104,56 +107,47 @@ namespace osu.Game.Screens.Edit.Components
                         {
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
-                            Text = $"{value:P0}",
+                            Text = $"{value:0%}",
                             TextSize = 14,
                         },
                         textBold = new OsuSpriteText
                         {
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
-                            Text = $"{value:P0}",
+                            Text = $"{value:0%}",
                             TextSize = 14,
                             Font = @"Exo2.0-Bold",
                             Alpha = 0,
-                            AlwaysPresent = true,
                         },
                     };
                 }
 
+                private Color4 hoveredColour;
+                private Color4 normalColour;
+
                 [BackgroundDependencyLoader]
                 private void load(OsuColour colours)
                 {
-                    text.Colour = colours.Gray5;
+                    text.Colour = normalColour = colours.YellowDarker;
+                    textBold.Colour = hoveredColour = colours.Yellow;
                 }
 
                 protected override bool OnHover(InputState state)
                 {
-                    if (!Active)
-                        toBold();
+                    updateState();
                     return true;
                 }
 
-                protected override void OnHoverLost(InputState state)
+                protected override void OnHoverLost(InputState state) => updateState();
+                protected override void OnActivated() => updateState();
+                protected override void OnDeactivated() => updateState();
+
+                private void updateState()
                 {
-                    if (!Active)
-                        toNormal();
+                    text.FadeColour(Active || IsHovered ? hoveredColour : normalColour, fade_duration, Easing.OutQuint);
+                    text.FadeTo(Active ? 0 : 1, fade_duration, Easing.OutQuint);
+                    textBold.FadeTo(Active ? 1 : 0, fade_duration, Easing.OutQuint);
                 }
-
-                private void toBold()
-                {
-                    text.FadeOut(fade_duration);
-                    textBold.FadeIn(fade_duration);
-                }
-
-                private void toNormal()
-                {
-                    text.FadeIn(fade_duration);
-                    textBold.FadeOut(fade_duration);
-                }
-
-                protected override void OnActivated() => toBold();
-
-                protected override void OnDeactivated() => toNormal();
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index e2971deb75..607ff792d8 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit
             EditorMenuBar menuBar;
             TimeInfoContainer timeInfo;
             SummaryTimeline timeline;
-            PlaybackContainer playback;
+            PlaybackControl playback;
 
             Children = new[]
             {
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Edit
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             Padding = new MarginPadding { Left = 10 },
-                                            Child = playback = new PlaybackContainer { RelativeSizeAxes = Axes.Both },
+                                            Child = playback = new PlaybackControl { RelativeSizeAxes = Axes.Both },
                                         }
                                     },
                                 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 048735358e..0752b31495 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -299,7 +299,7 @@
     <Compile Include="Overlays\Profile\Sections\Ranks\ScoreModsContainer.cs" />
     <Compile Include="Overlays\Settings\SettingsButton.cs" />
     <Compile Include="Screens\Edit\Components\BottomBarContainer.cs" />
-    <Compile Include="Screens\Edit\Components\PlaybackContainer.cs" />
+    <Compile Include="Screens\Edit\Components\PlaybackControl.cs" />
     <Compile Include="Screens\Edit\Components\TimeInfoContainer.cs" />
     <Compile Include="Rulesets\Mods\IApplicableToScoreProcessor.cs" />
     <Compile Include="Screens\Edit\Screens\Compose\Timeline\BeatmapWaveformGraph.cs" />