diff --git a/Field Book/AndroidManifest.xml b/Field Book/AndroidManifest.xml
index 49f410b99..f6c14e74f 100644
--- a/Field Book/AndroidManifest.xml	
+++ b/Field Book/AndroidManifest.xml	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.fieldbook.tracker"
-    android:versionCode="12"
-    android:versionName="2.0" >
+    android:versionCode="210"
+    android:versionName="2.1.0" >
 
     <uses-sdk
         android:minSdkVersion="7"
diff --git a/Field Book/res/layout/about.xml b/Field Book/res/layout/about.xml
index d8fe92762..515f1f519 100644
--- a/Field Book/res/layout/about.xml	
+++ b/Field Book/res/layout/about.xml	
@@ -6,87 +6,89 @@
     android:orientation="vertical"
     android:padding="20dp" >
 
-    <TextView
-        android:id="@+id/version"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingBottom="10dp"
-        android:paddingLeft="10dp"
-        android:text="Version"
-        android:textColor="@color/s_text"
-        android:textSize="25dp"
-        android:textStyle="bold" />
-
     <TextView
         android:id="@+id/developerMsg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Developers"
+        android:text="@string/developers"
         android:textColor="#000000"
         android:textSize="25dp"
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/developerJesse"
+        android:id="@+id/developerTrevor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Jesse Poland, USDA-ARS"
+        android:text="Trevor Rife, Kansas State University"
         android:textColor="#000000"
         android:textSize="20dp"
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/developerJesseEmail"
+        android:id="@+id/developerTrevorEmail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="25dip"
         android:autoLink="email"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Email: jpoland@ksu.edu"
+        android:text="trife@ksu.edu"
         android:textColor="#000000"
         android:textSize="15dp"
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/developerJesseSite"
+        android:id="@+id/developerTrevorSite"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="25dip"
         android:autoLink="web"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Site: http://wheatgenetics.org"
+        android:text="https://github.com/trife/Field-Book"
         android:textColor="#000000"
         android:textSize="15dp"
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/developerTrevor"
+        android:id="@+id/developerJesse"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Trevor Rife, Kansas State University"
+        android:text="Jesse Poland, Kansas State University"
         android:textColor="#000000"
         android:textSize="20dp"
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/developerTrevorEmail"
+        android:id="@+id/developerJesseEmail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="25dip"
         android:autoLink="email"
+        android:paddingBottom="5dp"
+        android:paddingLeft="10dp"
+        android:text="jpoland@ksu.edu"
+        android:textColor="#000000"
+        android:textSize="15dp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/developerJesseSite"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="25dip"
+        android:autoLink="web"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Email: trife@ksu.edu"
+        android:text="http://wheatgenetics.org"
         android:textColor="#000000"
         android:textSize="15dp"
         android:textStyle="bold" />
@@ -96,7 +98,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
-        android:paddingBottom="10dp"
+        android:paddingBottom="5dp"
         android:paddingLeft="10dp"
         android:text="Technology Projects"
         android:textColor="#000000"
@@ -110,7 +112,7 @@
         android:layout_marginLeft="25dip"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Solutions for mobile clients (Android, iOS, Blackberry, Windows Phone), server (Microsoft / Enterprise Java) as well as cloud based computing (Google / Amazon)."
+        android:text="Solutions for mobile clients, server, and cloud-based computing."
         android:textColor="#000000"
         android:textSize="15dp"
         android:textStyle="bold" />
@@ -123,7 +125,7 @@
         android:autoLink="email"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Email: technologyprojects@gmail.com"
+        android:text="technologyprojects@gmail.com"
         android:textColor="#000000"
         android:textSize="15dp"
         android:textStyle="bold" />
@@ -134,31 +136,19 @@
         android:layout_height="wrap_content"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Translators"
+        android:text="@string/translators"
         android:textColor="#000000"
         android:textSize="25dp"
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/translatorIFB"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dip"
-        android:paddingBottom="10dp"
-        android:paddingLeft="10dp"
-        android:text="Irazema Fuentes-Bueno (Spanish)"
-        android:textColor="#000000"
-        android:textSize="20dp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/translatorSD"
+        android:id="@+id/translatorList"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dip"
         android:paddingBottom="10dp"
         android:paddingLeft="10dp"
-        android:text="Sandra Dunckel (German)"
+        android:text="Irazema Fuentes-Bueno,  Sandra Dunckel,  Shuangye Wu,  Narinder Singh,  Daljit Singh,  Erena Edae,  Tatiana Danilova,  Rodrigo Pedrozo,  Cristiano Lemes da Silva,  Sophie Bouchet,  Hiroyoshi Iwata,  Goro Ishikawa,  Khaled El-Shamaa"
         android:textColor="#000000"
         android:textSize="20dp"
         android:textStyle="bold" />
diff --git a/Field Book/res/layout/backupdb.xml b/Field Book/res/layout/backupdb.xml
new file mode 100644
index 000000000..27e128df2
--- /dev/null
+++ b/Field Book/res/layout/backupdb.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="#FFFFFF"
+    android:orientation="vertical"
+    android:padding="5dp" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="@string/filename"
+        android:textColor="@color/s_text"
+        android:textStyle="bold" />
+
+    <EditText
+        android:id="@+id/fileName"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_width="450dp"
+        android:layout_height="wrap_content"
+        android:maxLength="200"
+        android:singleLine="true"
+        android:textColor="#000000"
+	/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_height="wrap_content"
+        android:text="@string/filename"
+        android:textStyle="bold"
+        android:visibility="invisible" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingTop="10dp"
+        android:orientation="horizontal" >
+    
+		    <Button
+		        android:id="@+id/saveBtn"        
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:layout_gravity="center"
+		        android:minWidth="100dp"
+		        android:text="@string/okay"
+		        android:textColor="#000000"
+		        android:textSize="30dp"
+		        android:textStyle="bold" />
+
+		    <Button
+		        android:id="@+id/closeBtn"        
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:layout_gravity="center"
+		        android:minWidth="100dp"
+		        android:text="@string/close"
+		        android:textColor="#000000"
+		        android:textSize="30dp"
+		        android:textStyle="bold" />
+		    
+	   </LinearLayout>		    
+</LinearLayout>
\ No newline at end of file
diff --git a/Field Book/res/layout/importdb.xml b/Field Book/res/layout/importdb.xml
new file mode 100644
index 000000000..ad470df77
--- /dev/null
+++ b/Field Book/res/layout/importdb.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="#FFFFFF"
+    android:orientation="vertical"
+    android:padding="5dp" >
+
+    <ListView
+        android:id="@+id/myList"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_height="wrap_content"
+        android:text="@string/filename"
+        android:textStyle="bold"
+        android:visibility="invisible" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingTop="10dp"
+        android:orientation="horizontal" >
+    
+		    <Button
+		        android:id="@+id/closeBtn"        
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:layout_gravity="center"
+		        android:minWidth="100dp"
+		        android:text="@string/close"
+		        android:textColor="#000000"
+		        android:textSize="30dp"
+		        android:textStyle="bold" />
+		    
+	   </LinearLayout>		    
+</LinearLayout>
\ No newline at end of file
diff --git a/Field Book/res/layout/listitem_a2.xml b/Field Book/res/layout/listitem_a2.xml
new file mode 100644
index 000000000..a5dfe22d9
--- /dev/null
+++ b/Field Book/res/layout/listitem_a2.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView 
+    android:id="@+id/spinnerTarget"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@drawable/listmimic"		 
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingBottom="10dp"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:paddingTop="10dp"
+    android:ellipsize="end"
+    android:textSize="30dp"
+    android:textStyle="bold" />
diff --git a/Field Book/res/layout/traitline.xml b/Field Book/res/layout/traitline.xml
index 08186c4e0..4130a7be4 100644
--- a/Field Book/res/layout/traitline.xml	
+++ b/Field Book/res/layout/traitline.xml	
@@ -40,22 +40,24 @@
 		android:id="@+id/copyBtn"
 		android:focusable="false"
         android:layout_width="wrap_content"
-        android:layout_height="40dp"                
-        android:minWidth="70dp"
-        android:text="@string/copy"
+        android:layout_height="45dp"
+        android:minWidth="30dp"
+        android:text=""
         android:textColor="#000000"
         android:textSize="16dp"
+        android:drawableTop="@drawable/ic_action_copy"
         android:textStyle="bold" />
-				
+
 	<Button
 		android:id="@+id/delBtn"
 		android:focusable="false"
         android:layout_width="wrap_content"
-        android:layout_height="40dp"                
-        android:minWidth="40dp"
-        android:text="@string/del"
+        android:layout_height="45dp"
+        android:minWidth="30dp"
+        android:text=""
         android:textColor="#000000"
         android:textSize="16dp"
+        android:drawableTop="@drawable/ic_action_discard"
         android:textStyle="bold" />
 
 	<TextView android:id="@+id/text2"
diff --git a/Field Book/res/menu/configmenu.xml b/Field Book/res/menu/configmenu.xml
index d177874df..e5a405115 100644
--- a/Field Book/res/menu/configmenu.xml	
+++ b/Field Book/res/menu/configmenu.xml	
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 	<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-		<item android:id="@+id/help" android:title="@string/help" android:showAsAction="always" />	    	    
-	    <item android:id="@+id/about" android:title="@string/about" android:showAsAction="never" />"     
+    <item
+        android:id="@+id/help"
+        android:title="@string/help"
+        android:icon="@drawable/ic_action_help"
+        android:showAsAction="always" />
+
+    <item
+        android:id="@+id/database"
+        android:title="@string/dbformat"
+        android:icon="@drawable/ic_action_storage"
+        android:showAsAction="ifRoom|withText" />"
+
+    <item
+        android:id="@+id/about"
+        android:title="@string/about"
+        android:icon="@drawable/ic_action_about"
+        android:showAsAction="ifRoom|withText" />"
+
 	</menu>
 
diff --git a/Field Book/res/menu/mainmenu.xml b/Field Book/res/menu/mainmenu.xml
index bfbbb6763..6b499b41d 100644
--- a/Field Book/res/menu/mainmenu.xml	
+++ b/Field Book/res/menu/mainmenu.xml	
@@ -1,10 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 	<menu xmlns:android="http://schemas.android.com/apk/res/android" >   
-	    <item android:id="@+id/help" android:title="@string/help" android:showAsAction="always" />  
-		<item android:id="@+id/settings" android:title="@string/settings" android:showAsAction="never" />"
-		<item android:id="@+id/search" android:title="@string/search" android:showAsAction="always" />"
-		<item android:id="@+id/map" android:title="@string/map" android:showAsAction="never" />"
-		<item android:id="@+id/resources" android:title="@string/resources" android:showAsAction="always" />"
-		<item android:id="@+id/quit" android:title="@string/quit" android:showAsAction="never" />"	
+	    <item
+            android:id="@+id/help"
+            android:title="@string/help"
+            android:icon="@drawable/ic_action_help"
+            android:showAsAction="always" />
+		<item
+            android:id="@+id/search"
+            android:title="@string/search"
+            android:icon="@drawable/ic_action_search"
+            android:showAsAction="always" />"
+		<item
+            android:id="@+id/map"
+            android:title="@string/map"
+            android:icon="@drawable/ic_action_map"
+            android:showAsAction="ifRoom|withText" />"
+		<item
+            android:id="@+id/resources"
+            android:title="@string/resources"
+            android:icon="@drawable/ic_action_collection"
+            android:showAsAction="always" />"
+        <item
+            android:id="@+id/settings"
+            android:title="@string/settings"
+            android:icon="@drawable/ic_action_settings"
+            android:showAsAction="always" />"
 	</menu>
 
diff --git a/Field Book/res/menu/searchmenu.xml b/Field Book/res/menu/searchmenu.xml
deleted file mode 100644
index 156368e85..000000000
--- a/Field Book/res/menu/searchmenu.xml	
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-	<menu xmlns:android="http://schemas.android.com/apk/res/android" >     
-		<item android:id="@+id/add" android:title="@string/addsearch" android:showAsAction="always" />"
-	</menu>
-
diff --git a/Field Book/res/menu/traitmenu.xml b/Field Book/res/menu/traitmenu.xml
index bc8549b04..1b6e22032 100644
--- a/Field Book/res/menu/traitmenu.xml	
+++ b/Field Book/res/menu/traitmenu.xml	
@@ -1,9 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 	<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-	    <item android:id="@+id/help" android:title="@string/help" android:showAsAction="always" />			   	    	  	   	    
-	    <item android:id="@+id/addTrait" android:title="@string/addtrait" android:showAsAction="always" />
-	    <item android:id="@+id/deleteTrait" android:title="@string/deletealltraits" android:showAsAction="always" />
-	    <item android:id="@+id/importdb" android:title="@string/importdb" android:showAsAction="never" />
-	    <item android:id="@+id/exportdb" android:title="@string/export" android:showAsAction="never" />	
+	    <item
+            android:id="@+id/help"
+            android:title="@string/help"
+            android:icon="@drawable/ic_action_help"
+            android:showAsAction="always" />
+	    <item
+            android:id="@+id/addTrait"
+            android:title="@string/addtrait"
+            android:icon="@drawable/ic_action_new"
+            android:showAsAction="always" />
+	    <item
+            android:id="@+id/deleteTrait"
+            android:title="@string/deletealltraits"
+            android:icon="@drawable/ic_action_discard"
+            android:showAsAction="always" />
+	    <item
+            android:id="@+id/importdb"
+            android:title="@string/importdb"
+            android:icon="@drawable/ic_action_download"
+            android:showAsAction="always" />
+	    <item
+            android:id="@+id/exportdb"
+            android:title="@string/export"
+            android:icon="@drawable/ic_action_upload"
+            android:showAsAction="always" />
 	</menu>
 
diff --git a/Field Book/res/raw/changelog.txt b/Field Book/res/raw/changelog.txt
index bc2801c6a..d3b4c6580 100644
--- a/Field Book/res/raw/changelog.txt	
+++ b/Field Book/res/raw/changelog.txt	
@@ -1,17 +1,16 @@
 13/2.1.0
-Added this change log
+Added this changelog
 Changed tutorial setup
 Language dialog updated
-Exported files are shared
+Exported files are shared to other installed apps
 App does not move to first plot when external hardware added
 Items are disabled if not available
-Option to reset, export, or import app database
+Replace text on ActionBar with appropriate icons
+Removed XLS support due to performance issues
+Added support for folders in the Fields dialog
 Added support for Amharic, Arabic, Brazilian Portuguese, Chinese, French, Hindi, Japanese, Oromo, and Russian
-Advanced feature option to play a sound when the first level changes
-Advanced feature option to move to next empty plot via button
-Advanced feature option to move to specific unique identifier
 Bugfix: minimum in numeric traits is enforced
-Bugfix: all text in text traits is deletable with the keyboard (previously one letter remained)
+Bugfix: all text in text traits is deletable with the keyboard
 Bugfix: cursor now appears at end of text in text traits
 Bugfix: files are now visible via computer after export
 
diff --git a/Field Book/res/values/strings.xml b/Field Book/res/values/strings.xml
index a4927d704..2e39d7885 100644
--- a/Field Book/res/values/strings.xml	
+++ b/Field Book/res/values/strings.xml	
@@ -6,7 +6,6 @@
     <string name="resources">Resources</string>
     <string name="audio">Audio</string>
     <string name="language">Language</string>
-    <string name="about">About</string>
     <string name="quit">Quit</string>
     <string name="traitdetails">Trait details</string>
     <string name="area">Area</string>
@@ -73,10 +72,6 @@
     <string name="configure">Configure</string>
     <string name="trait">Trait</string>
     <string name="direction">Field starts in...</string>
-    <string name="topleft">Top left</string>
-    <string name="btmleft">Bottom left</string>
-    <string name="topright">Top right</string>
-    <string name="btmright">Bottom right</string>
     <string name="mapanalyze">Analyze</string>
     <string name="mapexport">Export</string>
     <string name="serpentine">Serpentine</string>
@@ -105,8 +100,6 @@
     <string name="choosetraitfile">Choose trait file</string>
     <string name="addtrait">Add trait</string>
     <string name="traiteditor">Trait editor</string>
-    <string name="language">Language</string>
-    <string name="trait">Trait</string>
     <string name="format">Format</string>
     <string name="def">Default</string>
     <string name="minimum">Minimum</string>
@@ -129,8 +122,6 @@
     <string name="traitexists">Trait already exists</string>
     <string name="deletetrait">Delete trait</string>
     <string name="deletealltraits">Delete all traits</string>
-    <string name="areyousure">Are you sure?</string>
-    <string name="resetcomplete">Database has been deleted</string>
     <string name="notanumber">Default, minimum, and maximum must be numeric</string>
     <string name="notemptycategory">Category cannot be empty</string>
     <string name="truevalue">True</string>
@@ -157,7 +148,6 @@
     <string name="prev">Previous</string>
     <string name="next">Next</string>
     <string name="stored">Data has been saved</string>
-    <string name="copy">Copy</string>
     <string name="optional">Optional</string>
     <string name="savetrait">Save trait</string>
     <string name="exportmsg">Exporting...</string>
@@ -183,7 +173,6 @@
     <string name="thelp2">To import trait files, press the menu button and choose Import.</string>
     <string name="thelp3">Consult the app manual for additional information about trait creation.</string>
     <string name="mapsummary">Summary</string>
-    <string name="mapsummary">Summary</string>
     <string name="importtraitwarning">A field must be imported before traits can be created.</string>
     <string name="datasetwarning">No data set exists</string>
     <string name="nofieldloaded">No field is currently loaded. Please load a field before collecting data.</string>
diff --git a/Field Book/src/com/fieldbook/tracker/ChangelogActivity.java b/Field Book/src/com/fieldbook/tracker/ChangelogActivity.java
index d430cc293..e4cc3493f 100644
--- a/Field Book/src/com/fieldbook/tracker/ChangelogActivity.java	
+++ b/Field Book/src/com/fieldbook/tracker/ChangelogActivity.java	
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
@@ -24,10 +25,9 @@
 import java.util.Locale;
 
 /**
- * Created by Trevor on 6/24/2014.
+ * Created by trife on 6/24/2014.
  */
 
-
 public class ChangelogActivity extends Activity {
     Handler mHandler = new Handler();
 
@@ -61,28 +61,22 @@ public void onCreate(Bundle savedInstanceState) {
         getBaseContext().getResources().updateConfiguration(config2, getBaseContext().getResources()
                 .getDisplayMetrics());
 
+        SharedPreferences.Editor ed = ep.edit();
+        ed.putInt("UpdateVersion", getVersion());
+        ed.commit();
 
-        setContentView(R.layout.changelog);
 
+        setContentView(R.layout.changelog);
         setTitle(R.string.updatemsg);
-
         params = getWindow().getAttributes();
-        // params.height = LinearLayout.LayoutParams.MATCH_PARENT;
-        //params.width = 600;
 
         this.getWindow().setAttributes(params);
-
         parent = (LinearLayout) findViewById(R.id.data);
 
         Button close = (Button) findViewById(R.id.closeBtn);
 
         close.setOnClickListener(new View.OnClickListener() {
-
             public void onClick(View arg0) {
-
-                SharedPreferences.Editor ed = ep.edit();
-                ed.putBoolean("UpdateShown", true);
-                ed.commit();
                 finish();
             }
         });
@@ -90,6 +84,16 @@ public void onClick(View arg0) {
         parseLog(R.raw.changelog);
     }
 
+    public int getVersion() {
+        int v = 0;
+        try {
+            v = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+            // Huh? Really?
+        }
+        return v;
+    }
+
     // Helper function to add row
     public void parseLog(int resId) {
         List views = new ArrayList();
diff --git a/Field Book/src/com/fieldbook/tracker/ConfigActivity.java b/Field Book/src/com/fieldbook/tracker/ConfigActivity.java
index a8b973b17..a5fd909bc 100644
--- a/Field Book/src/com/fieldbook/tracker/ConfigActivity.java	
+++ b/Field Book/src/com/fieldbook/tracker/ConfigActivity.java	
@@ -9,6 +9,8 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.database.Cursor;
@@ -19,6 +21,7 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.provider.Settings;
 import android.text.Html;
@@ -56,7 +59,9 @@
 import java.io.FilenameFilter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -78,7 +83,7 @@ public class ConfigActivity extends SherlockActivity {
 	private static final String CSV = ".csv";
 	private static final String XLS = ".xls";
 	private static final int DIALOG_LOAD_FIELDFILECSV = 1000;
-	private static final int DIALOG_LOAD_FIELDFILEEXCEL = 1001;
+    private static final int DIALOG_LOAD_FIELDFILEEXCEL = 1001;
 	
     public static boolean helpActive;
     public static Activity thisActivity;
@@ -100,11 +105,15 @@ public class ConfigActivity extends SherlockActivity {
 	private Dialog setupDialog;
 	
 	private Dialog importFieldMapDialog;
-	
+
+    private Dialog dbSaveDialog;
+
 	private String[] mFileList;
 	private String[] importColumns;
 
-	private String mChosenFile;
+    private String mUserChoice = "";
+	private String mChosenFile = "";
+    private String importDirectory = "";
 		
 	private ListView rateList;
 	private ListView saveList;
@@ -747,17 +756,22 @@ public void onClick(View arg0) {
 		
 		String[] items2 = new String[] { getString(R.string.setup), getString(R.string.fields), 
 		getString(R.string.traits), getString(R.string.export), getString(R.string.advanced), 
-		getString(R.string.language), getString(R.string.tutorial)};
+		getString(R.string.language)};
 
         settingsList.setOnItemClickListener(new OnItemClickListener() {
             public void onItemClick(AdapterView<?> av, View arg1, int position, long arg3) {
                 switch (position) {
                     case 0:
+                        if (!ep.getBoolean("ImportFieldFinished", false)) {
+                            showNoFieldDialog();
+                            return;
+                        }
+
                         showSetupDialog();
                         break;
 
                     case 1:
-                        fieldDialog2.show();
+                        createDialog(DIALOG_LOAD_FIELDFILECSV);
                         break;
 
                     case 2:
@@ -789,10 +803,6 @@ public void onItemClick(AdapterView<?> av, View arg1, int position, long arg3) {
                     case 5:
                         showLanguageDialog();
                         break;
-
-                    case 6:
-                        showTutorialDialog();
-                        break;
                 }
             }
         });
@@ -800,16 +810,88 @@ public void onItemClick(AdapterView<?> av, View arg1, int position, long arg3) {
         ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,R.layout.listitemhighlight, items2);
         settingsList.setAdapter(adapter);
 
-		if (!ep.getBoolean("UpdateShown", false))
-		{
+        SharedPreferences.Editor ed = ep.edit();
+
+        if (ep.getInt("UpdateVersion",-1) < getVersion()) {
+            ed.putInt("UpdateVersion", getVersion());
+            ed.commit();
             Intent intent = new Intent();
             intent.setClass(ConfigActivity.this, ChangelogActivity.class);
             startActivity(intent);
-		}
-
+        }
+        if (!ep.getBoolean("TipsConfigured", false)) {
+            ed.putBoolean("TipsConfigured", true);
+            ed.commit();
+            showTipsDialog();
+        }
 	}
 
-	// Only used for truncating lat long values
+    public int getVersion() {
+        int v = 0;
+        try {
+            v = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        return v;
+    }
+
+    private void showTipsDialog()
+    {
+        AlertDialog.Builder builder = new AlertDialog.Builder(ConfigActivity.this);
+
+        builder.setTitle(getString(R.string.tipshort));
+        builder.setMessage(getString(R.string.tipsdesc));
+
+        builder.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener()
+        {
+
+            public void onClick(DialogInterface dialog, int which)
+            {
+                Editor ed = ep.edit();
+                ed.putBoolean("Tips", true);
+                ed.putBoolean("TipsConfigured", true);
+                ed.commit();
+
+                dialog.dismiss();
+
+                invalidateOptionsMenu();
+
+                Intent intent = new Intent();
+                intent.setClassName(ConfigActivity.this,
+                        ConfigActivity.class.getName());
+                startActivity(intent);
+
+            }
+
+        });
+
+        builder.setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener()
+        {
+
+            public void onClick(DialogInterface dialog, int which)
+            {
+                Editor ed = ep.edit();
+                ed.putBoolean("TipsConfigured", true);
+                ed.commit();
+
+                dialog.dismiss();
+
+                Intent intent = new Intent();
+                intent.setClassName(ConfigActivity.this,
+                        ConfigActivity.class.getName());
+                startActivity(intent);
+            }
+
+        });
+
+
+        AlertDialog alert = builder.create();
+        alert.show();
+
+    }
+
+
+    // Only used for truncating lat long values
 	private String truncateDecimalString(String v)
 	{
 		int count = 0;
@@ -839,11 +921,19 @@ private String truncateDecimalString(String v)
 		return truncated;
 	}
 	
-	private void showAboutDialog()
-	{
+	private void showAboutDialog()	{
+        String versionName;
+        final PackageManager packageManager = this.getPackageManager();
+
+        try {
+            PackageInfo packageInfo = packageManager.getPackageInfo(this.getPackageName(), 0);
+            versionName = packageInfo.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            versionName = null;
+        }
 		final Dialog aboutDialog = new Dialog(ConfigActivity.this,
 				android.R.style.Theme_Holo_Light_Dialog);
-		aboutDialog.setTitle(getString(R.string.about));
+		aboutDialog.setTitle(getString(R.string.version) + " " + versionName);
 		aboutDialog.setContentView(R.layout.about);
 
 		android.view.WindowManager.LayoutParams langParams = aboutDialog.getWindow().getAttributes();
@@ -853,8 +943,6 @@ private void showAboutDialog()
 		aboutDialog.setCancelable(true);
 		aboutDialog.setCanceledOnTouchOutside(true);
 
-		TextView version = (TextView) aboutDialog
-				.findViewById(R.id.version);
 		Button closeBtn = (Button) aboutDialog
 				.findViewById(R.id.closeBtn);
 
@@ -865,70 +953,9 @@ public void onClick(View arg0) {
 			}
 		});
 
-		try {
-			version.setText("Version: "
-					+ getPackageManager().getPackageInfo(
-							getPackageName(), 0).versionName);
-		} catch (NameNotFoundException e) {
-			e.printStackTrace();
-		}
-
 		aboutDialog.show();						
 	}
-	
-	private void showTutorialDialog()
-	{		
-		// Do not show tutorial when tips / hints is open
-		if (helpActive)
-			return;
-			
-        if (ep.getBoolean("Tips", false))
-        {
-        	try
-        	{
-        		settingsList.setVisibility(View.INVISIBLE);
-        		
-		        final View tutView = LayoutInflater.from(getBaseContext()).inflate(R.layout.help, null);
-		        mFrame.addView(tutView);
-		        
-		        Button button = (Button) findViewById(R.id.completeButton);
-	            
-	            button.setOnClickListener(new View.OnClickListener() {
-	            	
-	            	public void onClick(final View v) {
-	                    mFrame.removeView(tutView);
-	                    settingsList.setVisibility(View.VISIBLE);
-	            	}
-	            });
-        	}
-        	catch (Exception e)
-        	{
-        		e.printStackTrace();
-        	}
-        }
-        else
-        {
-        	try
-        	{
-		        final View tutView = LayoutInflater.from(getBaseContext()).inflate(R.layout.help2, null);
-		        mFrame.addView(tutView);
-		        
-		        Button button = (Button) findViewById(R.id.completeButton);
-	            
-	            button.setOnClickListener(new View.OnClickListener() {
-	            	
-	            	public void onClick(final View v) {
-	                    mFrame.removeView(tutView);
-	            	}
-	            });
-        	}
-        	catch (Exception e)
-        	{
-        		e.printStackTrace();
-        	}        	
-        }
-	}
-	
+
 	// Validate that columns are unique
 	private boolean checkImportColumnNames()
 	{
@@ -1164,25 +1191,58 @@ private void shareFile(File filePath) {
 	/**
 	 * Creates a list of all files in directory by type 
 	 */
-	private void loadFileList(final String type) {
+	private void loadFileList(final String type, final String directory) {
 		
-		File importPath = new File(MainActivity.fieldImportPath);
+		File importPath = new File(directory);
 		
 		if (importPath.exists()) {
-			FilenameFilter filter = new FilenameFilter() {
+            File[] files = importPath.listFiles( new FilenameFilter() {
 				public boolean accept(File dir, String filename) {
 					File sel = new File(dir, filename);
-					return filename.contains(type);
+					return filename.contains(type) || sel.isDirectory();
 				}
-			};
-			mFileList = importPath.list(filter);
-		} 
+                });
+
+            Arrays.sort(files, comp);
+
+            String[] sortedFileList = new String[files.length];
+            for (int i = 0; i < files.length; ++i){
+
+                if(files[i].isDirectory()) {
+                    sortedFileList[i] = "/" + files[i].getName() + "/";
+                } else {
+                    sortedFileList[i] = files[i].getName();
+                }
+
+
+            }
+
+            mFileList = sortedFileList;
+		}
 		else {
 			mFileList = new String[0];
 		}
 	}
-	
-	// Because the import dialog layout is created dynamically, this function
+
+    Comparator comp = new Comparator() {
+        public int compare(Object o1, Object o2) {
+            File f1 = (File) o1;
+            File f2 = (File) o2;
+            if (f1.isDirectory() && !f2.isDirectory()) {
+                // Directory before non-directory
+                return -1;
+            } else if (!f1.isDirectory() && f2.isDirectory()) {
+                // Non-directory after directory
+                return 1;
+            } else {
+                // Alphabetic order otherwise
+                return f1.toString().compareToIgnoreCase(f2.toString());
+            }
+        }
+    };
+
+
+    // Because the import dialog layout is created dynamically, this function
 	// loops through child views and checks spinner values for duplicate values
 	private int findColValue(LinearLayout parent, int value, boolean allowDuplicate)
 	{
@@ -1333,11 +1393,11 @@ private void createDialog(int id) {
 		switch (id) {
 			case DIALOG_LOAD_FIELDFILECSV:
 			case DIALOG_LOAD_TRAITFILE:
-				loadFileList(CSV);
+				loadFileList(CSV,MainActivity.fieldImportPath);
 				break;
 			
 			case DIALOG_LOAD_FIELDFILEEXCEL:
-				loadFileList(XLS);
+				loadFileList(XLS,MainActivity.fieldImportPath);
 				break;
 		}
 	
@@ -1539,9 +1599,20 @@ private String[] prepareSetup()
 	
 	private void updateSetupList()
 	{
-		GenericArrayAdapter ga = (GenericArrayAdapter) setupList.getAdapter();
-		
-		ga.data = prepareSetup();
+		//GenericArrayAdapter ga = (GenericArrayAdapter) setupList.getAdapter();
+
+        ArrayAdapter<String> ga = (ArrayAdapter) setupList.getAdapter();
+
+        ga.clear();
+
+        String[] arrayData = prepareSetup();
+
+        if (arrayData != null){
+            for (String string : arrayData) {
+                ga.insert(string, ga.getCount());
+            }
+        }
+
 		ga.notifyDataSetChanged();
 	}
 		
@@ -1605,59 +1676,58 @@ public void onItemClick(AdapterView<?> av, View v, int position,
 	
 	private void showSetupDialog()
 	{
-		String[] items = prepareSetup();
-		
-		final OnItemClickListener setupListener = new OnItemClickListener(){
+        String[] array = prepareSetup();
+        ArrayList<String> lst = new ArrayList<String>();
+        lst.addAll(Arrays.asList(array));
 
-			public void onItemClick(AdapterView<?> arg0, View arg1, int position,
-					long arg3) {
-				
-				switch (position)
-				{
-				case 0:
-					showPersonDialog();
-					break;
-					
-				case 1:
-					showLocationDialog();
-					break;
-					
-				case 2:
-					showRateDialog();
-					break;		
-					
-				case 3:
-					if (MainActivity.dt.getRangeColumns() == null)
-						return;
-					
-					createDialog(DIALOG_LOAD_TRAITS1);
-					break;
-					
-				case 4:
-					if (MainActivity.dt.getRangeColumns() == null)
-						return;
-					
-					createDialog(DIALOG_LOAD_TRAITS2);
-					break;
-					
-				case 5:
-					if (MainActivity.dt.getRangeColumns() == null)
-						return;
-					
-					createDialog(DIALOG_LOAD_TRAITS3);
-					break;	
-					
-				case 6:
-					showClearSettingsDialog();
-					break;
-					
-				}
-			}
-		};		
-		
-		setupList.setAdapter(new GenericArrayAdapter(ConfigActivity.this, R.layout.listitem_a,
-				items, setupListener));
-		
+        setupList.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
+                switch (which)
+                {
+                    case 0:
+                        showPersonDialog();
+                        break;
+
+                    case 1:
+                        showLocationDialog();
+                        break;
+
+                    case 2:
+                        showRateDialog();
+                        break;
+
+                    case 3:
+                        if (MainActivity.dt.getRangeColumns() == null)
+                            return;
+
+                        createDialog(DIALOG_LOAD_TRAITS1);
+                        break;
+
+                    case 4:
+                        if (MainActivity.dt.getRangeColumns() == null)
+                            return;
+
+                        createDialog(DIALOG_LOAD_TRAITS2);
+                        break;
+
+                    case 5:
+                        if (MainActivity.dt.getRangeColumns() == null)
+                            return;
+
+                        createDialog(DIALOG_LOAD_TRAITS3);
+                        break;
+
+                    case 6:
+                        showClearSettingsDialog();
+                        break;
+
+                }
+            }
+        });
+
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,R.layout.listitem_a, lst);
+
+        setupList.setAdapter(adapter);
 		setupDialog.show();		
 	}
 	
@@ -1792,27 +1862,23 @@ public void onClick(View v) {
 			}
 		});
 
-		OnItemClickListener listener = new OnItemClickListener() {
+        csvList.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
+                dialog.dismiss();
 
-			public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
-				dialog.dismiss();
-				
-				Editor e = ep.edit();
+                Editor e = ep.edit();
 
-				e.putString("DROP3", traits[which]);
-				e.commit();
-				
-				MainActivity.partialReload = true;
-				
-				updateSetupList();
-			}
-		};
-						
-		GenericArrayAdapter itemsAdapter = new GenericArrayAdapter(ConfigActivity.this, 
-		R.layout.listitem_a, traits, listener);
-		
-		csvList.setAdapter(itemsAdapter);				
-	
+                e.putString("DROP3", traits[which]);
+                e.commit();
+
+                MainActivity.partialReload = true;
+
+                updateSetupList();
+            }
+        });
+
+        ArrayAdapter<String> itemsAdapter = new ArrayAdapter<String>(this, R.layout.listitem_a, traits);
+        csvList.setAdapter(itemsAdapter);
 		dialog.show();
 	}
 	
@@ -1835,27 +1901,23 @@ public void onClick(View v) {
 			}
 		});
 
-		OnItemClickListener listener = new OnItemClickListener() {
+        csvList.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
+                dialog.dismiss();
 
-			public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
-				dialog.dismiss();
-				
-				Editor e = ep.edit();
+                Editor e = ep.edit();
 
-				e.putString("DROP2", traits[which]);
-				e.commit();
-				
-				MainActivity.partialReload = true;
-				
-				updateSetupList();
-			}
-		};
-						
-		GenericArrayAdapter itemsAdapter = new GenericArrayAdapter(ConfigActivity.this, 
-		R.layout.listitem_a, traits, listener);
-		
-		csvList.setAdapter(itemsAdapter);				
-	
+                e.putString("DROP2", traits[which]);
+                e.commit();
+
+                MainActivity.partialReload = true;
+
+                updateSetupList();
+            }
+        });
+
+        ArrayAdapter<String> itemsAdapter = new ArrayAdapter<String>(this, R.layout.listitem_a, traits);
+        csvList.setAdapter(itemsAdapter);
 		dialog.show();
 	}
 		
@@ -1870,35 +1932,30 @@ private void showTrait1Dialog(final String[] traits)
 
 		ListView csvList = (ListView) dialog.findViewById(R.id.myList);
 		Button csvButton = (Button) dialog.findViewById(R.id.closeBtn);
-		
-		csvButton.setOnClickListener(new OnClickListener(){
 
-			public void onClick(View v) {
-				dialog.dismiss();
-			}
-		});
+		csvButton.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
 
-		OnItemClickListener listener = new OnItemClickListener() {
+        csvList.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
+                dialog.dismiss();
 
-			public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
-				dialog.dismiss();
-				
-				Editor e = ep.edit();
+                Editor e = ep.edit();
 
-				e.putString("DROP1", traits[which]);
-				e.commit();
-				
-				MainActivity.partialReload = true;
-				
-				updateSetupList();
-			}
-		};
-						
-		GenericArrayAdapter itemsAdapter = new GenericArrayAdapter(ConfigActivity.this, 
-		R.layout.listitem_a, traits, listener);
-		
-		csvList.setAdapter(itemsAdapter);				
-	
+                e.putString("DROP1", traits[which]);
+                e.commit();
+
+                MainActivity.partialReload = true;
+
+                updateSetupList();
+            }
+        });
+
+        ArrayAdapter<String> itemsAdapter = new ArrayAdapter<String>(this, R.layout.listitem_a, traits);
+		csvList.setAdapter(itemsAdapter);
 		dialog.show();
 	}
 	
@@ -1940,6 +1997,7 @@ public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
 	
 		dialog.show();
 	}
+
     private void showFieldFileDialog()
     {
         final Dialog dialog = new Dialog(ConfigActivity.this, android.R.style.Theme_Holo_Light_Dialog);
@@ -2017,39 +2075,49 @@ public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
 
         dialog.show();
     }
+
 	private void showFieldFileCSVDialog()
 	{
 		final Dialog dialog = new Dialog(ConfigActivity.this, android.R.style.Theme_Holo_Light_Dialog);
 
-		dialog.setTitle(getString(R.string.choosefieldfile));
+		dialog.setTitle(getString(R.string.choosefieldfile) + ": " + mUserChoice);
 		dialog.setContentView(R.layout.genericdialog);
-		dialog.setCancelable(true);
-		dialog.setCanceledOnTouchOutside(true);
 
 		ListView csvList = (ListView) dialog.findViewById(R.id.myList);
 		Button csvButton = (Button) dialog.findViewById(R.id.closeBtn);
 		
-		csvButton.setOnClickListener(new OnClickListener(){
-
-			public void onClick(View v) {
-				dialog.dismiss();
-			}
-		});
+		csvButton.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                dialog.dismiss();
+                importDirectory = "";
+            }
+        });
 
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                mUserChoice = "";
+            }
+        });
 
 		OnItemClickListener listener = new OnItemClickListener() {
 
 			public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
 				dialog.dismiss();
-				
-				mChosenFile = mFileList[which];
 
-				Editor e = ep.edit();
+                mUserChoice = mFileList[which];
+				mChosenFile = mUserChoice;
 
-				e.putString("FieldFile", mChosenFile);
+                if(mUserChoice.contains("/")){
+                    loadFileList(CSV,MainActivity.fieldImportPath + importDirectory + "/" + mUserChoice);
+                    importDirectory = importDirectory + "/" + mUserChoice;
+                    showFieldFileCSVDialog();
+                    return;
+                }
 
+				Editor e = ep.edit();
+				e.putString("FieldFile", mChosenFile);
 				e.commit();
-
 				action = DIALOG_LOAD_FIELDFILECSV;
 
 				try
@@ -2090,8 +2158,8 @@ public void onItemClick(AdapterView<?> av, View arg1, int which, long arg3) {
 		GenericArrayAdapter itemsAdapter = new GenericArrayAdapter(ConfigActivity.this, 
 		R.layout.listitem_a, mFileList, listener);
 		
-		csvList.setAdapter(itemsAdapter);				
-	
+		csvList.setAdapter(itemsAdapter);
+
 		dialog.show();
 	}
 
@@ -2601,7 +2669,148 @@ protected void onPostExecute(Integer result) {
 		}
 	}
 
-	@Override
+    private void showDatabaseDialog()
+    {
+        String[] items = new String[3];
+
+        items[0] = getString(R.string.dbreset);
+
+        final Dialog chooseBackupDialog = new Dialog(ConfigActivity.this, android.R.style.Theme_Holo_Light_Dialog);
+        chooseBackupDialog.setTitle(getString(R.string.dbbackup));
+        chooseBackupDialog.setContentView(R.layout.config);
+
+        chooseBackupDialog.setCancelable(true);
+        chooseBackupDialog.setCanceledOnTouchOutside(true);
+
+        setupList = (ListView) chooseBackupDialog.findViewById(R.id.myList);
+
+        Button setupCloseBtn = (Button) chooseBackupDialog.findViewById(R.id.closeBtn);
+
+        setupCloseBtn.setOnClickListener(new OnClickListener(){
+
+            public void onClick(View v) {
+                chooseBackupDialog.dismiss();
+            }
+        });
+
+        final OnItemClickListener setupListener = new OnItemClickListener(){
+
+            public void onItemClick(AdapterView<?> arg0, View arg1, int position,
+                                    long arg3) {
+
+                chooseBackupDialog.dismiss();
+
+                switch (position)
+                {
+                    case 0:
+                        showDatabaseResetDialog1();
+                        break;
+                }
+            }
+        };
+
+        setupList.setAdapter(new GenericArrayAdapter(ConfigActivity.this, R.layout.listitem_a2,
+                items, setupListener));
+
+        chooseBackupDialog.show();
+    }
+
+    // First confirmation
+    private void showDatabaseResetDialog1()
+    {
+        AlertDialog.Builder builder = new AlertDialog.Builder(ConfigActivity.this);
+
+        builder.setTitle(getString(R.string.warning));
+        builder.setMessage(getString(R.string.resetwarning1));
+
+        builder.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener()
+        {
+
+            public void onClick(DialogInterface dialog, int which)
+            {
+                dialog.dismiss();
+                showDatabaseResetDialog2();
+            }
+
+        });
+
+        builder.setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener()
+        {
+
+            public void onClick(DialogInterface dialog, int which)
+            {
+                dialog.dismiss();
+            }
+
+        });
+
+        AlertDialog alert = builder.create();
+        alert.show();
+
+    }
+
+    // Second confirmation
+    private void showDatabaseResetDialog2()
+    {
+        AlertDialog.Builder builder = new AlertDialog.Builder(ConfigActivity.this);
+
+        builder.setTitle(getString(R.string.warning));
+        builder.setMessage(getString(R.string.resetwarning2));
+
+        builder.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener()
+        {
+
+            public void onClick(DialogInterface dialog, int which)
+            {
+                // Delete database
+                MainActivity.dt.deleteDatabase();
+
+                // Clear all existing settings
+                Editor ed = ep.edit();
+                ed.clear();
+                ed.commit();
+
+                dialog.dismiss();
+
+                Toast toast = Toast.makeText(ConfigActivity.this, getString(R.string.resetcomplete), Toast.LENGTH_LONG);
+                toast.show();
+
+                try
+                {
+                    ConfigActivity.thisActivity.finish();
+                }
+                catch (Exception e)
+                {
+
+                }
+
+                try
+                {
+                    MainActivity.thisActivity.finish();
+                }
+                catch (Exception f)
+                {
+
+                }
+            }
+
+        });
+
+        builder.setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener()
+        {
+
+            public void onClick(DialogInterface dialog, int which)
+            {
+                dialog.dismiss();
+            }
+
+        });
+
+        AlertDialog alert = builder.create();
+        alert.show();
+    }
+
+    @Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		new MenuInflater(ConfigActivity.this).inflate(R.menu.configmenu, menu);
 						
@@ -2623,7 +2832,15 @@ public boolean onCreateOptionsMenu(Menu menu) {
 		return true;
 	}
 
-
+/*
+Editor e = ep.edit();
+				e.putString("Latitude", "");
+				e.putString("Longitude", "");
+				e.putString("FirstName", "");
+				e.putString("LastName", "");
+				e.commit();
+				finish();
+ */
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 
@@ -2647,16 +2864,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
 				showAboutDialog();
 				break;
 
-			case R.id.quit:
-				Editor e = ep.edit();
-				e.putString("Latitude", "");
-				e.putString("Longitude", "");
-				e.putString("FirstName", "");
-				e.putString("LastName", "");
-				e.commit();
-				finish();				
-				break;
-			
+            case R.id.database:
+                showDatabaseDialog();
+                break;
+
 			case android.R.id.home:
                 if (!ep.getBoolean("ImportFieldFinished", false))
                 {
diff --git a/Field Book/src/com/fieldbook/tracker/DataHelper.java b/Field Book/src/com/fieldbook/tracker/DataHelper.java
index 7bb88a76e..04b23ed26 100644
--- a/Field Book/src/com/fieldbook/tracker/DataHelper.java	
+++ b/Field Book/src/com/fieldbook/tracker/DataHelper.java	
@@ -12,6 +12,7 @@
 import android.util.Log;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -1359,6 +1360,83 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         }
     }
 
+    /**
+     * Delete all tables
+     */
+
+    public void deleteDatabase() {
+        context.deleteDatabase(DATABASE_NAME);
+    }
+
+    /**
+     * Import database
+     */
+    public boolean importDatabase(String filename) throws IOException
+    {
+        String internalPath = "/data/data/com.fieldbook.tracker/databases/" + DATABASE_NAME;
+
+        // Close the SQLiteOpenHelper so it will commit the created empty
+        // database to internal storage.
+        close();
+
+        Log.w("File to copy", MainActivity.backupPath + "/" + filename);
+
+        File newDb = new File(MainActivity.backupPath + "/" + filename);
+        File oldDb = new File(internalPath);
+
+        if (newDb.exists()) {
+            FileUtils.copyFile(new FileInputStream(newDb), new FileOutputStream(oldDb));
+
+            // Access the copied database so SQLiteHelper will cache it and mark
+            // it as created.
+
+            openHelper = new OpenHelper(this.context);
+
+            open();
+
+            return true;
+        }
+
+        throw new IOException("System database in backup directory can't be loaded. Unable to copy.");
+    }
+
+
+    /**
+     * Export database
+     */
+    public boolean exportDatabase(String filename) throws IOException
+    {
+        String internalPath = "/data/data/com.fieldbook.tracker/databases/" + DATABASE_NAME;
+
+        // Close the SQLiteOpenHelper so it will commit the created empty
+        // database to internal storage.
+        close();
+
+        File newDb = new File(MainActivity.backupPath + "/" + filename + ".db");
+        File oldDb = new File(internalPath);
+
+        if (oldDb.exists()) {
+            FileUtils.copyFile(new FileInputStream(oldDb), new FileOutputStream(newDb));
+
+            // Access the copied database so SQLiteHelper will cache it and mark
+            // it as created.
+
+            openHelper = new OpenHelper(this.context);
+            open();
+            return true;
+        }
+
+        throw new IOException("Original system database in app does not exist. Unable to copy.");
+    }
+
+    /**
+     * Drop specified table
+     */
+    public void dropTable(String table) {
+
+        db.execSQL("DROP TABLE IF EXISTS " + table);
+    }
+
     /**
      * V2 - Helper function to copy multiple files from asset to SDCard
      */
diff --git a/Field Book/src/com/fieldbook/tracker/FileUtils.java b/Field Book/src/com/fieldbook/tracker/FileUtils.java
new file mode 100644
index 000000000..b19ad6f70
--- /dev/null
+++ b/Field Book/src/com/fieldbook/tracker/FileUtils.java	
@@ -0,0 +1,31 @@
+package com.fieldbook.tracker;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+
+public class FileUtils {
+	
+    public static void copyFile(FileInputStream fromFile, FileOutputStream toFile) throws IOException {
+        FileChannel fromChannel = null;
+        FileChannel toChannel = null;
+        
+        try {
+            fromChannel = fromFile.getChannel();
+            toChannel = toFile.getChannel();
+            fromChannel.transferTo(0, fromChannel.size(), toChannel);
+        } 
+        finally {
+            try {
+                if (fromChannel != null) {
+                    fromChannel.close();
+                }
+            } finally {
+                if (toChannel != null) {
+                    toChannel.close();
+                }
+            }
+        }
+    }
+}
diff --git a/Field Book/src/com/fieldbook/tracker/MainActivity.java b/Field Book/src/com/fieldbook/tracker/MainActivity.java
index 06885ae00..d746468c2 100644
--- a/Field Book/src/com/fieldbook/tracker/MainActivity.java	
+++ b/Field Book/src/com/fieldbook/tracker/MainActivity.java	
@@ -9,6 +9,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
@@ -115,6 +116,9 @@ public class MainActivity extends SherlockActivity implements OnClickListener {
     private File mPath = new File(Environment.getExternalStorageDirectory()
             + "/fieldBook");
 
+    public static String backupPath = Environment.getExternalStorageDirectory()
+            + "/fieldbook/database";
+
     public static Activity thisActivity;
 
     private TextView traitDetails;
@@ -305,6 +309,16 @@ public void onCreate(Bundle savedInstanceState) {
             startActivity(intent);
         }
 
+        SharedPreferences.Editor ed = ep.edit();
+
+        if (ep.getInt("UpdateVersion",-1) < getVersion()) {
+            ed.putInt("UpdateVersion", getVersion());
+            ed.commit();
+            Intent intent = new Intent();
+            intent.setClass(MainActivity.this, ChangelogActivity.class);
+            startActivity(intent);
+        }
+
     }
 
     private void loadScreen()
@@ -1580,6 +1594,7 @@ private void createDirs()
         createDir(traitPath);
         createDir(fieldImportPath);
         createDir(fieldExportPath);
+        createDir(backupPath);
     }
 
     // Helper function to create a single directory
@@ -4409,10 +4424,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 startActivity(intent);
                 break;
 
-            case R.id.quit:
-                showQuitDialog();
-                break;
-
             case R.id.help:
                 Intent helpIntent = new Intent();
                 helpIntent.setClassName(MainActivity.this,
@@ -5240,38 +5251,13 @@ protected void onPostExecute(Integer result)
         }
     }
 
-    private void showQuitDialog()
-    {
-        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-
-        builder.setTitle(getString(R.string.quit));
-        builder.setMessage(getString(R.string.areyousure));
-
-        builder.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener()
-        {
-
-            public void onClick(DialogInterface dialog, int which)
-            {
-                dialog.dismiss();
-
-                finish();
-            }
-
-        });
-
-        builder.setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener()
-        {
-
-            public void onClick(DialogInterface dialog, int which)
-            {
-                dialog.dismiss();
-            }
-
-        });
-
-        AlertDialog alert = builder.create();
-        alert.show();
-
+    public int getVersion() {
+        int v = 0;
+        try {
+            v = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        return v;
     }
 
     @Override
@@ -5279,7 +5265,6 @@ public boolean onKeyDown(int keyCode, KeyEvent event)
     {
         if ((keyCode == KeyEvent.KEYCODE_BACK))
         {
-            showQuitDialog();
             return true;
         }
         return super.onKeyDown(keyCode, event);
diff --git a/Field Book/src/com/fieldbook/tracker/TraitEditorActivity.java b/Field Book/src/com/fieldbook/tracker/TraitEditorActivity.java
index d8444ee2a..7f0b5ee32 100644
--- a/Field Book/src/com/fieldbook/tracker/TraitEditorActivity.java	
+++ b/Field Book/src/com/fieldbook/tracker/TraitEditorActivity.java	
@@ -247,9 +247,7 @@ public void onItemSelected(AdapterView<?> arg0, View arg1,
                                        int position, long arg3) {
 
                 // Change the layout of the dialog based on the trait
-
                 if (position != currentPosition) {
-                    trait.setText("");
                     def.setText("");
                     minimum.setText("");
                     maximum.setText("");