diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index ed69511b12..867f07e5fe 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1004,11 +1004,11 @@ SpeedIsLeftSide=false
 BPMOffsetX=60
 StopOffsetX=50
 DelayOffsetX=120
-WarpOffsetX=60
+WarpOffsetX=70
 TimeSignatureOffsetX=30
-TickcountOffsetX=105
-ComboOffsetX=95
-LabelOffsetX=120
+TickcountOffsetX=50
+ComboOffsetX=30
+LabelOffsetX=130
 SpeedOffsetX=30
 
 [PlayerStageStats]
diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index c3aa03708c..f94cb62e9e 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -614,7 +614,7 @@ void NoteField::DrawSpeedText( const float fBeat, float fPercent, float fWait )
 	m_textMeasureNumber.SetHorizAlign( SPEED_IS_LEFT_SIDE ? align_right : align_left );
 	m_textMeasureNumber.SetDiffuse( SPEED_COLOR );
 	m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
-	m_textMeasureNumber.SetText( ssprintf("%.6f\n--\n%.6f", fPercent, fWait) );
+	m_textMeasureNumber.SetText( ssprintf("%.3f\n--\n%.3f", fPercent, fWait) );
 	m_textMeasureNumber.SetXY( (SPEED_IS_LEFT_SIDE ? -xBase - xOffset : xBase + xOffset), fYPos );
 	m_textMeasureNumber.Draw();
 }