diff --git a/rog-aura/data/layouts/gl504_US.toml b/rog-aura/data/layouts/gl504_US.toml
index ee72fbf8..0258c086 100644
--- a/rog-aura/data/layouts/gl504_US.toml
+++ b/rog-aura/data/layouts/gl504_US.toml
@@ -34,6 +34,7 @@ row = [
     'F10',
     'F11',
     'F12',
+    'RowEndSpacer',
     'Del',
     'NumPadPause',
     'NumPadPrtSc',
@@ -57,6 +58,7 @@ row = [
     'Hyphen',
     'Equals',
     'BkSpc',
+    'RowEndSpacer',
     'NumLock',
     'FwdSlash',
     'Star',
@@ -80,6 +82,7 @@ row = [
     'LBracket',
     'RBracket',
     'BackSlash',
+    'RowEndSpacer',
     'N7',
     'N8',
     'N9',
@@ -102,6 +105,7 @@ row = [
     'SemiColon',
     'Quote',
     'Return',
+    'RowEndSpacer',
     'N4',
     'N5',
     'N6',
@@ -123,6 +127,7 @@ row = [
     'Period',
     'FwdSlash',
     'Rshift',
+    'RowEndSpacer',
     'N1',
     'N2',
     'N3',
@@ -141,6 +146,7 @@ row = [
     'RFn',
     'RFn',
     'RCtrlLarge',
+    'RowEndSpacer',
     'UpRegular',
     'N0',
     'NumPadDel',
@@ -166,6 +172,7 @@ row = [
     'NormalSpacer',
     'NormalSpacer',
     'LeftRegular',
+    'RowEndSpacer',
     'DownRegular',
     'RightRegular',
     'NormalSpacer',
diff --git a/rog-control-center/src/main.rs b/rog-control-center/src/main.rs
index 6938493e..691e4e46 100644
--- a/rog-control-center/src/main.rs
+++ b/rog-control-center/src/main.rs
@@ -47,7 +47,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut path = PathBuf::from(DATA_DIR);
     #[cfg(feature = "mocking")]
     {
-        board_name = "gx502".to_string();
+        board_name = "gl504".to_string();
         path.pop();
         path.push("rog-aura");
         path.push("data");