diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/default.lua
index 41af83aecc..0cf78922aa 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay decorations/default.lua	
@@ -26,13 +26,13 @@ end
 
 function Arrow(xpos,ypos,delay,length)
 	return LoadActor("arrow") .. {
-		OnCommand=cmd(x,xpos;y,ypos;diffusealpha,0;sleep,delay;addx,50;linear,0.5;diffusealpha,1;addx,-50;sleep,length;linear,0.5;diffusealpha,0;draworder,1;);
+		OnCommand=cmd(x,xpos;y,ypos;diffusealpha,0;sleep,delay;addx,50;linear,0.5;diffusealpha,1;addx,-50;sleep,length;linear,0.5;diffusealpha,0;draworder,10;);
 	};
 end
 
 return Def.ActorFrame {
 	LoadActor("how to play") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1.8;sleep,1.7;linear,0.3;zoom,1;addx,160;addy,-150;draworder,1;);
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1.8;sleep,1.7;linear,0.3;zoom,1;addx,160;addy,-150;draworder,10;);
 	};
 
 	ExplanationText( "When the arrows rise to this point, step on the matching panels.", 5, 9 );
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 60d118004e..2cafd5929b 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2608,6 +2608,7 @@ DancePointsDigits=1
 PercentUseRemainder=true
 ApplyScoreDisplayOptions=false
 FormatPercentScore=FormatPercentScore
+Format=
 
 [ScoreDisplayPercentage Percent]
 PercentP1X=+20
@@ -2997,11 +2998,11 @@ ColumnDifficulty2="Difficulty_Easy"
 ColumnDifficulty3="Difficulty_Medium"
 ColumnDifficulty4="Difficulty_Hard"
 ColumnDifficulty5="Difficulty_Challenge"
-ColumnStepsType1=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType2=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType3=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType4=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType5=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType1=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType2=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType3=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType4=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType5=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
 ScrollerItemsToDraw=7
 ScrollerSecondsPerItem=0.4
 ManualScrolling=false
@@ -3150,17 +3151,17 @@ LifeMeterBarX=SCREEN_CENTER_X-160
 LifeMeterBarY=SCREEN_TOP+56
 LifeMeterBarOnCommand=addy,-90;sleep,1.4;linear,0.4;addy,90
 UseCharacter=true
-CharacterX=SCREEN_CENTER_X-200
+CharacterX=SCREEN_CENTER_X-160
 CharacterY=SCREEN_CENTER_Y+160
-CharacterOnCommand=zoom,20;addy,-SCREEN_WIDTH;sleep,6.0;decelerate,0.4;addy,SCREEN_WIDTH
+CharacterOnCommand=zoom,15;draworder,1
 UsePad=true
-PadX=SCREEN_CENTER_X-280
-PadY=SCREEN_CENTER_Y+70
-PadOnCommand=zoom,15;rotationy,180;sleep,4.7;linear,1.0;rotationy,360;zoom,20;addx,190;addy,80
+PadX=SCREEN_CENTER_X-160
+PadY=SCREEN_CENTER_Y+60
+PadOnCommand=draworder,1;
 UsePlayer=true
 PlayerX=SCREEN_CENTER_X-160
 PlayerY=SCREEN_CENTER_Y+20
-PlayerOnCommand=
+PlayerOnCommand=draworder,10
 NumW2s=4
 NumMisses=6