diff --git a/gui/dialogs/instrument-failures.xml b/gui/dialogs/instrument-failures.xml
new file mode 100644
index 000000000..a65a5a4d5
--- /dev/null
+++ b/gui/dialogs/instrument-failures.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+ <!-- Control the weather -->
+
+ <name>instrument-failures</name>
+ <width>500</width>
+ <height>240</height>
+ <modal>false</modal>
+
+ <text>
+  <x>10</x>
+  <y>210</y>
+  <label>Instrument Failures</label>
+ </text>
+
+ <group>
+  <y>180</y>
+
+  <text>
+   <x>100</x>
+   <label>(Uncheck an instrument to fail it.)</label>
+  </text>
+
+ </group>
+
+ <group>
+  <y>150</y>
+
+  <checkbox>
+   <x>10</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Airspeed Indicator</label>
+   <property>/instrumentation/airspeed-indicator/serviceable</property>
+  </checkbox>
+
+  <checkbox>
+   <x>240</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Attitude Indicator</label>
+   <property>/instrumentation/attitude-indicator/serviceable</property>
+  </checkbox>
+
+ </group>
+
+
+ <group>
+  <y>120</y>
+
+  <checkbox>
+   <x>10</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Altimeter</label>
+   <property>/instrumentation/altimeter/serviceable</property>
+  </checkbox>
+
+  <checkbox>
+   <x>240</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Turn Indicator</label>
+   <property>/instrumentation/turn-indicator/serviceable</property>
+  </checkbox>
+
+ </group>
+
+
+ <group>
+  <y>90</y>
+
+  <checkbox>
+   <x>10</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Slip/Skid Ball</label>
+   <property>/instrumentation/slip-skid-ball/serviceable</property>
+  </checkbox>
+
+  <checkbox>
+   <x>240</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Heading Indicator</label>
+   <property>/instrumentation/heading-indicator/serviceable</property>
+  </checkbox>
+
+ </group>
+
+
+ <group>
+  <y>60</y>
+
+  <checkbox>
+   <x>10</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Vertical Speed Indicator</label>
+   <property>/instrumentation/vertical-speed-indicator/serviceable</property>
+  </checkbox>
+
+  <checkbox>
+   <x>240</x>
+   <y>0</y>
+   <width>20</width>
+   <height>20</height>
+   <label>Magnetic Compass</label>
+   <property>/instrumentation/magnetic-compass/serviceable</property>
+  </checkbox>
+
+ </group>
+
+
+ <group>
+  <y>10</y>
+
+  <button>
+   <x>50</x>
+   <y>0</y>
+   <legend>OK</legend>
+   <binding>
+    <command>dialog-apply</command>
+   </binding>
+   <binding>
+    <command>dialog-close</command>
+   </binding>
+   <default>true</default>
+  </button>
+
+  <button>
+   <x>150</x>
+   <y>0</y>
+   <legend>Apply</legend>
+   <binding>
+    <command>dialog-apply</command>
+   </binding>
+  </button>
+
+  <button>
+   <x>250</x>
+   <y>0</y>
+   <legend>Reset</legend>
+   <binding>
+    <command>dialog-update</command>
+   </binding>
+  </button>
+
+  <button>
+   <x>350</x>
+   <y>0</y>
+   <legend>Cancel</legend>
+   <binding>
+    <command>dialog-close</command>
+   </binding>
+  </button>
+
+ </group>
+
+</PropertyList>
diff --git a/gui/dialogs/system-failures.xml b/gui/dialogs/system-failures.xml
index 017ff240c..51ac3e1d7 100644
--- a/gui/dialogs/system-failures.xml
+++ b/gui/dialogs/system-failures.xml
@@ -5,111 +5,63 @@
  <!-- Control the weather -->
 
  <name>system-failures</name>
- <width>320</width>
- <height>300</height>
+ <width>300</width>
+ <height>240</height>
  <modal>false</modal>
 
  <text>
   <x>10</x>
-  <y>270</y>
+  <y>210</y>
   <label>System Failures</label>
  </text>
 
- <group>
-  <y>210</y>
-  <text>
-   <x>10</x>
-   <label>System</label>
-  </text>
-  <text>
-   <x>150</x>
-   <label>Enabled</label>
-  </text>
- </group>
-
- <group>
+ <text>
+  <x>30</x>
   <y>180</y>
+  <label>(Uncheck a system to fail it.)</label>
+ </text>
 
-  <text>
-   <x>30</x>
-   <y>0</y>
-   <label>Static System</label>
-  </text>
-
-  <checkbox>
-   <x>200</x>
-   <y>10</y>
-   <width>12</width>
-   <height>12</height>
-   <property>/systems/static/serviceable</property>
-  </checkbox>
-
- </group>
-
-
- <group>
+ <checkbox>
+  <x>30</x>
   <y>150</y>
+  <width>20</width>
+  <height>20</height>
+  <label>Static System</label>
+  <property>/systems/static/serviceable</property>
+ </checkbox>
 
-  <text>
-   <x>30</x>
-   <y>0</y>
-   <label>Pitot System</label>
-  </text>
-
-  <checkbox>
-   <x>200</x>
-   <y>10</y>
-   <width>12</width>
-   <height>12</height>
-   <property>/systems/pitot/serviceable</property>
-  </checkbox>
-
- </group>
-
-
- <group>
+ <checkbox>
+  <x>30</x>
   <y>120</y>
+  <width>20</width>
+  <height>20</height>
+  <label>Pitot System</label>
+  <property>/systems/pitot/serviceable</property>
+ </checkbox>
 
-  <text>
-   <x>30</x>
-   <y>0</y>
-   <label>Electrical System</label>
-  </text>
-
-  <checkbox>
-   <x>200</x>
-   <y>10</y>
-   <width>12</width>
-   <height>12</height>
-   <property>/systems/electrical/serviceable</property>
-  </checkbox>
-
- </group>
-
- <group>
+ <checkbox>
+  <x>30</x>
   <y>90</y>
+  <width>20</width>
+  <height>20</height>
+  <label>Electrical System</label>
+  <property>/systems/electrical/serviceable</property>
+ </checkbox>
 
-  <text>
-   <x>30</x>
-   <y>0</y>
-   <label>Vacuum System</label>
-  </text>
-
-  <checkbox>
-   <x>200</x>
-   <y>10</y>
-   <width>12</width>
-   <height>12</height>
-   <property>/systems/vacuum/serviceable</property>
-  </checkbox>
-
- </group>
+ <checkbox>
+  <x>30</x>
+  <y>60</y>
+  <width>20</width>
+  <height>20</height>
+  <label>Vacuum System</label>
+  <property>/systems/vacuum/serviceable</property>
+ </checkbox>
 
  <group>
   <y>10</y>
 
   <button>
-   <x>5</x>
+   <x>10</x>
    <y>0</y>
    <legend>OK</legend>
    <binding>
@@ -122,7 +74,7 @@
   </button>
 
   <button>
-   <x>80</x>
+   <x>60</x>
    <y>0</y>
    <legend>Apply</legend>
    <binding>
@@ -131,7 +83,7 @@
   </button>
 
   <button>
-   <x>155</x>
+   <x>140</x>
    <y>0</y>
    <legend>Reset</legend>
    <binding>
@@ -140,7 +92,7 @@
   </button>
 
   <button>
-   <x>230</x>
+   <x>220</x>
    <y>0</y>
    <legend>Cancel</legend>
    <binding>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 67d7a41a5..c8b25e67f 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -113,6 +113,14 @@
    </binding>
   </item>
 
+  <item>
+   <label>Instrument Failures</label>
+   <binding>
+    <command>dialog-show</command>
+    <dialog-name>instrument-failures</dialog-name>
+   </binding>
+  </item>
+
  </menu>
 
  <menu>