diff --git a/android/res/layout-land/main.xml b/android/res/layout-land/main.xml
index f7521f9e2..91e7eff3d 100644
--- a/android/res/layout-land/main.xml
+++ b/android/res/layout-land/main.xml
@@ -36,13 +36,13 @@
                 android:id="@+id/main_open"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="View ork file" />
+                android:text="@string/openfilelabel" />
 
             <Button
                 android:id="@+id/main_browse"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="View motors" />
+                android:text="@string/viewmotorslabel" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
index 701f5cf48..85550209c 100644
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -25,18 +25,19 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_horizontal" >
-
+


         <Button
             android:id="@+id/main_open"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="View ork file" />
-
+            android:text="@string/openfilelabel" />
+

         <Button
             android:id="@+id/main_browse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="View motors" />
+            android:text="@string/viewmotorslabel" />
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/motor_detail_form.xml b/android/res/layout/motor_detail_form.xml
index 551dab580..ee035fa3e 100644
--- a/android/res/layout/motor_detail_form.xml
+++ b/android/res/layout/motor_detail_form.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" >
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
     <TableLayout
         android:id="@+id/motorDetailForm"
@@ -13,7 +15,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Manufacturer" />
+                android:text="@string/motor_manufacturer" />
 
             <EditText
                 android:id="@+id/motorDetailsManufacturer"
@@ -28,7 +30,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Name" />
+                android:text="@string/motor_commonname" />
 
             <EditText
                 android:id="@+id/motorDetailsName"
@@ -43,7 +45,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Delays" />
+                android:text="@string/motor_delays" />
 
             <EditText
                 android:id="@+id/motorDetailsDelays"
@@ -58,7 +60,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Case Info" />
+                android:text="@string/motor_caseinfo" />
 
             <EditText
                 android:id="@+id/motorDetailsCaseInfo"
@@ -73,7 +75,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Impulse Class" />
+                android:text="@string/motor_impulseclass" />
 
             <EditText
                 android:id="@+id/motorDetailsImpuseClass"
@@ -88,7 +90,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Diameter" />
+                android:text="@string/motor_diameter" />
 
             <EditText
                 android:id="@+id/motorDetailsDiameter"
@@ -103,7 +105,7 @@
 
             <TextView
                 android:paddingRight="10dp"
-                android:text="Length" />
+                android:text="@string/motor_length" />
 
             <EditText
                 android:id="@+id/motorDetailsLength"
diff --git a/android/res/layout/rocket_overview.xml b/android/res/layout/rocket_overview.xml
index a9cb3ffa3..4ebc0b08d 100644
--- a/android/res/layout/rocket_overview.xml
+++ b/android/res/layout/rocket_overview.xml
@@ -8,12 +8,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Designer" />
+            android:text="@string/rocket_designer" />
 
         <TextView
             style="@style/valueTextStyle"
@@ -21,12 +21,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="" />
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Length" />
+            android:text="@string/rocket_length" />
 
         <TextView
             style="@style/valueTextStyle"
@@ -34,12 +34,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="" />
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Empty Mass" />
+            android:text="@string/rocket_emptymass" />
 
         <TextView
             style="@style/valueTextStyle"
@@ -47,12 +47,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="" />
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Stage Count" />
+            android:text="@string/rocket_stagecount" />
 
         <TextView
             style="@style/valueTextStyle"
@@ -66,12 +66,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:prompt="@string/overviewConfigurationSpinnerPrompt" />
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Lift off weight" />
+            android:text="@string/rocket_liftoffweight" />
 
         <TextView
             style="@style/valueTextStyle"
@@ -79,12 +79,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="" />
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="CG" />
+            android:text="@string/rocket_cg" />
 
         <TextView
             style="@style/valueTextStyle"
@@ -92,12 +92,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="" />
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="CP" />
+            android:text="@string/rocket_cp" />
 
         <TextView
             style="@style/valueTextStyle"
@@ -105,12 +105,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="" />
-
+

         <TextView
             style="@style/labelTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Stability margin" />
+            android:text="@string/rocket_stabilitymargin" />
 
         <TextView
             style="@style/valueTextStyle"
diff --git a/android/res/layout/simulation_graph_activity.xml b/android/res/layout/simulation_graph_activity.xml
index c742b660a..0b1fbc61b 100644
--- a/android/res/layout/simulation_graph_activity.xml
+++ b/android/res/layout/simulation_graph_activity.xml
@@ -3,11 +3,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
     <LinearLayout
-    android:layout_width="match_parent"
-    android:id="@+id/sidepane"
-    android:layout_height="match_parent"
-    android:orientation="vertical" />
+        android:id="@+id/sidepane"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/tcqueryform.xml b/android/res/layout/tcqueryform.xml
index 77c15e5d9..4295e879b 100644
--- a/android/res/layout/tcqueryform.xml
+++ b/android/res/layout/tcqueryform.xml
@@ -22,7 +22,7 @@
 
             <TextView
                 android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormManufacturer" />
+                android:text="@string/motor_manufacturer" />
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormManufacturerField"
@@ -34,8 +34,7 @@
         <TableRow>
 
             <TextView
-                android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormImpulse" />
+                android:text="@string/motor_impulseclass" />
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormImpulseField"
@@ -47,8 +46,7 @@
         <TableRow>
 
             <TextView
-                android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormCommonName" />
+                android:text="@string/motor_commonname" />
 
             <EditText
                 android:id="@+id/TCMotorSearchFormCommonNameField"
@@ -58,8 +56,7 @@
         <TableRow>
 
             <TextView
-                android:id="@+id/textView1"
-                android:text="@string/TCMotorSearchFormDiameter" />
+                android:text="@string/motor_diameter" />
 
             <Spinner
                 android:id="@+id/TCMotorSearchFormDiameterField"
diff --git a/android/res/menu/motor_browser_option_menu.xml b/android/res/menu/motor_browser_option_menu.xml
index 05b6e96b3..93b96922a 100644
--- a/android/res/menu/motor_browser_option_menu.xml
+++ b/android/res/menu/motor_browser_option_menu.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/download_from_thrustcurve_menu_option"
-        android:title="Download from ThrustCurve"/>
+        android:title="@string/Download"/>
     <item
         android:id="@+id/preference_menu_option"
         android:icon="@drawable/ic_menu_preferences"
diff --git a/android/res/menu/rocket_viewer_option_menu.xml b/android/res/menu/rocket_viewer_option_menu.xml
index 8201a6c6d..eab9ade07 100644
--- a/android/res/menu/rocket_viewer_option_menu.xml
+++ b/android/res/menu/rocket_viewer_option_menu.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/motor_list_menu_option"
-        android:title="Motor List"
+        android:title="@string/viewmotorslabel"
         android:icon="@drawable/ic_motorbrowser"
         android:showAsAction="always"/>
     <item
diff --git a/android/res/menu/simulation_option_menu.xml b/android/res/menu/simulation_option_menu.xml
index e2474a509..122de68cd 100644
--- a/android/res/menu/simulation_option_menu.xml
+++ b/android/res/menu/simulation_option_menu.xml
@@ -3,8 +3,8 @@
 
     <item
         android:id="@+id/simulation_select_series_menu_option"
-        android:title="Select Series"/>
+        android:title="@string/select_series"/>
     <item
         android:id="@+id/simulation_select_events_menu_option"
-        android:title="View Event"/>
+        android:title="@string/view_events"/>
 </menu>
\ No newline at end of file
diff --git a/android/res/values/pref_strings.xml b/android/res/values/pref_strings.xml
index 07eaa47dd..dcdd42210 100644
--- a/android/res/values/pref_strings.xml
+++ b/android/res/values/pref_strings.xml
@@ -2,11 +2,10 @@
 <resources>
 
     <string name="PreferenceMotorBrowserGroupingOption">PreferenceMotorBrowserGroupingOption</string>
-
     <string name="PreferenceUseInternalFileBrowserOption">PreferenceUseInternalFileBrowserOpion</string>
     <string name="PreferenceFileBrowserBaseDirectory">PreferenceFileBrowserBaseDirectory</string>
     <string name="PreferenceShowOnlyOrkFiles">PreferenceShowOnlyOrkFiles</string>
-    
+
     <string-array name="PreferenceMotorBrowserGroupingValues">
         <item>0</item>
         <item>1</item>
@@ -52,5 +51,68 @@
         <item>mi</item>
         <item>nmi</item>
     </string-array>
+    <string-array name="TCMotorSearchManufacturerList">
+        <item></item>
+        <item>AeroTech</item>
+        <item>Alpha Hybrids</item>
+        <item>Animal Motor Works</item>
+        <item>Apogee Components</item>
+        <item>Cesaroni Technology</item>
+        <item>Contrail Rockets</item>
+        <item>Ellis Mountain</item>
+        <item>Estes Industries</item>
+        <item>Gorilla Rocket Motors</item>
+        <item>Hypertek</item>
+        <item>Kosdon by AeroTech</item>
+        <item>Kosdon TRM</item>
+        <item>Loki Research</item>
+        <item>Propulsion Polymers</item>
+        <item>Public Missiles, Ltd.</item>
+        <item>Quest Aerospace</item>
+        <item>R.A.T.T. Works</item>
+        <item>Roadrunner Rocketry</item>
+        <item>Rocketvision Flight-Star</item>
+        <item>Sky Ripper Systems</item>
+        <item>West Coast Hybrids</item>
+    </string-array>
+    <string-array name="TCMotorSearchImpulseList">
+        <item></item>
+        <item>A</item>
+        <item>B</item>
+        <item>C</item>
+        <item>D</item>
+        <item>E</item>
+        <item>F</item>
+        <item>G</item>
+        <item>H</item>
+        <item>I</item>
+        <item>J</item>
+        <item>K</item>
+        <item>L</item>
+        <item>M</item>
+        <item>N</item>
+        <item>O</item>
+    </string-array>
+    <string-array name="TCMotorSearchDiameterList">
+        <item></item>
+        <item>6</item>
+        <item>10.5</item>
+        <item>13</item>
+        <item>18</item>
+        <item>20</item>
+        <item>24</item>
+        <item>29</item>
+        <item>32</item>
+        <item>38</item>
+        <item>54</item>
+        <item>64</item>
+        <item>69</item>
+        <item>75</item>
+        <item>76</item>
+        <item>81</item>
+        <item>98</item>
+        <item>152</item>
+        <item>161</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f1202d31a..489c2d0c4 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -4,7 +4,10 @@
     <string name="app_name">OpenRocket</string>
     <string name="save">Save</string>
     <string name="MotorListTitle">Motor List</string>
+    <string name="Download">Download</string>
     <string name="Preferences">Preferences</string>
+    <string name="select_series">Select Series</string>
+    <string name="view_events">View Events</string>
 
     <string-array name="PreferenceMotorBrowserGroupingEntries">
         <item>Case</item>
@@ -13,81 +16,7 @@
         <item>Manufacturer</item>
     </string-array>
 
-    <string name="TCMotorSearchFormImpulse">Impulse</string>
-
-    <string-array name="TCMotorSearchImpulseList">
-        <item>All</item>
-        <item>A</item>
-        <item>B</item>
-        <item>C</item>
-        <item>D</item>
-        <item>E</item>
-        <item>F</item>
-        <item>G</item>
-        <item>H</item>
-        <item>I</item>
-        <item>J</item>
-        <item>K</item>
-        <item>L</item>
-        <item>M</item>
-        <item>N</item>
-        <item>O</item>
-    </string-array>
-
-    <string name="TCMotorSearchFormManufacturer">Manufacturer</string>
-
-    <string-array name="TCMotorSearchManufacturerList">
-        <item>All</item>
-        <item>AeroTech</item>
-        <item>Alpha Hybrids</item>
-        <item>Animal Motor Works</item>
-        <item>Apogee Components</item>
-        <item>Cesaroni Technology</item>
-        <item>Contrail Rockets</item>
-        <item>Ellis Mountain</item>
-        <item>Estes Industries</item>
-        <item>Gorilla Rocket Motors</item>
-        <item>Hypertek</item>
-        <item>Kosdon by AeroTech</item>
-        <item>Kosdon TRM</item>
-        <item>Loki Research</item>
-        <item>Propulsion Polymers</item>
-        <item>Public Missiles, Ltd.</item>
-        <item>Quest Aerospace</item>
-        <item>R.A.T.T. Works</item>
-        <item>Roadrunner Rocketry</item>
-        <item>Rocketvision Flight-Star</item>
-        <item>Sky Ripper Systems</item>
-        <item>West Coast Hybrids</item>
-    </string-array>
-
-    <string name="TCMotorSearchFormCommonName">Common Name</string>
-    <string name="TCMotorSearchFormDiameter">Diameter</string>
-
-    <string-array name="TCMotorSearchDiameterList">
-        <item>All</item>
-        <item>6</item>
-        <item>10.5</item>
-        <item>13</item>
-        <item>18</item>
-        <item>20</item>
-        <item>24</item>
-        <item>29</item>
-        <item>32</item>
-        <item>38</item>
-        <item>54</item>
-        <item>64</item>
-        <item>69</item>
-        <item>75</item>
-        <item>76</item>
-        <item>81</item>
-        <item>98</item>
-        <item>152</item>
-        <item>161</item>
-    </string-array>
-
     <string name="TCMotorSearchFormSubmit">Submit</string>
-    <string name="tcdownload">Download from ThrustCurve</string>
     <string name="overviewConfigurationSpinnerPrompt">Select Configuration</string>
     <string name="simulationSeries1Label">Series 1</string>
     <string name="simulationSeries2Label">Series 2</string>
@@ -127,5 +56,22 @@
         <item>Miles</item>
         <item>Nautical Miles</item>
     </string-array>
+        <string name="rocket_cg">CG</string>
+        <string name="rocket_designer">Designer</string>
+        <string name="rocket_length">Length</string>
+        <string name="rocket_emptymass">Empty Mass</string>
+        <string name="rocket_stagecount">Stage Count</string>
+        <string name="rocket_liftoffweight">Lift off weight</string>
+        <string name="rocket_cp">CP</string>
+        <string name="rocket_stabilitymargin">Stability margin</string>
+        <string name="openfilelabel">Open ork file</string>
+        <string name="viewmotorslabel">View motors</string>
+        <string name="motor_manufacturer">Manufacturer</string>
+        <string name="motor_commonname">Common Name</string>
+        <string name="motor_delays">Delays</string>
+        <string name="motor_caseinfo">Case Info</string>
+        <string name="motor_impulseclass">Impulse Class</string>
+        <string name="motor_diameter">Diameter</string>
+        <string name="motor_length">Length</string>
 
 </resources>
\ No newline at end of file