diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 82dba9e66d..d6adb4e0ef 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3280,6 +3280,7 @@ TitleY=-2
 TitleOnCommand=shadowlength,0;uppercase,true;maxwidth,300
 FrameGainFocusCommand=diffuse,1,1,1,1;glowshift;effectcolor2,color("#fffdd4");
 FrameLoseFocusCommand=diffuse,1,1,1,1;stopeffect
+ShowUnderlines=false
 
 [OptionRowSimpleExit]
 Fallback="OptionRowSimple"
@@ -4040,6 +4041,11 @@ LockExtraStageSelection=true
 Fallback="ScreenOptionsSimple"
 TimerSeconds=-1
 AllowRepeatingChangeValueInput=true
+OptionRowNormalMetricsGroup="OptionRowManage"
+
+[OptionRowManage]
+Fallback="OptionRowSimple"
+TitleX=SCREEN_CENTER_X-150
 
 [ScreenOptionsManageEditSteps]
 Class="ScreenOptionsManageEditSteps"
@@ -4057,7 +4063,6 @@ Class="ScreenOptionsManageCourses"
 Fallback="ScreenOptionsManage"
 PrevScreen=ScreenTitleBranch()
 NextScreen="ScreenOptionsEditCourse"
-TitleX=SCREEN_LEFT+32
 GroupedScreens="ScreenOptionsManageCourses,ScreenTextEntry,ScreenPrompt,ScreenOptionsEditCourseMods"
 PersistScreens="ScreenOptionsManageCourses,ScreenTextEntry,ScreenPrompt"
 PrepareScreens="ScreenTextEntry,ScreenPrompt"
@@ -4069,6 +4074,13 @@ Class="ScreenOptionsEditCourse"
 Fallback="ScreenOptionsSimple"
 PrevScreen="ScreenOptionsCourseOverview"
 NextScreen="ScreenOptionsCourseOverview"
+OptionRowNormalMetricsGroup="OptionRowEditCourse"
+LineHighlightOnCommand=x,-100
+
+[OptionRowEditCourse]
+Fallback="OptionRowSimple"
+TitleX=SCREEN_CENTER_X-250
+ItemsLongRowSharedX=SCREEN_CENTER_X-100
 
 [ScreenOptionsCourseOverview]
 Class="ScreenOptionsCourseOverview"
@@ -4077,6 +4089,12 @@ PrevScreen="ScreenOptionsManageCourses"
 NextScreen="ScreenOptionsManageCourses"
 PlayScreen="ScreenJoinMultiplayer"
 EditScreen="ScreenOptionsEditCourse"
+OptionRowNormalMetricsGroup="OptionRowCourseOverview"
+
+[OptionRowCourseOverview]
+Fallback="OptionRowSimple"
+TitleX=SCREEN_CENTER_X-250
+ItemsLongRowSharedX=SCREEN_CENTER_X-100
 
 [ScreenEditCourseMods]
 Class="ScreenEdit"