diff --git a/xml/NavigationOverlay.xml b/xml/NavigationOverlay.xml
index ebfa58ad..87a3140b 100644
--- a/xml/NavigationOverlay.xml
+++ b/xml/NavigationOverlay.xml
@@ -11,13 +11,13 @@
     outline="grey" />
 
   <!-- options -->
-  <Row class="option-text"
+  <Row class="nav_option-text"
     preferredHeight="45"/>
-  <Cell class="option-text"
+  <Cell class="nav_option-text"
     color="#333333"/>
-  <Cell class="option-button"
+  <Cell class="nav_option-button"
     color="#333333"/>
-  <Text class="option-header"
+  <Text class="nav_option-header"
     fontSize="20"
     font="font_teutonic-arkham"/>
   <Cell class="claim"
@@ -92,11 +92,11 @@
         cellPadding="10 0 5 5">
 
         <!-- Option: Custom pitch -->
-        <Row class="option-text">
-          <Cell class="option-text">
-            <Text class="option-header">Viewing angle in degrees:</Text>
+        <Row class="nav_option-text">
+          <Cell class="nav_option-text">
+            <Text class="nav_option-header">Viewing angle in degrees:</Text>
           </Cell>
-          <Cell class="option-button">
+          <Cell class="nav_option-button">
             <Slider id="sliderPitch"
               onValueChanged="797ede/updatePitch"
               wholeNumbers="true"
@@ -109,44 +109,44 @@
         </Row>
 
         <!-- Option: Claim White -->
-        <Row class="option-text">
-          <Cell class="option-text">
-            <Text class="option-header">Claim "White" seat</Text>
+        <Row class="nav_option-text">
+          <Cell class="nav_option-text">
+            <Text class="nav_option-header">Claim "White" seat</Text>
           </Cell>
-          <Cell class="option-button claim">
+          <Cell class="nav_option-button claim">
             <Toggle id="claimWhite"
               onValueChanged="797ede/claimColor(White)"/>
           </Cell>
         </Row>
 
         <!-- Option: Claim Orange -->
-        <Row class="option-text">
-          <Cell class="option-text">
-            <Text class="option-header">Claim "Orange" seat</Text>
+        <Row class="nav_option-text">
+          <Cell class="nav_option-text">
+            <Text class="nav_option-header">Claim "Orange" seat</Text>
           </Cell>
-          <Cell class="option-button claim">
+          <Cell class="nav_option-button claim">
             <Toggle id="claimOrange"
               onValueChanged="797ede/claimColor(Orange)"/>
           </Cell>
         </Row>
 
         <!-- Option: Claim Green -->
-        <Row class="option-text">
-          <Cell class="option-text">
-            <Text class="option-header">Claim "Green" seat</Text>
+        <Row class="nav_option-text">
+          <Cell class="nav_option-text">
+            <Text class="nav_option-header">Claim "Green" seat</Text>
           </Cell>
-          <Cell class="option-button claim">
+          <Cell class="nav_option-button claim">
             <Toggle id="claimGreen"
               onValueChanged="797ede/claimColor(Green)"/>
           </Cell>
         </Row>
 
         <!-- Option: Claim Red -->
-        <Row class="option-text">
-          <Cell class="option-text">
-            <Text class="option-header">Claim "Red" seat</Text>
+        <Row class="nav_option-text">
+          <Cell class="nav_option-text">
+            <Text class="nav_option-header">Claim "Red" seat</Text>
           </Cell>
-          <Cell class="option-button claim">
+          <Cell class="nav_option-button claim">
             <Toggle id="claimRed"
               onValueChanged="797ede/claimColor(Red)"/>
           </Cell>