diff --git a/indra/newview/skins/default/xui/en-us/floater_joystick.xml b/indra/newview/skins/default/xui/en-us/floater_joystick.xml
index 88e364e33..d8a068948 100644
--- a/indra/newview/skins/default/xui/en-us/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_joystick.xml
@@ -1,128 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="0" can_minimize="true" can_resize="false" height="500" left="0"
-     name="Joystick" title="Joystick Configuration" width="550">
-
-	<check_box name="enable_joystick" bottom="-38" left="14" width="60" halign="left" border_drop_shadow_visible="true" control_name="JoystickEnabled">Enable Joystick:</check_box>
-	<text name="joystick_type" bottom="-32" left="120" width="380" halign="left"></text>
-
-	<spinner bottom="-48" left="20" width="140" label_width="100" control_name="JoystickAxis1" name="JoystickAxis1" label="X Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-	<spinner bottom="-48" left="190" width="140" label_width="100" control_name="JoystickAxis2" name="JoystickAxis2" label="Y Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-	<spinner bottom="-48" left="360" width="140" label_width="100" control_name="JoystickAxis0" name="JoystickAxis0" label="Z Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-
-	<spinner bottom="-68" left="20" width="140" label_width="100" control_name="JoystickAxis4" name="JoystickAxis4" label="Pitch Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-	<spinner bottom="-68" left="190" width="140" label_width="100" control_name="JoystickAxis5" name="JoystickAxis5" label="Yaw Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-	<spinner bottom="-68" left="360" width="140" label_width="100" control_name="JoystickAxis3" name="JoystickAxis3" label="Roll Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-
-	<spinner bottom="-88" left="20" width="140" label_width="100" control_name="JoystickAxis6" name="JoystickAxis6" label="Zoom Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
-	<check_box bottom="-96" left="185" control_name="ZoomDirect" label="Direct Zoom" name="ZoomDirect" />
-	<check_box bottom="-96" left="310" control_name="Cursor3D" label="3D Cursor" name="Cursor3D" />
-	<check_box bottom="-96" left="420" control_name="AutoLeveling" label="Auto Level" name="AutoLeveling" />
-
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="10" hidden="false"
-	     left="12" mouse_opaque="false" v_pad="0" width="102" name="Control Modes:">
-		Control Modes:
-	</text>
-
-	<check_box bottom="-127" left="125" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickAvatarEnabled" name="JoystickAvatarEnabled">Avatar</check_box>
-	<check_box bottom="-127" left="194" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickBuildEnabled" name="JoystickBuildEnabled">Build</check_box>
-	<check_box bottom="-127" left="262" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickFlycamEnabled" name="JoystickFlycamEnabled">Flycam</check_box>
-
-	<text bottom="-144" left="20" width="94" halign="right" name="XScale">X Scale</text>
-	<spinner bottom="-144" left="125" width="56" label_width="0" control_name="AvatarAxisScale1" name="AvatarAxisScale1" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
-	<spinner bottom="-144" left="195" width="56" label_width="0" control_name="BuildAxisScale1" name="BuildAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-144" left="265" width="56" label_width="0" control_name="FlycamAxisScale1" name="FlycamAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-
-	<text bottom="-164" left="20" width="94" halign="right" name="YScale">Y Scale</text>
-	<spinner bottom="-164" left="125" width="56" label_width="0" control_name="AvatarAxisScale2" name="AvatarAxisScale2" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
-	<spinner bottom="-164" left="195" width="56" label_width="0" control_name="BuildAxisScale2" name="BuildAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-164" left="265" width="56" label_width="0" control_name="FlycamAxisScale2" name="FlycamAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-
-	<text bottom="-184" left="20" width="94" halign="right" name="ZScale">Z Scale</text>
-	<spinner bottom="-184" left="125" width="56" label_width="0" control_name="AvatarAxisScale0" name="AvatarAxisScale0" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
-	<spinner bottom="-184" left="195" width="56" label_width="0" control_name="BuildAxisScale0" name="BuildAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-184" left="265" width="56" label_width="0" control_name="FlycamAxisScale0" name="FlycamAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-
-	<text bottom="-204" left="20" width="94" halign="right" name="PitchScale">Pitch Scale</text>
-	<spinner bottom="-204" left="125" width="56" label_width="0" control_name="AvatarAxisScale4" name="AvatarAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-204" left="195" width="56" label_width="0" control_name="BuildAxisScale4" name="BuildAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-204" left="265" width="56" label_width="0" control_name="FlycamAxisScale4" name="FlycamAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-
-	<text bottom="-224" left="20" width="94" halign="right" name="YawScale">Yaw Scale</text>
-	<spinner bottom="-224" left="125" width="56" label_width="0" control_name="AvatarAxisScale5" name="AvatarAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-224" left="195" width="56" label_width="0" control_name="BuildAxisScale5" name="BuildAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-224" left="265" width="56" label_width="0" control_name="FlycamAxisScale5" name="FlycamAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-
-	<text bottom="-244" left="20" width="94" halign="right" name="RollScale">Roll Scale</text>
-	<spinner bottom="-244" left="195" width="56" label_width="0" control_name="BuildAxisScale3" name="BuildAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<spinner bottom="-244" left="265" width="56" label_width="0" control_name="FlycamAxisScale3" name="FlycamAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-
-
-	<text bottom="-274" left="20" width="94" halign="right" name="XDeadZone">X Dead Zone</text>
-	<spinner bottom="-274" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone1" name="AvatarAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-274" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone1" name="BuildAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-274" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-
-	<text bottom="-294" left="20" width="94" halign="right" name="YDeadZone">Y Dead Zone</text>
-	<spinner bottom="-294" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone2" name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-294" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone2" name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-294" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone2" name="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-
-	<text bottom="-314" left="20" width="94" halign="right" name="ZDeadZone">Z Dead Zone</text>
-	<spinner bottom="-314" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone0" name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-314" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone0" name="BuildAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-314" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-
-	<text bottom="-334" left="20" width="94" halign="right" name="PitchDeadZone">Pitch Dead Zone</text>
-	<spinner bottom="-334" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone4" name="AvatarAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-334" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone4" name="BuildAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-334" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-
-	<text bottom="-354" left="20" width="94" halign="right" name="YawDeadZone">Yaw Dead Zone</text>
-	<spinner bottom="-354" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone5" name="AvatarAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-354" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone5" name="BuildAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-354" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-
-	<text bottom="-374" left="20" width="94" halign="right" name="RollDeadZone">Roll Dead Zone</text>
-	<spinner bottom="-374" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone3" name="BuildAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-	<spinner bottom="-374" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-
-	<text bottom="-402" left="20" width="94" halign="right" name="Feathering">Feathering</text>
-	<slider bottom="-408" left="116" can_edit_text="false" control_name="AvatarFeathering"
-	    decimal_digits="0" follows="left|top" height="16" increment="1"
-	    initial_val="0.7" label="" max_val="32" min_val="1"
-	    mouse_opaque="true" name="AvatarFeathering" show_text="false" value="0.7"
-	    width="73" />
-	<slider bottom="-408" left="186" can_edit_text="false" control_name="BuildFeathering"
-	    decimal_digits="0" follows="left|top" height="16" increment="1"
-	    initial_val="0.7" label="" max_val="32" min_val="1"
-	    mouse_opaque="true" name="BuildFeathering" show_text="false" value="0.7"
-	    width="73" />
-	<slider bottom="-408" left="256" can_edit_text="false" control_name="FlycamFeathering"
-	    decimal_digits="0" follows="left|top" height="16" increment="1"
-	    initial_val="0.7" label="" max_val="32" min_val="1"
-	    mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
-	    width="73" />
-
-	<text bottom="-430" left="20" width="94" halign="right" name="ZoomScale2">Zoom Scale</text>
-	<spinner bottom="-430" left="265" width="56" label_width="0" control_name="FlycamAxisScale6" name="FlycamAxisScale6" label="" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-	<text bottom="-450" left="20" width="94" halign="right" name="ZoomDeadZone">Zoom Dead Zone</text>
-	<spinner bottom="-450" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" label="" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-
-	<button bottom="-451" left="340" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="22" hidden="false"
-	     label="SpaceNavigator Defaults" mouse_opaque="true"
-	     name="SpaceNavigatorDefaults" scale_image="true" width="184" />
-	
-	<button bottom="-480" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="OK" label_selected="OK" left="340"
-	     mouse_opaque="true" name="ok_btn" width="90" />
-	<button bottom="-480" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Cancel" label_selected="Cancel" left_delta="94"
-	     mouse_opaque="true" name="cancel_btn" width="90" />
-
+<floater height="500" name="Joystick" title="Joystick Configuration" width="550">
+	<check_box name="enable_joystick" bottom="-38" left="14" control_name="JoystickEnabled">Enable Joystick:</check_box>
+	<text name="joystick_type" bottom="-32" left="120" halign="left"></text>
 	<string name="JoystickMonitor">Joystick Monitor</string>
 	<string name="Axis">Axis [NUM]</string>
 	<string name="NoDevice">no device detected</string>
+	<spinner bottom="-48" left="20" width="140" label_width="100" control_name="JoystickAxis1" name="JoystickAxis1" label="X Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+	<spinner bottom="-68" width="140" label_width="100" control_name="JoystickAxis4" name="JoystickAxis4" label="Pitch Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+	<spinner bottom="-88" width="140" label_width="100" control_name="JoystickAxis6" name="JoystickAxis6" label="Zoom Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+
+	<spinner bottom="-48" left="190" width="140" label_width="100" control_name="JoystickAxis2" name="JoystickAxis2" label="Y Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+	<spinner bottom="-68" width="140" label_width="100" control_name="JoystickAxis5" name="JoystickAxis5" label="Yaw Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+
+	<spinner bottom="-48" left="360" width="140" label_width="100" control_name="JoystickAxis0" name="JoystickAxis0" label="Z Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+	<spinner bottom="-68" width="140" label_width="100" control_name="JoystickAxis3" name="JoystickAxis3" label="Roll Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+
+	<check_box bottom="-96" left="185" control_name="ZoomDirect" label="Direct Zoom" name="ZoomDirect"/>
+	<check_box bottom="-96" left="310" control_name="Cursor3D" label="3D Cursor" name="Cursor3D"/>
+	<check_box bottom="-96" left="420" control_name="AutoLeveling" label="Auto Level" name="AutoLeveling"/>
+
+	<text bottom="-120" follows="top" height="10" left="12" name="Control Modes:">Control Modes:</text>
+	<check_box bottom="-127" left="125" control_name="JoystickAvatarEnabled" name="JoystickAvatarEnabled">Avatar</check_box>
+	<check_box bottom="-127" left="194" control_name="JoystickBuildEnabled" name="JoystickBuildEnabled">Build</check_box>
+	<check_box bottom="-127" left="262" control_name="JoystickFlycamEnabled" name="JoystickFlycamEnabled">Flycam</check_box>
+
+	<text bottom="-144" left="20" width="94" halign="right" name="XScale">X Scale</text>
+	<spinner bottom="-144" left="125" width="56" control_name="AvatarAxisScale1" name="AvatarAxisScale1" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
+	<spinner bottom="-144" left="195" width="56" control_name="BuildAxisScale1" name="BuildAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-144" left="265" width="56" control_name="FlycamAxisScale1" name="FlycamAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+	<text bottom="-164" left="20" width="94" halign="right" name="YScale">Y Scale</text>
+	<spinner bottom="-164" left="125" width="56" control_name="AvatarAxisScale2" name="AvatarAxisScale2" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
+	<spinner bottom="-164" left="195" width="56" control_name="BuildAxisScale2" name="BuildAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-164" left="265" width="56" control_name="FlycamAxisScale2" name="FlycamAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+	<text bottom="-184" left="20" width="94" halign="right" name="ZScale">Z Scale</text>
+	<spinner bottom="-184" left="125" width="56" control_name="AvatarAxisScale0" name="AvatarAxisScale0" decimal_digits="2" increment="0.1" min_val="-50" max_val="50"/>
+	<spinner bottom="-184" left="195" width="56" control_name="BuildAxisScale0" name="BuildAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-184" left="265" width="56" control_name="FlycamAxisScale0" name="FlycamAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+	<text bottom="-204" left="20" width="94" halign="right" name="PitchScale">Pitch Scale</text>
+	<spinner bottom="-204" left="125" width="56" control_name="AvatarAxisScale4" name="AvatarAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-204" left="195" width="56" control_name="BuildAxisScale4" name="BuildAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-204" left="265" width="56" control_name="FlycamAxisScale4" name="FlycamAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+	<text bottom="-224" left="20" width="94" halign="right" name="YawScale">Yaw Scale</text>
+	<spinner bottom="-224" left="125" width="56" control_name="AvatarAxisScale5" name="AvatarAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-224" left="195" width="56" control_name="BuildAxisScale5" name="BuildAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-224" left="265" width="56" control_name="FlycamAxisScale5" name="FlycamAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+	<text bottom="-244" left="20" width="94" halign="right" name="RollScale">Roll Scale</text>
+	<spinner bottom="-244" left="195" width="56" control_name="BuildAxisScale3" name="BuildAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<spinner bottom="-244" left="265" width="56" control_name="FlycamAxisScale3" name="FlycamAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+	<text bottom="-274" left="20" width="94" halign="right" name="XDeadZone">X Dead Zone</text>
+	<spinner bottom="-274" left="125" width="56" control_name="AvatarAxisDeadZone1" name="AvatarAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-274" left="195" width="56" control_name="BuildAxisDeadZone1" name="BuildAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-274" left="265" width="56" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+	<text bottom="-294" left="20" width="94" halign="right" name="YDeadZone">Y Dead Zone</text>
+	<spinner bottom="-294" left="125" width="56" control_name="AvatarAxisDeadZone2" name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-294" left="195" width="56" control_name="BuildAxisDeadZone2" name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-294" left="265" width="56" control_name="FlycamAxisDeadZone2" name="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+	<text bottom="-314" left="20" width="94" halign="right" name="ZDeadZone">Z Dead Zone</text>
+	<spinner bottom="-314" left="125" width="56" control_name="AvatarAxisDeadZone0" name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-314" left="195" width="56" control_name="BuildAxisDeadZone0" name="BuildAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-314" left="265" width="56" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+	<text bottom="-334" left="20" width="94" halign="right" name="PitchDeadZone">Pitch Dead Zone</text>
+	<spinner bottom="-334" left="125" width="56" control_name="AvatarAxisDeadZone4" name="AvatarAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-334" left="195" width="56" control_name="BuildAxisDeadZone4" name="BuildAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-334" left="265" width="56" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+	<text bottom="-354" left="20" width="94" halign="right" name="YawDeadZone">Yaw Dead Zone</text>
+	<spinner bottom="-354" left="125" width="56" control_name="AvatarAxisDeadZone5" name="AvatarAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-354" left="195" width="56" control_name="BuildAxisDeadZone5" name="BuildAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-354" left="265" width="56" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+	<text bottom="-374" left="20" width="94" halign="right" name="RollDeadZone">Roll Dead Zone</text>
+	<spinner bottom="-374" left="195" width="56" control_name="BuildAxisDeadZone3" name="BuildAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+	<spinner bottom="-374" left="265" width="56" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+	<text bottom="-402" left="20" width="94" halign="right" name="Feathering">Feathering</text>
+	<spinner bottom="-402" left="125" width="56" control_name="AvatarFeathering" name="AvatarFeathering" decimal_digits="0" increment="1" initial_val="0.7" max_val="32" min_val="1"/>
+	<spinner bottom="-402" left="195" width="56" control_name="BuildFeathering" name="BuildFeathering" decimal_digits="0" increment="1" initial_val="0.7" max_val="32" min_val="1" value="0.7"/>
+	<spinner bottom="-402" left="265" width="56" control_name="FlycamFeathering" name="FlycamFeathering" decimal_digits="0" increment="1" initial_val="0.7" max_val="32" min_val="1" value="0.7"/>
+
+	<text bottom="-430" left="20" width="94" halign="right" name="ZoomScale2">Zoom Scale</text>
+	<spinner bottom="-430" left="265" width="56" label_width="0" control_name="FlycamAxisScale6" name="FlycamAxisScale6" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+	<text bottom="-450" left="20" width="94" halign="right" name="ZoomDeadZone">Zoom Dead Zone</text>
+	<spinner bottom="-450" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+	<button bottom="-451" left="340" height="22" label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults" scale_image="true" width="184"/>
+	
+	<button bottom="-480" left="340" height="20" label="OK" label_selected="OK" name="ok_btn" width="90"/>
+	<button bottom="-480" left_delta="94" height="20" label="Cancel" label_selected="Cancel" name="cancel_btn" width="90"/>
 </floater>