diff --git a/resource/layout/gameproperties_general.layout b/resource/layout/gameproperties_general.layout
index 93cde30..d1ec5ff 100644
--- a/resource/layout/gameproperties_general.layout
+++ b/resource/layout/gameproperties_general.layout
@@ -57,6 +57,9 @@
 		
 		"SteamInputPerGameLabel" { controlname=label labeltext="#Steam_GameProperties_SteamInputSettings_PerGameOptIn" style="Highlight" }
 		"SteamInputPerGameCombo" { controlname=combobox }
+		
+		"BPMOverlayPerGameLabel" { controlname=label labeltext="#Steam_GameProperties_BPMOverlay_PerGameOptIn" style="Highlight" }
+		"BPMOverlayPerGameCombo" { controlname=combobox }
 
 		"LaunchOptionsButton"
 		{
@@ -128,6 +131,7 @@
 		place {controls=LaunchOptionsButton,CreateDesktopShortcutButton start=EnableDesktopGameTheater dir=down margin-top=15 spacing=10 width=240 height=24 region=main }
 		place {control=Divider2 start=CreateDesktopShortcutButton dir=down margin-top=20 region=main width=max }
 		place {controls=SteamInputPerGameLabel,SteamInputPerGameCombo start=Divider2 dir=down margin-top=20 spacing=10 width=max region=main }
+		place {controls=BPMOverlayPerGameLabel,BPMOverlayPerGameCombo start=SteamInputPerGameCombo dir=down margin-top=20 spacing=10 width=max region=main }
 		place {controls=FamilySharingUnsupportedLabel margin-top=472 margin-left=20 }
 
 	}
diff --git a/resource/layout/settingssubstreaming.layout b/resource/layout/settingssubstreaming.layout
index c1c511e..bb21296 100644
--- a/resource/layout/settingssubstreaming.layout
+++ b/resource/layout/settingssubstreaming.layout
@@ -18,6 +18,8 @@
 		"EnableStreaming" { ControlName="CheckButton" fieldName="EnableStreaming" labelText="#Steam_Settings_Streaming_EnableStreaming" }
 
 		"Pair" { ControlName="Button" fieldName="Pair" command="Pair" labelText="#Steam_Settings_Streaming_Pair" }
+		
+		"Unpair" { ControlName="Button" fieldName="Unpair" command="Unpair" labelText="#Steam_Settings_Streaming_Unpair" }
 
 		"SetPIN" { ControlName="Button" fieldName="SetPIN" command="SetPIN" labelText="#Steam_Settings_Streaming_SetPIN" }
 
@@ -88,7 +90,7 @@
 			spacing=10
 		}
 		
-		place { control="Pair,SetPIN" start=EnableStreaming spacing=10 dir=right align=right margin-right=20 }
+		place { control="Pair,Unpair,SetPIN" start=EnableStreaming spacing=10 dir=right align=right margin-right=20 }
 		
 		place { region=bottom control=HostDivider width=max}
 		place { region=bottom control=HostLabel width=max start=HostDivider dir=down margin-top=15 }