diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index eeb498902..c5ed1c4b4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -1,83 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Input &amp; Camera" left="102" mouse_opaque="true"
-     name="Input panel" width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-	     mouse_opaque="true" name=" Mouselook Options:" v_pad="0" width="266">
-		Mouselook Options:
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
-	     mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
-		Mouse Sensitivity:
-	</text>
-	<slider_bar bottom="-26" enabled="true" follows="left|top"
-	     height="16" increment="0.25" initial_val="2" left="276" max_val="15"
-	     min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
-	<check_box bottom_delta="-18" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" label="Invert Mouse" left="148"
-	     mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
-	<check_box bottom_delta="-20" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
-	     radio_style="false" width="256" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-	     mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
-		Auto Fly Options:
-	</text>
-	<check_box bottom_delta="-6" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
-	     left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
-	     width="178" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-	     mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
-		Camera Options:
-	</text>
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
-	     mouse_opaque="true" name="camera_fov_label" v_pad="0" width="128">
-    Camera View Angle:
-  </text>
-  <slider bottom_delta="-6" can_edit_text="true"
-	     decimal_digits="2" enabled="true" follows="left|top" width="128" height="16"
-	     increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
-	     mouse_opaque="true" name="camera_fov" show_text="false" value="60" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
-	     mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
-		Camera Follow Distance:
-	</text>
-	<slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale" 
-	     decimal_digits="2" enabled="true" follows="left|top" height="16"
-	     increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
-	     mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
-	     width="128" />
-	<check_box bottom_delta="-24" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"
-	     name="edit_camera_movement" radio_style="false"
-	     tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-	     width="201" />
-	<check_box bottom_delta="-18" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
-	     name="appearance_camera_movement" radio_style="false"
-	     tool_tip="Use automatic camera positioning while in edit mode" width="242" />
-	<check_box bottom_delta="-18" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Unsit Avatar on Camera Reset" left="148" mouse_opaque="true"
-	     name="unsit_on_camera_reset" radio_style="false"
-	     tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode" width="242" />
-	<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
-	     label="Joystick Setup" left_delta="0" mouse_opaque="true"
-	     name="joystick_setup_button" width="155" />
+<panel border="true" bottom="-409" height="408" label="Input &amp; Camera" left="102" name="Input panel" width="517">
+	<text bottom="-20" follows="top" height="10" left="10" name=" Mouselook Options:">Mouselook Options:</text>
+	<text bottom="-20" follows="top" height="10" left="148" name=" Mouse Sensitivity:">Mouse Sensitivity:</text>
+	<slider_bar bottom="-26" follows="top" height="16" increment="0.25" initial_val="2" left="276" max_val="15" min_val="0" name="mouse_sensitivity" width="128"/>
+	<check_box bottom_delta="-18" follows="top" height="16" label="Invert Mouse" left="148" name="invert_mouse"/>
+	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show Avatar in Mouselook" name="first_person_avatar_visible"/>
+	<text bottom_delta="-30" follows="top" height="10" left="10" name=" Auto Fly Options:">Auto Fly Options:</text>
+	<check_box bottom_delta="-6" follows="top" height="16" label="Fly/land on holding up/down" left="148" name="automatic_fly"/>
+	<text bottom_delta="-30" follows="top" height="10" left="10" name=" Camera Options:">Camera Options:</text>
+  <text bottom_delta="0" follows="top" height="10" left="148" name="camera_fov_label">Camera View Angle:</text>
+  <slider bottom_delta="-6" can_edit_text="true" decimal_digits="2" follows="top" width="128" height="16" increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17" name="camera_fov" value="60"/>
+  <text bottom_delta="-14" follows="top" height="10" left="148" name="Camera Follow Distance:" width="128">Camera Follow Distance:</text>
+	<slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale" decimal_digits="2" follows="top" height="16" increment=".025" initial_val="1" left="276" min_val=".5" max_val="3" name="camera_offset_scale" value="1" width="128"/>
+	<check_box bottom_delta="-24" follows="top" initial_value="false" label="Automatic Edit Camera Movement" left="148" name="edit_camera_movement" tool_tip="Use automatic camera positioning when entering and exiting edit mode"/>
+	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Automatic Appearance Camera Movement" left="148" name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode"/>
+	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Unsit Avatar on Camera Reset" left="148" name="unsit_on_camera_reset" tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode"/>
+	<button bottom_delta="-30" follows="top" font="SansSerif" height="20" label="Joystick Setup" name="joystick_setup_button" width="155"/>
 </panel>