diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0ca5bf87f..f30cd601c0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,12 +22,13 @@
     <application
         android:name=".EyeSeeTeaApplication"
         android:allowBackup="true"
-        android:icon="@drawable/qualityapp_logo"
+        android:icon="@drawable/pictureapp_logo"
         android:label="@string/app_name"
         android:theme="@style/EyeSeeTheme"
         tools:replace="android:icon" >
 
         <service android:name=".services.SurveyService" android:exported="false"/>
+        <service android:name=".services.PushService" android:exported="false"/>
 
         <meta-data
             android:name="DATABASE"
@@ -86,6 +87,8 @@
                 android:value=".DashboardActivity" />
         </activity>
 
+        <receiver android:name="org.eyeseetea.malariacare.receivers.AlarmPushReceiver"></receiver>
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
diff --git a/app/src/main/assets/Answers.csv b/app/src/main/assets/Answers.csv
index 4db40f386a..5ca9c10042 100644
--- a/app/src/main/assets/Answers.csv
+++ b/app/src/main/assets/Answers.csv
@@ -1,7 +1,7 @@
-1;'RDT';10
+1;'RDT';14
 2;'Sex';10
-3;'Age';12
-4;'Specie';11
+3;'Age';6
+4;'Specie';14
 5;'Treatment';11
 6;'Risk Group';11
 7;'Phone';13
diff --git a/app/src/main/assets/Headers.csv b/app/src/main/assets/Headers.csv
index 8da58ecad0..af1fe3ba01 100644
--- a/app/src/main/assets/Headers.csv
+++ b/app/src/main/assets/Headers.csv
@@ -1 +1 @@
-1;'Malaria Case Surveillance';'Malaria Case Surveillance';1;1
+1;'Health System QIS';'Health System QIS';1;1
diff --git a/app/src/main/assets/OptionAttributes.csv b/app/src/main/assets/OptionAttributes.csv
new file mode 100644
index 0000000000..388ccec60e
--- /dev/null
+++ b/app/src/main/assets/OptionAttributes.csv
@@ -0,0 +1,16 @@
+1;'f38b00'
+2;'00b3e3'
+3;'003745'
+4;'f0d100'
+5;'799900'
+6;'f38b00'
+7;'13a285'
+8;'f0d100'
+9;'799900'
+10;'f38b00'
+11;'00b3e3'
+12;'f0d100'
+13;'799900'
+14;'f0d100'
+15;'00b3e3'
+16;'003745'
diff --git a/app/src/main/assets/Options.csv b/app/src/main/assets/Options.csv
index 99ad3fff79..9b6b55f691 100644
--- a/app/src/main/assets/Options.csv
+++ b/app/src/main/assets/Options.csv
@@ -1,22 +1,16 @@
-1;'Yes';0.00;1;'question_images/rdt_yes.png'
-2;'No';0.00;1;'question_images/rdt_no.png'
-3;'Male';0.00;2;'question_images/sex_male.png'
-4;'Female';0.00;2;'question_images/sex_female.png'
-5;'0-12m';0.00;3;'question_images/age_0m_12m.png'
-6;'1-5years';0.00;3;'question_images/age_1y_5y.png'
-7;'6-15years';0.00;3;'question_images/age_5y_15y.png'
-8;'16-25years';0.00;3;'question_images/age_16y_25y.png'
-9;'26-45years';0.00;3;'question_images/age_26y_45y.png'
-10;'46+years';0.00;3;'question_images/age_46y.png'
-11;'Pf';0.00;4;'question_images/specie_pf.png'
-12;'Pv';0.00;4;'question_images/specie_pv.png'
-13;'Mix';0.00;4;'question_images/specie_mix.png'
-14;'N/A';0.00;4;'question_images/specie_none.png'
-15;'Child';0.00;5;'question_images/treatment_child.png'
-16;'Adolescent';0.00;5;'question_images/treatment_adolescent.png'
-17;'Adult';0.00;5;'question_images/treatment_adult.png'
-18;'Referral';0.00;5;'question_images/treatment_referral.png'
-19;'In the forest?';0.00;6;'question_images/risk_group_forest.png'
-20;'In the plantation?';0.00;6;'question_images/risk_group_plantation.png'
-21;'Another country?';0.00;6;'question_images/risk_group_another_country.png'
-22;'N/A?';0.00;6;'question_images/risk_group_none.png'
+1;'វិជ្ជមាន';'Positive';0.00;1;'question_images/rdt_positive.png';1;'f38b00'
+2;'អវិជ្ជមាន';'Negative';0.00;1;'question_images/rdt_negative.png';2;'00b3e3'
+3;'មិនបានធ្វើតេស្តឈាម';'Not Tested';0.00;1;'question_images/rdt_no_tested.png';3;'003745'
+4;'ប្រុស';'Male';0.00;2;'question_images/sex_male.png';4;'f0d100'
+5;'ស្រី';'Female';0.00;2;'question_images/sex_female.png';5;'799900'
+6;'ចំរុះ(Mixed)';'Mixed';0.00;4;'question_images/specie_mix.png';6;'f38b00'
+7;'ផ្លាស្មូដ្យូម ហ្វាល់ស៊ីប៉ារ៉ូម(Pf)';'Plasmodium falciparum (Pf)';0.00;4;'question_images/specie_pf.png';7;'13a285'
+8;'ផ្លាស្មូដ្យូម វីវ៉ាក់(Pv)';'Plasmodium vivax (Pv)';0.00;4;'question_images/specie_pv.png';8;'f0d100'
+9;'ផ្តល់ឱសថសំរាប់ក្មេង';'Child';0.00;5;'question_images/treatment_child.png';9;'799900'
+10;'ផ្តល់ឱសថសំរាប់មនុស្សជំទង់';'Adolescent';0.00;5;'question_images/treatment_adolescent.png';10;'f38b00'
+11;'ផ្តល់ឱសថសំរាប់មនុស្សធំ';'Adult';0.00;5;'question_images/treatment_adult.png';11;'00b3e3'
+12;'ធ្វើការបញ្ជូន';'Referral';0.00;5;'question_images/treatment_referral.png';12;'f0d100'
+13;'ពីព្រៃ';'Forest';0.00;6;'question_images/risk_group_forest.png';13;'799900'
+14;'ពីចំការ';'Plantation';0.00;6;'question_images/risk_group_plantation.png';14;'f0d100'
+15;'ពីប្រទេសផ្សេងៗ';'Another Country';0.00;6;'question_images/risk_group_another_country.png';15;'00b3e3'
+16;'ផ្សេងៗ';'Other';0.00;6;'question_images/risk_group_none.png';16;'003745'
diff --git a/app/src/main/assets/Programs.csv b/app/src/main/assets/Programs.csv
index 5c38ff1b23..97245fcb78 100644
--- a/app/src/main/assets/Programs.csv
+++ b/app/src/main/assets/Programs.csv
@@ -1 +1 @@
-1;'IrppF3qERB7';'Malaria Case Surveillance Program'
+1;'IrppF3qERB7';'Health System QIS'
diff --git a/app/src/main/assets/Questions.csv b/app/src/main/assets/Questions.csv
index 4f8512482d..a7b2506dfb 100644
--- a/app/src/main/assets/Questions.csv
+++ b/app/src/main/assets/Questions.csv
@@ -1,7 +1,7 @@
-1;'RDT';'Rapid Diagnostic Test - Malaria';;'RDT';'OEdLEjF6Z8p';1;0;0;1;1;
-2;'Sex';'Sex';;'យែនឌ័រ';'uuudizosfpU';2;0;0;1;2;1
-3;'Age';'Age';;'ដែលមានអាយុ';'JMM92njKuSc';3;0;0;1;3;1
-4;'Specie';'Specie';;'ប្រភេទ';'X6RFHreAu0L';4;0;0;1;4;1
-5;'Treatment';'Treatment';;'ការព្យាបាល';'fNpYtVaL7OV';5;0;0;1;5;1
-6;'Risk Group';'Risk Group';;'ក្រុមដែលមានហានិភ័យ';'IR2vkwx9D8H';6;0;0;1;6;1
-7;'Patient Phone Number';'Patient Phone Number';;'លេខទូរស័ព្ទ របស់អ្នកជម្ងឺ';'rDubghVv1L8';7;0;0;1;7;1
+1;'RDT';'What is your patient\'s RDT result?';;'តើលទ្ធផលតេស្តឈាមរបស់អ្នកជំងឺដោយប្រើ ឧបករណ៍ RDT បង្ហាញថាជាអ្វី?';'OEdLEjF6Z8p';1;0;0;1;1;1
+2;'Sex';'Male or Female?';;'ប្រុស ឬ ស្រី?';'uuudizosfpU';2;0;0;1;2;1
+3;'Age';'How old is your patient (years)?';;'តើអ្នកជំងឺរបស់អ្នកមានអាយុប៉ុន្មាន​(ឆ្នាំ)?';'JMM92njKuSc';3;0;0;1;3;1
+4;'Specie';'What type of malaria does your patient have?';;'តើអ្នកជំងឺរបស់អ្នកមានមេរោគគ្រុនចាញ់ប្រភេទអ្វី?';'X6RFHreAu0L';4;0;0;1;4;1
+5;'Treatment';'What type of treatment did you provide?';;'តើការព្យាបាលបែបណាដែលអ្នកផ្តល់ជូនអ្នកជំងឺ?';'fNpYtVaL7OV';5;0;0;1;5;1
+6;'Risk Group';'Where did your patient get malaria?';;'តើអ្នកជំងឺឆ្លងជំងឺគ្រុនចាញ់ពីកន្លែងណា?';'IR2vkwx9D8H';6;0;0;1;6;1
+7;'Phone';'Please enter your patient’s phone number.';;'សូមវាយបញ្ចូលលេខទូរស័ព្ទអ្នកជំងឺ';'rDubghVv1L8';7;0;0;1;7;1
diff --git a/app/src/main/assets/Tabs.csv b/app/src/main/assets/Tabs.csv
index 3d65ecb219..a2505bc0a4 100644
--- a/app/src/main/assets/Tabs.csv
+++ b/app/src/main/assets/Tabs.csv
@@ -1 +1 @@
-1;'Malaria Case Surveillance';1;1;8
+1;'Health System QIS';1;1;8
diff --git a/app/src/main/assets/fonts/KhmerOS.ttf b/app/src/main/assets/fonts/KhmerOS.ttf
new file mode 100644
index 0000000000..7aa5bdcd5b
Binary files /dev/null and b/app/src/main/assets/fonts/KhmerOS.ttf differ
diff --git a/app/src/main/assets/question_images/age_0m_12m.png b/app/src/main/assets/question_images/age_0m_12m.png
deleted file mode 100644
index d022c93e58..0000000000
Binary files a/app/src/main/assets/question_images/age_0m_12m.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/age_16y_25y.png b/app/src/main/assets/question_images/age_16y_25y.png
deleted file mode 100644
index ce9b5e19b9..0000000000
Binary files a/app/src/main/assets/question_images/age_16y_25y.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/age_1y_5y.png b/app/src/main/assets/question_images/age_1y_5y.png
deleted file mode 100644
index af99c17662..0000000000
Binary files a/app/src/main/assets/question_images/age_1y_5y.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/age_26y_45y.png b/app/src/main/assets/question_images/age_26y_45y.png
deleted file mode 100644
index 4c1e1b377e..0000000000
Binary files a/app/src/main/assets/question_images/age_26y_45y.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/age_46y.png b/app/src/main/assets/question_images/age_46y.png
deleted file mode 100644
index a0d6c5a18d..0000000000
Binary files a/app/src/main/assets/question_images/age_46y.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/age_5y_15y.png b/app/src/main/assets/question_images/age_5y_15y.png
deleted file mode 100644
index 4188d3ea7c..0000000000
Binary files a/app/src/main/assets/question_images/age_5y_15y.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/rdt_negative.png b/app/src/main/assets/question_images/rdt_negative.png
new file mode 100644
index 0000000000..b57427f512
Binary files /dev/null and b/app/src/main/assets/question_images/rdt_negative.png differ
diff --git a/app/src/main/assets/question_images/rdt_no.png b/app/src/main/assets/question_images/rdt_no.png
deleted file mode 100644
index 31aec19a30..0000000000
Binary files a/app/src/main/assets/question_images/rdt_no.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/rdt_no_tested.png b/app/src/main/assets/question_images/rdt_no_tested.png
new file mode 100644
index 0000000000..6b6c640551
Binary files /dev/null and b/app/src/main/assets/question_images/rdt_no_tested.png differ
diff --git a/app/src/main/assets/question_images/rdt_positive.png b/app/src/main/assets/question_images/rdt_positive.png
new file mode 100644
index 0000000000..a86cd2b363
Binary files /dev/null and b/app/src/main/assets/question_images/rdt_positive.png differ
diff --git a/app/src/main/assets/question_images/rdt_yes.png b/app/src/main/assets/question_images/rdt_yes.png
deleted file mode 100644
index 5d76a87915..0000000000
Binary files a/app/src/main/assets/question_images/rdt_yes.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/risk_group_another_country.png b/app/src/main/assets/question_images/risk_group_another_country.png
index 07a2a9d31d..7e5fe12617 100644
Binary files a/app/src/main/assets/question_images/risk_group_another_country.png and b/app/src/main/assets/question_images/risk_group_another_country.png differ
diff --git a/app/src/main/assets/question_images/risk_group_forest.png b/app/src/main/assets/question_images/risk_group_forest.png
index 4ca35f088f..18d0d32d1e 100644
Binary files a/app/src/main/assets/question_images/risk_group_forest.png and b/app/src/main/assets/question_images/risk_group_forest.png differ
diff --git a/app/src/main/assets/question_images/risk_group_none.png b/app/src/main/assets/question_images/risk_group_none.png
index fa7304edaf..dcb2275ff4 100644
Binary files a/app/src/main/assets/question_images/risk_group_none.png and b/app/src/main/assets/question_images/risk_group_none.png differ
diff --git a/app/src/main/assets/question_images/risk_group_plantation.png b/app/src/main/assets/question_images/risk_group_plantation.png
index 1aa2f271d1..e3270642ba 100644
Binary files a/app/src/main/assets/question_images/risk_group_plantation.png and b/app/src/main/assets/question_images/risk_group_plantation.png differ
diff --git a/app/src/main/assets/question_images/sex_female.png b/app/src/main/assets/question_images/sex_female.png
index 0fe9c5fe2d..40cb9242a3 100644
Binary files a/app/src/main/assets/question_images/sex_female.png and b/app/src/main/assets/question_images/sex_female.png differ
diff --git a/app/src/main/assets/question_images/sex_male.png b/app/src/main/assets/question_images/sex_male.png
index b8b9d2e790..831c5f5700 100644
Binary files a/app/src/main/assets/question_images/sex_male.png and b/app/src/main/assets/question_images/sex_male.png differ
diff --git a/app/src/main/assets/question_images/specie_mix.png b/app/src/main/assets/question_images/specie_mix.png
index 777e88cd8d..dc73e15ab7 100644
Binary files a/app/src/main/assets/question_images/specie_mix.png and b/app/src/main/assets/question_images/specie_mix.png differ
diff --git a/app/src/main/assets/question_images/specie_none.png b/app/src/main/assets/question_images/specie_none.png
deleted file mode 100644
index ef6de546bc..0000000000
Binary files a/app/src/main/assets/question_images/specie_none.png and /dev/null differ
diff --git a/app/src/main/assets/question_images/specie_pf.png b/app/src/main/assets/question_images/specie_pf.png
index e7342f5549..29e163e2bf 100644
Binary files a/app/src/main/assets/question_images/specie_pf.png and b/app/src/main/assets/question_images/specie_pf.png differ
diff --git a/app/src/main/assets/question_images/specie_pv.png b/app/src/main/assets/question_images/specie_pv.png
index a44a51b95c..9f5846a374 100644
Binary files a/app/src/main/assets/question_images/specie_pv.png and b/app/src/main/assets/question_images/specie_pv.png differ
diff --git a/app/src/main/assets/question_images/treatment_adolescent.png b/app/src/main/assets/question_images/treatment_adolescent.png
index 051fb8698f..5fb848aead 100644
Binary files a/app/src/main/assets/question_images/treatment_adolescent.png and b/app/src/main/assets/question_images/treatment_adolescent.png differ
diff --git a/app/src/main/assets/question_images/treatment_adult.png b/app/src/main/assets/question_images/treatment_adult.png
index 251b42aae4..0db6924c86 100644
Binary files a/app/src/main/assets/question_images/treatment_adult.png and b/app/src/main/assets/question_images/treatment_adult.png differ
diff --git a/app/src/main/assets/question_images/treatment_child.png b/app/src/main/assets/question_images/treatment_child.png
index 301787c7f7..ae2cf90446 100644
Binary files a/app/src/main/assets/question_images/treatment_child.png and b/app/src/main/assets/question_images/treatment_child.png differ
diff --git a/app/src/main/assets/question_images/treatment_referral.png b/app/src/main/assets/question_images/treatment_referral.png
index 3528316cc8..e43dc7dfab 100644
Binary files a/app/src/main/assets/question_images/treatment_referral.png and b/app/src/main/assets/question_images/treatment_referral.png differ
diff --git a/app/src/main/java/org/eyeseetea/malariacare/BaseActivity.java b/app/src/main/java/org/eyeseetea/malariacare/BaseActivity.java
index 170e915b9b..82e92c8e3a 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/BaseActivity.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/BaseActivity.java
@@ -20,9 +20,12 @@
 package org.eyeseetea.malariacare;
 
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.location.Location;
+import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
@@ -34,7 +37,9 @@
 import org.eyeseetea.malariacare.database.model.OrgUnit;
 import org.eyeseetea.malariacare.database.model.Program;
 import org.eyeseetea.malariacare.database.model.Survey;
+import org.eyeseetea.malariacare.database.utils.LocationMemory;
 import org.eyeseetea.malariacare.database.utils.Session;
+import org.eyeseetea.malariacare.layout.listeners.SurveyLocationListener;
 import org.eyeseetea.malariacare.layout.utils.LayoutUtils;
 import org.eyeseetea.malariacare.utils.Utils;
 
@@ -49,6 +54,10 @@ public abstract class BaseActivity extends ActionBarActivity {
      */
     public static final String SETTINGS_CALLER_ACTIVITY = "SETTINGS_CALLER_ACTIVITY";
 
+    private static String TAG=".BaseActivity";
+
+    private SurveyLocationListener locationListener;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
@@ -74,7 +83,7 @@ private void initView(Bundle savedInstanceState){
     /**
      * Customize transitions for these activities
      */
-    protected void initTransition(){
+    protected void initTransition() {
         this.overridePendingTransition(R.transition.anim_slide_in_left, R.transition.anim_slide_out_left);
     }
 
@@ -147,7 +156,7 @@ public void onConfigurationChanged(Configuration newConfig) {
 
     protected void goSettings(){
         Intent intentSettings=new Intent(this,SettingsActivity.class);
-        intentSettings.putExtra(SETTINGS_CALLER_ACTIVITY,this.getClass());
+        intentSettings.putExtra(SETTINGS_CALLER_ACTIVITY, this.getClass());
         startActivity(new Intent(this, SettingsActivity.class));
     }
 
@@ -175,10 +184,43 @@ public void newSurvey(View v){
         survey.save();
         Session.setSurvey(survey);
 
+        //Look for coordinates
+        prepareLocationListener(survey);
+
         //Call Survey Activity
         finishAndGo(SurveyActivity.class);
     }
 
+    private void prepareLocationListener(Survey survey){
+
+        locationListener = new SurveyLocationListener(survey.getId());
+        LocationManager locationManager = (LocationManager) LocationMemory.getContext().getSystemService(Context.LOCATION_SERVICE);
+        if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+            Log.d(TAG, "requestLocationUpdates via GPS");
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
+        }
+
+        if (locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
+            Log.d(TAG, "requestLocationUpdates via NETWORK");
+            locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, locationListener);
+        } else {
+            Location lastLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+
+            if(lastLocation != null) {
+                Log.d(TAG, "location not available via GPS|NETWORK, last know: "+lastLocation);
+                locationListener.saveLocation(lastLocation);
+            }else{
+                String defaultLatitude  = getApplicationContext().getString(R.string.GPS_LATITUDE_DEFAULT);
+                String defaultLongitude = getApplicationContext().getString(R.string.GPS_LONGITUDE_DEFAULT);
+                Location defaultLocation = new Location(getApplicationContext().getString(R.string.GPS_PROVIDER_DEFAULT));
+                defaultLocation.setLatitude(Double.parseDouble(defaultLatitude));
+                defaultLocation.setLongitude(Double.parseDouble(defaultLongitude));
+                Log.d(TAG, "location not available via GPS|NETWORK, default: "+defaultLocation);
+                locationListener.saveLocation(defaultLocation);
+            }
+        }
+    }
+
     /**
      * Finish current activity and launches an activity with the given class
      * @param targetActivityClass Given target activity class
diff --git a/app/src/main/java/org/eyeseetea/malariacare/DashboardActivity.java b/app/src/main/java/org/eyeseetea/malariacare/DashboardActivity.java
index f6d3cc292f..5ec32d6f92 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/DashboardActivity.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/DashboardActivity.java
@@ -21,21 +21,13 @@
 
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
 
-import org.eyeseetea.malariacare.database.model.OrgUnit;
 import org.eyeseetea.malariacare.database.model.Program;
-import org.eyeseetea.malariacare.database.model.Survey;
-import org.eyeseetea.malariacare.database.model.Tab;
 import org.eyeseetea.malariacare.database.model.User;
 import org.eyeseetea.malariacare.database.utils.PopulateDB;
 import org.eyeseetea.malariacare.database.utils.Session;
@@ -44,17 +36,16 @@
 import org.eyeseetea.malariacare.services.SurveyService;
 
 import java.io.IOException;
-import java.util.List;
 
 
 public class DashboardActivity extends BaseActivity {
 
-    private final static String TAG=".DDetailsActivity";
+    private final static String TAG=".DashboardActivity";
 
-    private LocationListener locationListener;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Log.d(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fragment_dashboard);
 
@@ -82,42 +73,18 @@ protected void initTransition(){
 
     @Override
     public void onResume(){
+        Log.d(TAG, "onResume");
         super.onResume();
 
-        prepareLocationListener();
         AsyncPopulateDB asyncPopulateDB=new AsyncPopulateDB();
         asyncPopulateDB.execute((Void) null);
     }
 
     @Override
     public void onPause(){
+        Log.d(TAG, "onPause");
         super.onPause();
 
-        //No locationListener working no need to unregister
-        if(locationListener==null){
-            return;
-        }
-        LocationManager locationManager=(LocationManager)this.getSystemService(Context.LOCATION_SERVICE);
-        locationManager.removeUpdates(locationListener);
-    }
-
-    private void prepareLocationListener(){
-        locationListener=new DashboardLocationListener();
-        LocationManager locationManager=(LocationManager)this.getSystemService(Context.LOCATION_SERVICE);
-        if(locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)){
-            Log.d(TAG,"requestLocationUpdates via GPS");
-            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,0,0,locationListener);
-        }
-
-        if(locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)){
-            Log.d(TAG,"requestLocationUpdates via NETWORK");
-            locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER,0,0,locationListener);
-        }else{
-            locationListener=null;
-            Location lastLocation=locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-            Log.d(TAG,"location not available via GPS|NETWORK, last know: "+lastLocation);
-            Session.setLocation(lastLocation);
-        }
     }
 
     public void getSurveysFromService(){
@@ -217,27 +184,4 @@ private void initDataIfRequired() throws IOException {
         }
     }
 
-    public class DashboardLocationListener implements LocationListener{
-
-        @Override
-        public void onLocationChanged(Location location) {
-            Log.d(TAG,"onLocationChanged "+location.toString());
-            Session.setLocation(location);
-        }
-
-        @Override
-        public void onStatusChanged(String provider, int status, Bundle extras) {
-
-        }
-
-        @Override
-        public void onProviderEnabled(String provider) {
-
-        }
-
-        @Override
-        public void onProviderDisabled(String provider) {
-
-        }
-    }
 }
diff --git a/app/src/main/java/org/eyeseetea/malariacare/EyeSeeTeaApplication.java b/app/src/main/java/org/eyeseetea/malariacare/EyeSeeTeaApplication.java
index 672bb24b27..4b6aa85f34 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/EyeSeeTeaApplication.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/EyeSeeTeaApplication.java
@@ -30,6 +30,7 @@
 import org.eyeseetea.malariacare.database.model.Survey;
 import org.eyeseetea.malariacare.database.model.User;
 import org.eyeseetea.malariacare.database.model.Value;
+import org.eyeseetea.malariacare.database.utils.LocationMemory;
 
 import io.fabric.sdk.android.Fabric;
 
@@ -42,6 +43,7 @@ public class EyeSeeTeaApplication extends com.orm.SugarApp {
     public void onCreate() {
         super.onCreate();
         Fabric.with(this, new Crashlytics());
+        LocationMemory.getInstance().init(getApplicationContext());
         // Not previously populated tables
         CompositeScore.saveInTx();
         QuestionRelation.saveInTx();
diff --git a/app/src/main/java/org/eyeseetea/malariacare/database/model/Option.java b/app/src/main/java/org/eyeseetea/malariacare/database/model/Option.java
index d11004245a..cb8a75b9f7 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/database/model/Option.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/database/model/Option.java
@@ -8,18 +8,24 @@ public class Option extends SugarRecord<Option> {
     //FIXME A 'Yes' answer shows children questions, this should be configurable by some additional attribute in Option
     public static final String CHECKBOX_YES_OPTION="Yes";
 
+    String code;
     String name;
     Float factor;
     Answer answer;
     String path;
+    OptionAttribute optionAttribute;
+    String background_colour;
 
     public Option() {
     }
 
-    public Option(String name, Float factor, Answer answer) {
+    public Option(String name, Float factor, Answer answer, String code, OptionAttribute optionAttribute, String background_colour) {
         this.name = name;
         this.factor = factor;
         this.answer = answer;
+        this.code = code;
+        this.optionAttribute = optionAttribute;
+        this.background_colour = background_colour;
     }
 
     public Option(String name) {
@@ -42,6 +48,14 @@ public void setFactor(Float factor) {
         this.factor = factor;
     }
 
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public Answer getAnswer() {
         return answer;
     }
@@ -58,6 +72,22 @@ public void setPath(String path) {
         this.path = path;
     }
 
+    public OptionAttribute getOptionAttribute() {
+        return optionAttribute;
+    }
+
+    public void setOptionAttribute(OptionAttribute optionAttribute) {
+        this.optionAttribute = optionAttribute;
+    }
+
+    public String getBackground_colour() {
+        return background_colour;
+    }
+
+    public void setBackground_colour(String background_colour) {
+        this.background_colour = background_colour;
+    }
+
     /**
      * Checks if this option actives the children questions
      * @return true: Children questions should be shown, false: otherwise.
@@ -81,9 +111,12 @@ public boolean is(String given){
     public String toString() {
         return "Option{" +
                 "name='" + name + '\'' +
+                ", code=" + code +
                 ", factor=" + factor +
                 ", answer=" + answer +
                 ", path=" + path +
+                ", optionAttribute=" + optionAttribute +
+                ", background_colour=" + background_colour +
                 '}';
     }
 
@@ -96,8 +129,11 @@ public boolean equals(Object o) {
 
         if (answer != null ? !answer.equals(option.answer) : option.answer != null) return false;
         if (factor != null ? !factor.equals(option.factor) : option.factor != null) return false;
+        if (code != null ? !code.equals(option.code) : option.code != null) return false;
         if (name != null ? !name.equals(option.name) : option.name != null) return false;
         if (path != null ? !path.equals(option.path) : option.path != null) return false;
+        if (optionAttribute != null ? !optionAttribute.equals(option.optionAttribute) : option.optionAttribute != null) return false;
+        if (background_colour != null ? !background_colour.equals(option.background_colour) : option.background_colour != null) return false;
 
         return true;
     }
@@ -105,9 +141,12 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + (code != null ? code.hashCode() : 0);
         result = 31 * result + (factor != null ? factor.hashCode() : 0);
         result = 31 * result + (answer != null ? answer.hashCode() : 0);
+        result = 31 * result + (optionAttribute != null ? optionAttribute.hashCode() : 0);
         result = 31 * result + (path != null ? path.hashCode() : 0);
+        result = 31 * result + (background_colour != null ? background_colour.hashCode() : 0);
         return result;
     }
 }
diff --git a/app/src/main/java/org/eyeseetea/malariacare/database/model/OptionAttribute.java b/app/src/main/java/org/eyeseetea/malariacare/database/model/OptionAttribute.java
new file mode 100644
index 0000000000..0c0708c764
--- /dev/null
+++ b/app/src/main/java/org/eyeseetea/malariacare/database/model/OptionAttribute.java
@@ -0,0 +1,48 @@
+package org.eyeseetea.malariacare.database.model;
+
+import com.orm.SugarRecord;
+
+
+public class OptionAttribute extends SugarRecord<OptionAttribute> {
+
+
+    String background_colour;
+
+    public OptionAttribute() {
+    }
+
+    public OptionAttribute(String background_colour) {
+        this.background_colour = background_colour;
+    }
+
+    public String getBackground_colour() {
+        return background_colour;
+    }
+
+    public void setBackground_colour(String background_colour) {
+        this.background_colour = background_colour;
+    }
+
+    @Override
+    public String toString() {
+        return "OptionAttribute{" +
+                "background_colour='" + background_colour + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        OptionAttribute that = (OptionAttribute) o;
+
+        return !(background_colour != null ? !background_colour.equals(that.background_colour) : that.background_colour != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return background_colour != null ? background_colour.hashCode() : 0;
+    }
+}
diff --git a/app/src/main/java/org/eyeseetea/malariacare/database/model/Survey.java b/app/src/main/java/org/eyeseetea/malariacare/database/model/Survey.java
index b6394f945f..3da0429a7c 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/database/model/Survey.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/database/model/Survey.java
@@ -30,9 +30,12 @@
 import org.eyeseetea.malariacare.database.utils.SurveyAnsweredRatioCache;
 import org.eyeseetea.malariacare.utils.Constants;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 public class Survey extends SugarRecord<Survey> {
 
@@ -182,7 +185,7 @@ private SurveyAnsweredRatio reloadSurveyAnsweredRatio(){
         int numAnswered = Value.countBySurvey(this);
 
         for (Value value : this.getValuesFromParentQuestions()) {
-            if (value.isAYes()) {
+            if (value.isAPositive()) {
                 //There might be children no answer questions that should be skipped
                 for(Question childQuestion:value.getQuestion().getQuestionChildren()){
                     numOptional+=(childQuestion.getAnswer().getOutput()==Constants.NO_ANSWER)?0:1;
@@ -322,7 +325,24 @@ public boolean isRDT(){
 
         Value rdtValue=_values.get(0);
 
-        return rdtValue.isAYes();
+        return rdtValue.isAPositive();
+    }
+
+    /**
+     * Since there are three possible values first question (RDT):'Positive','Negative','Not Tested'
+     * @return String
+     */
+    public String getRDT() {
+        String rdtValue = "";
+        if (_values == null) {
+            _values = Value.listAllBySurvey(this);
+        }
+
+        if (_values.size() > 0) {
+            Value firstValue = _values.get(0);
+            rdtValue = firstValue.getOption().getName();
+        }
+        return rdtValue;
     }
 
     /**
@@ -334,12 +354,41 @@ public String getValuesToString(){
             return "";
         }
 
-        String valuesStr="";
         Iterator<Value> iterator=_values.iterator();
-        while(iterator.hasNext()){
-            valuesStr+=iterator.next().getValue();
-            if(iterator.hasNext()){
-                valuesStr+=", ";
+
+        String valuesStr="";
+        boolean valid = true;
+
+        //Define a filter to select which values will be turned into string by code_question
+        List<String> codeQuestionFilter = new ArrayList<String>() {{
+            add("Specie");  //4
+            add("Sex");     //2
+            add("Age");     //3
+        }};
+
+        Map mapa = new HashMap<String, String>();
+        while(iterator.hasNext() && valid){
+            Value value = iterator.next();
+            String qCode = value.getQuestion().getCode();
+
+            // RDT is the first field: if it is not Positive no values are shown
+            if(("RDT").equals(qCode) && !value.isAPositive()){
+                valid = false;
+            }else{
+                if(codeQuestionFilter.contains(qCode)) {
+                    String val = (value.getOption()!=null)?value.getOption().getCode():value.getValue();
+                    mapa.put(qCode, val);
+                }
+            }
+        }
+
+        if(valid) {
+            //Sort values
+            for(int i=0; i<codeQuestionFilter.size(); i++){
+                valuesStr += mapa.get(codeQuestionFilter.get(i));
+                if (i < codeQuestionFilter.size()-1) {
+                    valuesStr += ", ";
+                }
             }
         }
 
diff --git a/app/src/main/java/org/eyeseetea/malariacare/database/model/Value.java b/app/src/main/java/org/eyeseetea/malariacare/database/model/Value.java
index 0b8e3d2a3f..ede991a1e2 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/database/model/Value.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/database/model/Value.java
@@ -81,11 +81,27 @@ public boolean belongsToAParentQuestion(){
     }
 
     /**
-     * The value is 'Yes' from a dropdown
+     * The value is 'Positive' from a dropdown
      * @return true|false
      */
-    public boolean isAYes() {
-        return getOption() != null && getOption().getName().equals("Yes");
+    public boolean isAPositive() {
+        return getOption() != null && getOption().getName().equals("Positive");
+    }
+
+    /**
+     * The value is 'Negative' from a dropdown
+     * @return true|false
+     */
+    public boolean isANegative() {
+        return getOption() != null && getOption().getName().equals("Negative");
+    }
+
+    /**
+     * The value is 'isANotTested' from a dropdown
+     * @return true|false
+     */
+    public boolean isANotTested() {
+        return getOption() != null && getOption().getName().equals("Not Tested");
     }
 
     public static int countBySurvey(Survey survey){
diff --git a/app/src/main/java/org/eyeseetea/malariacare/database/utils/LocationMemory.java b/app/src/main/java/org/eyeseetea/malariacare/database/utils/LocationMemory.java
new file mode 100644
index 0000000000..8a8695adea
--- /dev/null
+++ b/app/src/main/java/org/eyeseetea/malariacare/database/utils/LocationMemory.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2015.
+ *
+ * This file is part of QA App.
+ *
+ *  Health Network QIS App is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Health Network QIS App is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.eyeseetea.malariacare.database.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.location.Location;
+import android.location.LocationManager;
+import android.preference.PreferenceManager;
+
+/**
+ * Created by arrizabalaga on 23/09/15.
+ */
+public class LocationMemory {
+
+    private static final String PREFIX_LATITUDE="LAT";
+    private static final String PREFIX_LONGITUDE="LNG";
+
+    /**
+     * Singleton reference
+     */
+    private static LocationMemory instance;
+
+    /**
+     * App context required to recover sharedpreferences
+     */
+    static Context context;
+
+    private LocationMemory(){ }
+
+    /**
+     * Init method required to hold a reference to the app context
+     * @param context
+     */
+    public void init(Context context){
+        this.context=context;
+    }
+
+    /**
+     * Singleton method
+     * @return
+     */
+    public static LocationMemory getInstance(){
+        if(instance==null){
+            instance=new LocationMemory();
+        }
+        return instance;
+    }
+
+    /**
+     * Saves the coordinates for the given survey into internal shared preferences
+     * @param idSurvey
+     * @param location
+     */
+    public synchronized static void put(long idSurvey, Location location){
+        if(location==null){
+            return;
+        }
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(instance.context);
+        SharedPreferences.Editor editor=sharedPreferences.edit();
+        editor.putFloat(PREFIX_LONGITUDE + idSurvey, (float) location.getLongitude());
+        editor.putFloat(PREFIX_LATITUDE + idSurvey, (float) location.getLatitude());
+        editor.commit();
+    }
+
+    /**
+     * Gets the coordinates for a given survey id from the shared preferences
+     * @param idSurvey
+     * @return A Location if it is stored in preferences, null otherwise
+     */
+    public static Location get(long idSurvey){
+        Location location=new Location(LocationManager.GPS_PROVIDER);
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(instance.context);
+
+        float longitude=sharedPreferences.getFloat(PREFIX_LONGITUDE+idSurvey, 0f);
+        float latitude=sharedPreferences.getFloat(PREFIX_LATITUDE+idSurvey, 0f);
+
+        //No coordinates were stored for the given survey
+        if(longitude==0 && latitude==0){
+            return null;
+        }
+
+        //Found
+        location.setLongitude(longitude);
+        location.setLatitude(latitude);
+        return location;
+    }
+
+    /**
+     * Gets the app context
+     * @return
+     */
+    public static Context getContext(){
+        return instance.context;
+    }
+
+}
diff --git a/app/src/main/java/org/eyeseetea/malariacare/database/utils/PopulateDB.java b/app/src/main/java/org/eyeseetea/malariacare/database/utils/PopulateDB.java
index dc41b06160..394a0b6c57 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/database/utils/PopulateDB.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/database/utils/PopulateDB.java
@@ -8,6 +8,7 @@
 import org.eyeseetea.malariacare.database.model.CompositeScore;
 import org.eyeseetea.malariacare.database.model.Header;
 import org.eyeseetea.malariacare.database.model.Option;
+import org.eyeseetea.malariacare.database.model.OptionAttribute;
 import org.eyeseetea.malariacare.database.model.OrgUnit;
 import org.eyeseetea.malariacare.database.model.Program;
 import org.eyeseetea.malariacare.database.model.Question;
@@ -27,18 +28,21 @@ public class PopulateDB {
     public static final String TABS_CSV = "Tabs.csv";
     public static final String HEADERS_CSV = "Headers.csv";
     public static final String ANSWERS_CSV = "Answers.csv";
+    public static final String OPTION_ATTRIBUTES_CSV = "OptionAttributes.csv";
     public static final String OPTIONS_CSV = "Options.csv";
     public static final String QUESTIONS_CSV = "Questions.csv";
     static Map<Integer, Program> programList = new LinkedHashMap<Integer, Program>();
     static Map<Integer, Tab> tabList = new LinkedHashMap<Integer, Tab>();
     static Map<Integer, Header> headerList = new LinkedHashMap<Integer, Header>();
     static Map<Integer, Question> questionList = new LinkedHashMap<Integer, Question>();
+    static Map<Integer, OptionAttribute> optionAttributeList = new LinkedHashMap<Integer, OptionAttribute>();
     static Map<Integer, Option> optionList = new LinkedHashMap<Integer, Option>();
     static Map<Integer, Answer> answerList = new LinkedHashMap<Integer, Answer>();
 
+
     public static void populateDB(AssetManager assetManager) throws IOException {
 
-        List<String> tables2populate = Arrays.asList(PROGRAMS_CSV, TABS_CSV, HEADERS_CSV, ANSWERS_CSV, OPTIONS_CSV, QUESTIONS_CSV);
+        List<String> tables2populate = Arrays.asList(PROGRAMS_CSV, TABS_CSV, HEADERS_CSV, ANSWERS_CSV, OPTION_ATTRIBUTES_CSV, OPTIONS_CSV, QUESTIONS_CSV);
 
         CSVReader reader = null;
         for (String table : tables2populate) {
@@ -75,12 +79,21 @@ public static void populateDB(AssetManager assetManager) throws IOException {
                         answer.setOutput(Integer.valueOf(line[2]));
                         answerList.put(Integer.valueOf(line[0]), answer);
                         break;
+                    case OPTION_ATTRIBUTES_CSV:
+                        OptionAttribute optionAttribute = new OptionAttribute();
+                        optionAttribute.setBackground_colour(line[1]);
+                        optionAttributeList.put(Integer.valueOf(line[0]), optionAttribute);
+                        break;
                     case OPTIONS_CSV:
                         Option option = new Option();
-                        option.setName(line[1]);
-                        option.setFactor(Float.valueOf(line[2]));
-                        option.setAnswer(answerList.get(Integer.valueOf(line[3])));
-                        option.setPath(line[4]);
+                        option.setCode(line[1]);
+                        option.setName(line[2]);
+                        option.setFactor(Float.valueOf(line[3]));
+                        option.setAnswer(answerList.get(Integer.valueOf(line[4])));
+                        option.setPath(line[5]);
+                        if (!line[6].equals(""))
+                        option.setOptionAttribute(optionAttributeList.get(Integer.valueOf(line[6])));
+                        option.setBackground_colour(line[7]);
                         optionList.put(Integer.valueOf(line[0]), option);
                         break;
                     case QUESTIONS_CSV:
@@ -110,6 +123,7 @@ public static void populateDB(AssetManager assetManager) throws IOException {
         Tab.saveInTx(tabList.values());
         Header.saveInTx(headerList.values());
         Answer.saveInTx(answerList.values());
+//        OptionAttribute.saveInTx(optionAttributeList.values());
         Option.saveInTx(optionList.values());
         Question.saveInTx(questionList.values());
     }
diff --git a/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardSentFragment.java b/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardSentFragment.java
index 5c4e2765be..216c0a3646 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardSentFragment.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardSentFragment.java
@@ -85,10 +85,8 @@ public int getShownIndex() {
 
     @Override
     public void onCreate(Bundle savedInstanceState){
-        super.onCreate(savedInstanceState);
-
         Log.d(TAG, "onCreate");
-        registerSurveysReceiver();
+        super.onCreate(savedInstanceState);
     }
 
     @Override
@@ -103,18 +101,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle sav
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
+        Log.d(TAG, "onActivityCreated");
         super.onActivityCreated(savedInstanceState);
 
-        Log.d(TAG, "onActivityCreated");
         initAdapter();
         initListView();
-
     }
 
     @Override
     public void onResume(){
         Log.d(TAG, "onResume");
-//        getSurveysFromService();
+        registerSurveysReceiver();
         super.onResume();
     }
 
@@ -264,17 +261,6 @@ public void  unregisterSurveysReceiver(){
         }
     }
 
-    /**
-     * Asks SurveyService for the current list of surveys
-     */
-    private void getSurveysFromService(){
-        Log.d(TAG, "getSurveysFromService");
-        Activity activity=getActivity();
-        Intent surveysIntent=new Intent(activity, SurveyService.class);
-        surveysIntent.putExtra(SurveyService.SERVICE_METHOD,SurveyService.ALL_SENT_SURVEYS_ACTION);
-        activity.startService(surveysIntent);
-    }
-
     public void reloadSurveys(List<Survey> newListSurveys){
         Log.d(TAG, "reloadSurveys (Thread: "+Thread.currentThread().getId()+"): " + newListSurveys.size());
         this.surveys.clear();
diff --git a/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardUnsentFragment.java b/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardUnsentFragment.java
index 47ab212815..a5694b838b 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardUnsentFragment.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/fragments/DashboardUnsentFragment.java
@@ -45,9 +45,10 @@
 import org.eyeseetea.malariacare.layout.adapters.dashboard.AssessmentUnsentAdapter;
 import org.eyeseetea.malariacare.layout.adapters.dashboard.IDashboardAdapter;
 import org.eyeseetea.malariacare.layout.listeners.SwipeDismissListViewTouchListener;
+import org.eyeseetea.malariacare.network.PushClient;
 import org.eyeseetea.malariacare.network.PushResult;
+import org.eyeseetea.malariacare.receivers.AlarmPushReceiver;
 import org.eyeseetea.malariacare.services.SurveyService;
-import org.eyeseetea.malariacare.network.PushClient;
 import org.eyeseetea.malariacare.views.TextCard;
 
 import java.util.ArrayList;
@@ -64,6 +65,7 @@ public class DashboardUnsentFragment extends ListFragment {
     private List<Survey> surveys;
     protected IDashboardAdapter adapter;
     private static int index = 0;
+    private AlarmPushReceiver alarmPush;
 
     public DashboardUnsentFragment(){
         this.adapter = Session.getAdapterUncompleted();
@@ -88,10 +90,9 @@ public int getShownIndex() {
 
     @Override
     public void onCreate(Bundle savedInstanceState){
-        super.onCreate(savedInstanceState);
-
         Log.d(TAG, "onCreate");
-        registerSurveysReceiver();
+        alarmPush = new AlarmPushReceiver();
+        super.onCreate(savedInstanceState);
     }
 
     @Override
@@ -106,12 +107,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle sav
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
+        Log.d(TAG, "onActivityCreated");
         super.onActivityCreated(savedInstanceState);
 
-        Log.d(TAG, "onActivityCreated");
         initAdapter();
         initListView();
+    }
+
 
+    @Override
+    public void onResume(){
+        Log.d(TAG, "onResume");
+        registerSurveysReceiver();
+        super.onResume();
     }
 
     /**
@@ -287,12 +295,25 @@ public void  unregisterSurveysReceiver(){
     }
 
     public void reloadSurveys(List<Survey> newListSurveys){
-        Log.d(TAG, "reloadSurveys (Thread: "+Thread.currentThread().getId()+"): " + newListSurveys.size());
+        Log.d(TAG, "reloadSurveys (Thread: " + Thread.currentThread().getId() + "): " + newListSurveys.size());
         this.surveys.clear();
         this.surveys.addAll(newListSurveys);
         this.adapter.notifyDataSetChanged();
         setListShown(true);
     }
+
+    public void manageSurveysAlarm(List<Survey> newListSurveys){
+        Log.d(TAG, "setSurveysAlarm (Thread: " + Thread.currentThread().getId() + "): " + newListSurveys.size());
+
+        // if survey list is not empty: run periodic task for survey push otherwise cancel active alarm
+        if(!newListSurveys.isEmpty()) {
+            alarmPush.setPushAlarm(getActivity());
+        }else{
+            alarmPush.cancelPushAlarm(getActivity());
+        }
+    }
+
+
     /**
      * Inner private class that receives the result from the service
      */
@@ -306,6 +327,7 @@ public void onReceive(Context context, Intent intent) {
             if(SurveyService.ALL_UNSENT_SURVEYS_ACTION.equals(intent.getAction())) {
                 List<Survey> surveysUnsentFromService = (List<Survey>) Session.popServiceValue(SurveyService.ALL_UNSENT_SURVEYS_ACTION);
                 reloadSurveys(surveysUnsentFromService);
+                manageSurveysAlarm(surveysUnsentFromService);
             }
         }
     }
diff --git a/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/dashboard/AAssessmentAdapter.java b/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/dashboard/AAssessmentAdapter.java
index 9febdf07d4..74758acbaa 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/dashboard/AAssessmentAdapter.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/dashboard/AAssessmentAdapter.java
@@ -21,20 +21,17 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import org.eyeseetea.malariacare.R;
 import org.eyeseetea.malariacare.database.model.Survey;
-import org.eyeseetea.malariacare.database.utils.SurveyAnsweredRatio;
 import org.eyeseetea.malariacare.layout.utils.LayoutUtils;
 import org.eyeseetea.malariacare.views.TextCard;
 
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 public abstract class AAssessmentAdapter extends ADashboardAdapter implements IDashboardAdapter {
@@ -77,10 +74,25 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         //RDT
         TextCard rdt = (TextCard) rowView.findViewById(R.id.rdt);
-        rdt.setText(survey.isRDT()?"+":"-");
+        //Since there are three possible values first question (RDT):'Yes','No','Cancel'
+        //rdt.setText(survey.isRDT()?"+":"-");
+        String rdtValue = survey.getRDT();
+        String rdtSymbol = rdtValue;
+        if(rdtValue.equals(getContext().getResources().getString(R.string.rdtPositive))){
+            rdtSymbol = getContext().getResources().getString(R.string.symbolPlus);
+        }else if(rdtValue.equals(getContext().getResources().getString(R.string.rdtNegative))){
+            rdtSymbol = getContext().getResources().getString(R.string.symbolMinus);
+        }else if(rdtValue.equals(getContext().getResources().getString(R.string.rdtNotTested))){
+            rdtSymbol = getContext().getResources().getString(R.string.symbolCross);
+        }
+        rdt.setText(rdtSymbol);
 
         //INFO
         TextCard info = (TextCard) rowView.findViewById(R.id.info);
+        //Load a font which support Khmer character
+        Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/" + "KhmerOS.ttf");
+        info.setTypeface(tf);
+
         info.setText(survey.getValuesToString());
 
         rowView.setBackgroundResource(LayoutUtils.calculateBackgrounds(position));
diff --git a/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/DynamicTabAdapter.java b/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/DynamicTabAdapter.java
index f815d0efb6..a7fb70897e 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/DynamicTabAdapter.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/DynamicTabAdapter.java
@@ -25,31 +25,32 @@
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Point;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
+import android.os.Handler;
 import android.telephony.PhoneNumberFormattingTextWatcher;
 import android.text.Editable;
+import android.text.Html;
+import android.text.InputFilter;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.Display;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.AdapterView;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
@@ -65,19 +66,17 @@
 import org.eyeseetea.malariacare.database.model.Question;
 import org.eyeseetea.malariacare.database.model.Tab;
 import org.eyeseetea.malariacare.database.model.Value;
-import org.eyeseetea.malariacare.database.utils.PreferencesState;
 import org.eyeseetea.malariacare.database.utils.ReadWriteDB;
 import org.eyeseetea.malariacare.database.utils.Session;
 import org.eyeseetea.malariacare.layout.adapters.survey.progress.ProgressTabStatus;
-import org.eyeseetea.malariacare.layout.utils.LayoutUtils;
 import org.eyeseetea.malariacare.utils.Constants;
 import org.eyeseetea.malariacare.utils.Utils;
-import org.eyeseetea.malariacare.views.EditCard;
 import org.eyeseetea.malariacare.views.TextCard;
-import org.eyeseetea.malariacare.views.UncheckeableRadioButton;
+import org.eyeseetea.malariacare.views.filters.MinMaxInputFilter;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -99,6 +98,11 @@ public class DynamicTabAdapter extends BaseAdapter implements ITabAdapter {
      */
     private boolean isSwipeAdded;
 
+    /**
+     * Listener that detects taps on buttons & swipe
+     */
+    private OnSwipeTouchListener swipeTouchListener;
+
     //List of Headers and Questions. Each position contains an object to be showed in the listview
     List<Object> items;
     Tab tab;
@@ -114,17 +118,6 @@ public class DynamicTabAdapter extends BaseAdapter implements ITabAdapter {
      */
     private boolean readOnly;
 
-    //Store the Views references for each row (to avoid many calls to getViewById)
-    static class ViewHolder {
-        //Label
-        public TextCard statement;
-
-        // Main component in the row: Spinner, EditText or RadioGroup
-        public View component;
-
-        public int type;
-    }
-
     public DynamicTabAdapter(Tab tab, Context context) {
         this.lInflater = LayoutInflater.from(context);
         this.context = context;
@@ -168,24 +161,68 @@ private ProgressTabStatus initProgress(List<Question> questions){
         return new ProgressTabStatus(questions);
     }
 
-    public void addOnSwipeListener(ListView listView){
+    public void addOnSwipeListener(final ListView listView){
         if(isSwipeAdded){
             return;
         }
 
-        listView.setOnTouchListener(new OnSwipeTouchListener(context) {
+        swipeTouchListener=new OnSwipeTouchListener(context) {
+            /**
+             * Click listener for image option
+             * @param view
+             */
+            public void onClick(View view) {
+                Log.d(TAG, "onClick");
+                Option selectedOption=(Option)view.getTag();
+                Question question=progressTabStatus.getCurrentQuestion();
+                ReadWriteDB.saveValuesDDL(question, selectedOption);
+
+                ViewGroup vgTable = (ViewGroup) view.getParent().getParent();
+                for (int rowPos = 0; rowPos < vgTable.getChildCount(); rowPos++) {
+                    ViewGroup vgRow = (ViewGroup) vgTable.getChildAt(rowPos);
+                    for (int itemPos = 0; itemPos < vgRow.getChildCount(); itemPos++) {
+                        View childItem = vgRow.getChildAt(itemPos);
+                        if (childItem instanceof ImageView) {
+                            Option otherOption=(Option)childItem.getTag();
+                            if(selectedOption.getId() != otherOption.getId()){
+                                overshadow((ImageView) childItem, otherOption);
+                            }
+                        }
+                    }
+                }
+
+                highlightSelection(view, selectedOption);
+                finishOrNext();
+            }
+
+            /**
+             * Swipe right listener moves to previous question
+             */
             public void onSwipeRight() {
-                Log.d(TAG,"onSwipeRight(previous)");
+                Log.d(TAG, "onSwipeRight(previous)");
+
+                //Hide keypad
+                hideKeyboard(listView.getContext(), listView);
+
                 previous();
             }
 
+            /**
+             * Swipe left listener moves to next question
+             */
             public void onSwipeLeft() {
                 Log.d(TAG,"onSwipeLeft(next)");
                 if(readOnly || progressTabStatus.isNextAllowed()) {
+
+                    //Hide keypad
+                    hideKeyboard(listView.getContext(), listView);
+
                     next();
                 }
             }
-        });
+        };
+
+        listView.setOnTouchListener(swipeTouchListener);
     }
 
 
@@ -215,7 +252,6 @@ public Float getScore() {
     public void initializeSubscore() {
     }
 
-
     @Override
     public String getName() {
         return tab.getName();
@@ -248,6 +284,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         //Question
         TextCard headerView=(TextCard) rowView.findViewById(R.id.question);
+        //Load a font which support Khmer character
+        Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/" + "KhmerOS.ttf");
+        headerView.setTypeface(tf);
         headerView.setText(question.getForm_name());
 
         //Progress
@@ -255,12 +294,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
         progressView.setMax(progressTabStatus.getTotalPages());
         progressView.setProgress(progressTabStatus.getCurrentPage()+1);
         TextView progressText=(TextView)rowView.findViewById(R.id.dynamic_progress_text);
-        progressText.setText(progressTabStatus.getStatusAsString());
+        progressText.setText(getLocaleProgressStatus(progressView.getProgress(), progressView.getMax()));
 
         //Options
         TableLayout tableLayout=(TableLayout)rowView.findViewById(R.id.options_table);
 
-
         TableRow tableRow=null;
         int typeQuestion=question.getAnswer().getOutput();
         switch (typeQuestion){
@@ -268,29 +306,157 @@ public View getView(int position, View convertView, ViewGroup parent) {
             case Constants.IMAGES_4:
             case Constants.IMAGES_6:
                 List<Option> options = question.getAnswer().getOptions();
+                swipeTouchListener.clearClickableViews();
                 for(int i=0;i<options.size();i++){
+                    Option currentOption = options.get(i);
                     int mod=i%2;
                     //First item per row requires a new row
                     if(mod==0){
                         tableRow=(TableRow)lInflater.inflate(R.layout.dynamic_tab_row,tableLayout,false);
                         tableLayout.addView(tableRow);
                     }
-                    ImageButton button = (ImageButton) tableRow.getChildAt(mod);
+                    ImageView imageButton = (ImageView) tableRow.getChildAt(mod);
+                    String backGColor = currentOption.getOptionAttribute() != null ? currentOption.getOptionAttribute().getBackground_colour() : currentOption.getBackground_colour();
+                    imageButton.setBackgroundColor(Color.parseColor("#" + backGColor));
 
-                    initOptionButton(button, options.get(i), value);
+                    initOptionButton(imageButton, currentOption, value, parent);
                 }
+                break;
+            case Constants.IMAGES_3:
+                List<Option> opts = question.getAnswer().getOptions();
+                swipeTouchListener.clearClickableViews();
+                for(int i=0;i<opts.size();i++){
+
+                    tableRow=(TableRow)lInflater.inflate(R.layout.dynamic_tab_row_singleitem,tableLayout,false);
+                    tableLayout.addView(tableRow);
 
+                    ImageView imageButton = (ImageView) tableRow.getChildAt(0);
+
+                    Option currentOption = opts.get(i);
+
+                    String backGColor = currentOption.getOptionAttribute() != null ? currentOption.getOptionAttribute().getBackground_colour() : currentOption.getBackground_colour();
+                    imageButton.setBackgroundColor(Color.parseColor("#" + backGColor));
+
+                    initOptionButton(imageButton, currentOption, value, parent);
+                }
                 break;
             case Constants.PHONE:
+                swipeTouchListener.clearClickableViews();
                 tableRow=(TableRow)lInflater.inflate(R.layout.dynamic_tab_phone_row, tableLayout, false);
                 tableLayout.addView(tableRow);
-                initPhoneValue(tableRow,value);
+                initPhoneValue(tableRow, value);
+                break;
+            case Constants.POSITIVE_INT:
+                swipeTouchListener.clearClickableViews();
+                tableRow=(TableRow)lInflater.inflate(R.layout.dynamic_tab_positiveint_row, tableLayout, false);
+                tableLayout.addView(tableRow);
+                initPositiveIntValue(tableRow, value);
                 break;
         }
         rowView.requestLayout();
         return rowView;
     }
 
+    /**
+     * Get status progress in locale strings
+     * @param currentPage
+     * @param totalPages
+     */
+    private String getLocaleProgressStatus(int currentPage, int totalPages){
+
+        String current = context.getResources().getString(context.getResources().getIdentifier("number_"+currentPage, "string", context.getPackageName()));
+        String total = context.getResources().getString(context.getResources().getIdentifier("number_"+totalPages, "string", context.getPackageName()));
+        return current.concat("/").concat(total);
+    }
+
+
+    private void showKeyboard(Context c, View v){
+        InputMethodManager keyboard = (InputMethodManager) c.getSystemService(Context.INPUT_METHOD_SERVICE);
+        keyboard.showSoftInput(v, 0);
+
+    }
+
+    private void hideKeyboard(Context c, View v){
+        InputMethodManager keyboard = (InputMethodManager) c.getSystemService(Context.INPUT_METHOD_SERVICE);
+        keyboard.hideSoftInputFromWindow(v.getWindowToken(), 0);
+    }
+
+
+    /**
+     * Inits editText and button to view/edit a (positive) integer
+     * @param tableRow
+     * @param value
+     */
+    private void initPositiveIntValue(TableRow tableRow, Value value){
+        Button button=(Button)tableRow.findViewById(R.id.dynamic_positiveInt_btn);
+        final EditText editText=(EditText)tableRow.findViewById(R.id.dynamic_positiveInt_edit);
+        final Context ctx = tableRow.getContext();
+
+        //Has value? show it
+        if(value!=null){
+            editText.setText(value.getValue());
+        }
+
+        //Editable? add listener
+        if(!readOnly){
+
+            editText.setFilters(new InputFilter[]{
+                    new InputFilter.LengthFilter(Constants.MAX_INT_AGE),
+                    new MinMaxInputFilter(0, null)
+            });
+
+            editText.addTextChangedListener(new TextWatcher(){
+                public void onTextChanged(CharSequence s, int start, int before, int count){
+                    // Not allowed zero at the beginning for values greater than zero
+                    if (editText.getText().length()>1 && editText.getText().toString().matches("^0[0-9]") ){
+                        editText.setText("");
+                    }
+                }
+                public void beforeTextChanged(CharSequence s, int start, int count, int after){}
+                public void afterTextChanged(Editable s){}
+            });
+
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    View parentView = (View) v.getParent();
+                    EditText editText = (EditText) parentView.findViewById(R.id.dynamic_positiveInt_edit);
+                    String positiveIntValue = editText.getText().toString();
+
+                    //Required, empty values rejected
+                    if (positiveIntValue == null || "".equals(positiveIntValue)) {
+                        editText.setError(context.getString(R.string.dynamic_error_age));
+                        return;
+                    }
+
+                    //Hide keypad
+                    hideKeyboard(ctx, v);
+
+                    Question question = progressTabStatus.getCurrentQuestion();
+                    ReadWriteDB.saveValuesText(question, positiveIntValue);
+                    finishOrNext();
+                }
+            });
+
+        }else{
+            editText.setEnabled(false);
+            button.setEnabled(false);
+        }
+
+        //Add button to listener
+        swipeTouchListener.addClickableView(button);
+
+        //Take focus to this view
+        editText.requestFocus();
+        editText.postDelayed(new Runnable() {
+           @Override
+           public void run() {
+               //Show keypad
+               showKeyboard(ctx, editText);
+           }
+       }, 300); //use 300 to make it run when coming back from lock screen
+    }
+
     /**
      * Inits editText and button to view/edit the phone number
      * @param tableRow
@@ -298,7 +464,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
      */
     private void initPhoneValue(TableRow tableRow, Value value){
         Button button=(Button)tableRow.findViewById(R.id.dynamic_phone_btn);
-        EditText editText=(EditText)tableRow.findViewById(R.id.dynamic_phone_edit);
+        final EditText editText=(EditText)tableRow.findViewById(R.id.dynamic_phone_edit);
+        final Context ctx = tableRow.getContext();
 
         //Has value? show it
         if(value!=null){
@@ -307,6 +474,7 @@ private void initPhoneValue(TableRow tableRow, Value value){
 
         //Editable? add listener
         if(!readOnly){
+
             editText.addTextChangedListener(new PhoneNumberFormattingTextWatcher());
             button.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -315,25 +483,27 @@ public void onClick(View v) {
                     EditText editText = (EditText) parentView.findViewById(R.id.dynamic_phone_edit);
                     String phoneValue = editText.getText().toString();
 
-                    //Required, empty values rejected
+                    //Optional, empty values allowed
                     if (phoneValue == null || "".equals(phoneValue)) {
-                        editText.setError(context.getString(R.string.dynamic_error_phone_format));
-                        return;
+                        phoneValue = "";
+                    }else {
+                        // Check phone number format
+                        Phonenumber.PhoneNumber phoneNumber = null;
+                        try {
+                            Locale locale = context.getResources().getConfiguration().locale;
+                            phoneNumber = PhoneNumberUtil.getInstance().parse(phoneValue, locale.getCountry());
+                        } catch (NumberParseException e) {
+                            editText.setError(context.getString(R.string.dynamic_error_phone_format));
+                            return;
+                        }
+                        if(!PhoneNumberUtil.getInstance().isValidNumber(phoneNumber)){
+                            editText.setError(context.getString(R.string.dynamic_error_phone_format));
+                            return;
+                        }
                     }
 
-                    // Check phone number format
-                    Phonenumber.PhoneNumber phoneNumber = null;
-                    try {
-                        Locale locale = context.getResources().getConfiguration().locale;
-                        phoneNumber = PhoneNumberUtil.getInstance().parse(phoneValue, locale.getCountry());
-                    } catch (NumberParseException e) {
-                        editText.setError(context.getString(R.string.dynamic_error_phone_format));
-                        return;
-                    }
-                    if(!PhoneNumberUtil.getInstance().isValidNumber(phoneNumber)){
-                        editText.setError(context.getString(R.string.dynamic_error_phone_format));
-                        return;
-                    }
+                    //Hide keypad
+                    hideKeyboard(ctx, v);
 
                     Question question = progressTabStatus.getCurrentQuestion();
                     ReadWriteDB.saveValuesText(question, phoneValue);
@@ -344,6 +514,19 @@ public void onClick(View v) {
             editText.setEnabled(false);
             button.setEnabled(false);
         }
+
+        //Add button to listener
+        swipeTouchListener.addClickableView(button);
+
+        //Take focus to this view
+        editText.requestFocus();
+        editText.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                //Show keypad
+                showKeyboard(ctx, editText);
+            }
+        }, 300);
     }
 
     /**
@@ -351,16 +534,16 @@ public void onClick(View v) {
      * @param button
      * @param option
      */
-    private void initOptionButton(ImageButton button, Option option, Value value){
+    private void initOptionButton(ImageView button, Option option, Value value, ViewGroup parent){
+
+        // value = null --> first time calling initOptionButton
         //Highlight button
-        if(value!=null && value.getValue().equals(option.getName())){
-            Drawable selectedBackground=context.getResources().getDrawable(R.drawable.background_dynamic_clicked_option);
-            if(android.os.Build.VERSION.SDK_INT> Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1){
-                button.setBackground(selectedBackground);
-            }else {
-                button.setBackgroundDrawable(selectedBackground);
-            }
+        if (value != null && value.getValue().equals(option.getName())) {
+            highlightSelection(button, option);
+        } else if (value != null) {
+            overshadow(button, option);
         }
+
         //Put image
         try {
             InputStream inputStream = context.getAssets().open(option.getPath());
@@ -378,73 +561,66 @@ private void initOptionButton(ImageButton button, Option option, Value value){
             return;
         }
 
-        //Add listener
-//        button.setOnClickListener(new View.OnClickListener() {
-//              @Override
-//              public void onClick(View v) {
-//                  Log.d(TAG, "onClick");
-//                  Option selectedOption=(Option)v.getTag();
-//                  Question question=progressTabStatus.getCurrentQuestion();
-//                  ReadWriteDB.saveValuesDDL(question, selectedOption);
-//                  finishOrNext();
-//              }
-//            }
-//        );
-        button.setOnTouchListener(new OnSwipeTouchListener(button,context) {
-
-            public void onClick(View view){
-                Log.d(TAG, "onClick");
-                Option selectedOption=(Option)view.getTag();
-                Question question=progressTabStatus.getCurrentQuestion();
-                ReadWriteDB.saveValuesDDL(question, selectedOption);
-                finishOrNext();
-            }
+        //Add button to listener
+        swipeTouchListener.addClickableView(button);
 
-            public void onSwipeRight() {
-                previous();
-            }
-
-            public void onSwipeLeft() {
-                if (readOnly || progressTabStatus.isNextAllowed()) {
-                    next();
-                }
-            }
-        });
     }
 
     /**
-     * Advance to the next question or finish survey according to question  and value.
+     * @param view
+     * @param option
      */
-    private void finishOrNext(){
-        Question question=progressTabStatus.getCurrentQuestion();
-        Value value = question.getValueBySession();
-        if(isDone(value)){
-            showDone();
-            return;
+    private void highlightSelection(View view, Option option){
+        Drawable selectedBackground = context.getResources().getDrawable(R.drawable.background_dynamic_clicked_option);
+        if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN) {    //JELLY_BEAN=API16
+            view.setBackground(selectedBackground);
+        } else {
+            view.setBackgroundDrawable(selectedBackground);
         }
-        next();
-    }
 
+        GradientDrawable bgShape = (GradientDrawable)view.getBackground();
+        String backGColor = option.getOptionAttribute() != null ? option.getOptionAttribute().getBackground_colour() : option.getBackground_colour();
+        bgShape.setColor(Color.parseColor("#" + backGColor));
+
+        bgShape.setStroke(3, Color.WHITE);
+
+        ImageView v = (ImageView) view;
+        v.clearColorFilter();
+    }
 
     /**
-     * Enables/Disables input view according to the state of the survey.
-     * Sent surveys cannot be modified.
-     *
      * @param view
      */
-    private void updateReadOnly(View view) {
-        if (view == null) {
-            return;
+    private void overshadow(ImageView view, Option option){
+
+        //FIXME: (API17) setColorFilter for view.getBackground() has no effect...
+        view.getBackground().setColorFilter(Color.parseColor("#805a595b"), PorterDuff.Mode.SRC_ATOP);
+        view.setColorFilter(Color.parseColor("#805a595b"));
+
+        Drawable bg = view.getBackground();
+        if(bg instanceof GradientDrawable) {
+            GradientDrawable bgShape = (GradientDrawable)bg;
+            bgShape.setStroke(0, 0);
         }
+    }
 
-        if (view instanceof RadioGroup) {
-            RadioGroup radioGroup = (RadioGroup) view;
-            for (int i = 0; i < radioGroup.getChildCount(); i++) {
-                radioGroup.getChildAt(i).setEnabled(!readOnly);
+    /**
+     * Advance to the next question with delay applied or finish survey according to question and value.
+     */
+    private void finishOrNext(){
+        final Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                Question question = progressTabStatus.getCurrentQuestion();
+                Value value = question.getValueBySession();
+                if (isDone(value)) {
+                    showDone();
+                    return;
+                }
+                next();
             }
-        } else {
-            view.setEnabled(!readOnly);
-        }
+        }, 1000);
     }
 
     /**
@@ -452,14 +628,23 @@ private void updateReadOnly(View view) {
      */
     private void showDone(){
         final Activity activity=(Activity)context;
-        new AlertDialog.Builder((activity))
+        AlertDialog.Builder msgConfirmation = new AlertDialog.Builder((activity))
                 .setTitle(R.string.survey_title_completed)
                 .setMessage(R.string.survey_info_completed)
-                .setNeutralButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.send, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int arg1) {
-                        ((SurveyActivity)activity).finishAndGo(DashboardActivity.class);
+                        ((SurveyActivity) activity).finishAndGo(DashboardActivity.class);
                     }
-                }).create().show();
+                });
+        if(!progressTabStatus.isFirstQuestion()){
+            msgConfirmation.setNegativeButton(R.string.review, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int arg1) {
+                    review();
+                }
+            });
+        }
+
+        msgConfirmation.create().show();
     }
 
     /**
@@ -468,8 +653,8 @@ public void onClick(DialogInterface dialog, int arg1) {
      * @return
      */
     private boolean isDone(Value value){
-        //First question  + NO => true
-        if(progressTabStatus.isFirstQuestion() && !value.isAYes()){
+        //First question + NO => true
+        if(progressTabStatus.isFirstQuestion() && !value.isAPositive()){
             return true;
         }
 
@@ -501,226 +686,129 @@ private void previous(){
         notifyDataSetChanged();
     }
 
-
-    public void setValues(ViewHolder viewHolder, Question question) {
-
-        switch (question.getAnswer().getOutput()) {
-            case Constants.DATE:
-            case Constants.SHORT_TEXT:
-            case Constants.INT:
-            case Constants.LONG_TEXT:
-            case Constants.POSITIVE_INT:
-            case Constants.PHONE:
-                ((EditCard) viewHolder.component).setText(ReadWriteDB.readValueQuestion(question));
-                break;
-            case Constants.DROPDOWN_LIST:
-            case Constants.IMAGES_2:
-            case Constants.IMAGES_4:
-            case Constants.IMAGES_6:
-                ((Spinner) viewHolder.component).setSelection(ReadWriteDB.readPositionOption(question));
-                break;
-            case Constants.RADIO_GROUP_HORIZONTAL:
-            case Constants.RADIO_GROUP_VERTICAL:
-                Value value = question.getValueBySession();
-                if (value != null) {
-                    ((UncheckeableRadioButton) viewHolder.component.findViewWithTag(value.getOption())).setChecked(true);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-
     /**
-     * Do the logic after a DDL option change
-     * @param viewHolder private class that acts like a cache to quickly access the different views
-     * @param question the question that changes his value
-     * @param option the option that has been selected
+     * Back to initial question to review questions
      */
-    private void itemSelected(ViewHolder viewHolder, Question question, Option option) {
-        // Write option to DB
-        ReadWriteDB.saveValuesDDL(question, option);
-    }
-
-    private View initialiseView(int resource, ViewGroup parent, Question question, ViewHolder viewHolder, int position) {
-        View rowView = lInflater.inflate(resource, parent, false);
-        if (question.hasChildren())
-            rowView.setBackgroundResource(R.drawable.background_parent);
-        else
-            rowView.setBackgroundResource(LayoutUtils.calculateBackgrounds(position));
-
-        viewHolder.component = rowView.findViewById(R.id.answer);
-        viewHolder.statement = (TextCard) rowView.findViewById(R.id.statement);
-        viewHolder.statement.setText(question.getForm_name());
-
-        return rowView;
-    }
+    private void review(){
 
-    private void initialiseScorableComponent(View rowView, ViewHolder viewHolder) {
-        configureViewByPreference(viewHolder);
-    }
-
-    private void createRadioGroupComponent(Question question, ViewHolder viewHolder, int orientation) {
-        ((RadioGroup) viewHolder.component).setOrientation(orientation);
-
-        for (Option option : question.getAnswer().getOptions()) {
-            UncheckeableRadioButton button = (UncheckeableRadioButton) lInflater.inflate(R.layout.uncheckeable_radiobutton, null);
-            button.setOption(option);
-            button.updateProperties(PreferencesState.getInstance().getScale(), this.context.getString(R.string.font_size_level1), this.context.getString(R.string.medium_font_name));
-            ((RadioGroup) viewHolder.component).addView(button);
-        }
-
-        //Add Listener
-        ((RadioGroup) viewHolder.component).setOnCheckedChangeListener(new RadioGroupListener(question, viewHolder));
-    }
-
-    /**
-     * Set visibility of numerators and denominators depending on the user preference selected in the settings activity
-     *
-     * @param viewHolder view that holds the component to be more efficient
-     */
-    private void configureViewByPreference(ViewHolder viewHolder) {
-        float statementWeight = 0.65f;
-        float componentWeight = 0.35f;
-
-        if (PreferencesState.getInstance().isShowNumDen()) {
-            statementWeight = 0.45f;
-            componentWeight = 0.25f;
-        }
-
-        ((RelativeLayout) viewHolder.statement.getParent()).setLayoutParams(new LinearLayout.LayoutParams(0, RelativeLayout.LayoutParams.WRAP_CONTENT, statementWeight));
-        ((RelativeLayout) viewHolder.component.getParent().getParent()).setLayoutParams(new LinearLayout.LayoutParams(0, RelativeLayout.LayoutParams.WRAP_CONTENT, componentWeight));
+        progressTabStatus.getFirstQuestion();
+        notifyDataSetChanged();
     }
 
-    //////////////////////////////////////
-    /////////// LISTENERS ////////////////
-    //////////////////////////////////////
-    private class TextViewListener implements TextWatcher {
-        private boolean viewCreated;
-        private Question question;
-
-        public TextViewListener(boolean viewCreated, Question question) {
-            this.viewCreated = viewCreated;
-            this.question = question;
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            if (viewCreated) {
-                ReadWriteDB.saveValuesText(question, s.toString());
-            } else {
-                viewCreated = true;
-            }
-        }
-    }
+    public class OnSwipeTouchListener implements View.OnTouchListener {
 
-    private class SpinnerListener implements AdapterView.OnItemSelectedListener {
+        /**
+         * Custom gesture detector
+         */
+        private final GestureDetector gestureDetector;
 
-        private boolean viewCreated;
-        private ViewHolder viewHolder;
-        private Question question;
+        /**
+         * List of clickable items inside the swipable view (buttons)
+         */
+        private final List<View> clickableViews;
 
-        public SpinnerListener(boolean viewCreated, Question question, ViewHolder viewHolder) {
-            this.viewCreated = viewCreated;
-            this.question = question;
-            this.viewHolder = viewHolder;
+        public OnSwipeTouchListener (Context ctx){
+            gestureDetector = new GestureDetector(ctx, new GestureListener());
+            clickableViews =new ArrayList<>();
         }
 
         @Override
-        public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
-            if (viewCreated) {
-                itemSelected(viewHolder, question, (Option) ((Spinner) viewHolder.component).getItemAtPosition(pos));
-            } else {
-                viewCreated = true;
-            }
+        /**
+         * Delegates any touch into the our custom gesture detector
+         */
+        public boolean onTouch(View v, MotionEvent event) {
+//            Log.d(TAG, "onTouch: " + v.toString() + "\t (" + this.toString() + ")");
+            return gestureDetector.onTouchEvent(event);
         }
 
-        @Override
-        public void onNothingSelected(AdapterView<?> parent) {
-
+        /**
+         * Adds a clickable view
+         * @param view
+         */
+        public void addClickableView(View view){
+            clickableViews.add(view);
         }
-    }
-
-    public class RadioGroupListener implements RadioGroup.OnCheckedChangeListener {
-        private ViewHolder viewHolder;
-        private Question question;
 
-        public RadioGroupListener(Question question, ViewHolder viewHolder) {
-            this.question = question;
-            this.viewHolder = viewHolder;
+        /**
+         * Clears the list of clickable items
+         */
+        public void clearClickableViews(){
+            clickableViews.clear();
         }
 
-        @Override
-        public void onCheckedChanged(RadioGroup group, int checkedId) {
-            if(!group.isShown()){
-                return;
+        /**
+         * Calculates de clickable view that has been 'clicked' in the given event
+         * @param event
+         * @return Returns de touched view or null otherwise
+         */
+        public View findViewByCoords(MotionEvent event){
+            float x=event.getRawX();
+            float y=event.getRawY();
+            for(View v: clickableViews){
+                Rect visibleRectangle = new Rect();
+                v.getGlobalVisibleRect(visibleRectangle);
+                //Image/Button clicked
+//                Log.d(TAG,String.format("findViewByCoords(%d,%d,%d,%d)",visibleRectangle.left,visibleRectangle.top,visibleRectangle.right, visibleRectangle.bottom));
+                if(x>=visibleRectangle.left && x<=visibleRectangle.right && y>=visibleRectangle.top && y<=visibleRectangle.bottom){
+                    return v;
+                }
             }
 
-            Option option = new Option(Constants.DEFAULT_SELECT_OPTION);
-            if (checkedId != -1) {
-                UncheckeableRadioButton uncheckeableRadioButton = (UncheckeableRadioButton) (this.viewHolder.component).findViewById(checkedId);
-                option = (Option) uncheckeableRadioButton.getTag();
-            }
-            itemSelected(viewHolder, question, option);
+            return null;
         }
-    }
-
-    public class OnSwipeTouchListener implements View.OnTouchListener {
-
-        private final GestureDetector gestureDetector;
-
-        private final View view;
 
-        public OnSwipeTouchListener (Context ctx){
-            gestureDetector = new GestureDetector(ctx, new GestureListener());
-            view=null;
+        public void onClick(View view){
+//            Log.e(".DynamicTabAdapter", "empty onclick");
         }
 
-        public OnSwipeTouchListener (View v, Context ctx){
-            gestureDetector = new GestureDetector(ctx, new GestureListener());
-            view=v;
+        public void onSwipeRight(){
+//            Log.e(TAG, "onSwipeRight(DEFAULT)");
         }
 
-        @Override
-        public boolean onTouch(View v, MotionEvent event) {
-            return gestureDetector.onTouchEvent(event);
+        public void onSwipeLeft(){
+//            Log.e(TAG, "onSwipeLeft(DEFAULT)");
         }
 
+        /**
+         * Our own custom gesture detector that distinguishes between onFling and a SingleTap
+         */
         private final class GestureListener extends GestureDetector.SimpleOnGestureListener {
 
             private static final int SWIPE_THRESHOLD = 50;
             private static final int SWIPE_VELOCITY_THRESHOLD = 50;
 
+            private float lastX;
+
             @Override
             public boolean onSingleTapConfirmed(MotionEvent event){
-                Log.d(TAG, "onSingleTapConfirmed");
-                onClick(view);
-                return true;
+//              Log.d(TAG, String.format("onSingleTapConfirmed: %f %f", event.getX(), event.getY()));
+
+                //Find the clicked button
+                View clickedView=findViewByCoords(event);
+
+                //If found
+                if(clickedView!=null) {
+                    //delegate onClick
+                    onClick(clickedView);
+                    return true;
+                }
+                
+                //Not found, not consumed
+                return false;
             }
 
             @Override
             public boolean onDown(MotionEvent e) {
-                Log.d(TAG, "onDown: "+e.getX());
+                lastX=e.getX();
+//                Log.d(TAG, "onDown: "+lastX);
                 return true;
             }
 
             @Override
             public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-                boolean result = false;
                 try {
-                    float diffX = e2.getX() - safeGetX(e1);
-                    Log.d(TAG, "onFling: diffX: "+diffX);
+                    float diffX = e2.getX()-((e1==null)?lastX:e1.getX());
+//                    Log.d(TAG, String.format("onFling (%f): diffX: %f, velocityX: %f",lastX, diffX, velocityX));
                     if (Math.abs(diffX) > SWIPE_THRESHOLD && Math.abs(velocityX) > SWIPE_VELOCITY_THRESHOLD) {
                         if (diffX > 0) {
                             onSwipeRight();
@@ -728,39 +816,14 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
                             onSwipeLeft();
                         }
                     }
-                    result = true;
-
+                    return true;
                 } catch (Exception exception) {
                     exception.printStackTrace();
                 }
-                return result;
+                return false;
             }
         }
 
-        /**
-         * Sometimes event1 comes as NULL, this is a workaround to solve this
-         * @param event
-         * @return
-         */
-        private float safeGetX(MotionEvent event){
-            if(event==null){
-                WindowManager windowManager = (WindowManager) context
-                        .getSystemService(Context.WINDOW_SERVICE);
-                Display display = windowManager.getDefaultDisplay();
-                Point size = new Point();
-                display.getSize(size);
-                return (float)size.x;
-            }
-            return event.getX();
-        }
-
-        public void onClick(View view){
-            Log.e(".DynamicTabAdapter", "empty onclick");
-        }
-
-        public void onSwipeRight(){}
-
-        public void onSwipeLeft(){}
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/progress/ProgressTabStatus.java b/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/progress/ProgressTabStatus.java
index 68939d34e9..012f2c2685 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/progress/ProgressTabStatus.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/layout/adapters/survey/progress/ProgressTabStatus.java
@@ -118,6 +118,19 @@ public Question getPreviousQuestion(){
         return questions.get(currentPage);
     }
 
+    /**
+     * Gets the first question in the list
+     * @return
+     */
+    public Question getFirstQuestion(){
+        if(getTotalPages()==0){
+            return null;
+        }
+
+        currentPage=0;
+        return questions.get(currentPage);
+    }
+
     /**
      * Checks if the current question is the first one
      * @return true|false
diff --git a/app/src/main/java/org/eyeseetea/malariacare/layout/listeners/SurveyLocationListener.java b/app/src/main/java/org/eyeseetea/malariacare/layout/listeners/SurveyLocationListener.java
new file mode 100644
index 0000000000..f475eaa996
--- /dev/null
+++ b/app/src/main/java/org/eyeseetea/malariacare/layout/listeners/SurveyLocationListener.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2015.
+ *
+ * This file is part of QA App.
+ *
+ *  Health Network QIS App is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Health Network QIS App is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.eyeseetea.malariacare.layout.listeners;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import org.eyeseetea.malariacare.database.utils.LocationMemory;
+
+/**
+ * Basic location listener that persist coordinates associated to every survey in preferences (probably to review)
+ * Created by arrizabalaga on 23/09/15.
+ */
+public class SurveyLocationListener implements LocationListener {
+
+    private static String TAG=".SurveyLocation";
+    private long idSurvey;
+
+    public SurveyLocationListener(long idSurvey){
+        this.idSurvey=idSurvey;
+    }
+
+    public void saveLocation(Location location){
+        LocationMemory.put(idSurvey, location);
+    }
+
+    /**
+     * Listens for 1 locationChange event
+     * @param location
+     */
+    @Override
+    public void onLocationChanged(Location location) {
+        Log.d(TAG, String.format("onLocationChanged idSurvey:%d location: %s", idSurvey, location.toString()));
+        //Save location
+        saveLocation(location);
+
+        //No more updates
+        LocationManager locationManager=(LocationManager)LocationMemory.getContext().getSystemService(Context.LOCATION_SERVICE);
+        locationManager.removeUpdates(this);
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+    }
+}
diff --git a/app/src/main/java/org/eyeseetea/malariacare/layout/utils/LayoutUtils.java b/app/src/main/java/org/eyeseetea/malariacare/layout/utils/LayoutUtils.java
index 9544770bf3..974bcf7268 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/layout/utils/LayoutUtils.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/layout/utils/LayoutUtils.java
@@ -304,10 +304,10 @@ public static int getNumberOfQuestionParentsHeader(Header header) {
 
     // Used to setup the usual actionbar with the logo and the app name
     public static void setActionBarLogo(ActionBar actionBar){
-        actionBar.setLogo(R.drawable.qualityapp_logo);
+        actionBar.setLogo(R.drawable.pictureapp_logo);
         actionBar.setDisplayUseLogoEnabled(true);
         actionBar.setDisplayShowHomeEnabled(true);
-        actionBar.setIcon(R.drawable.qualityapp_logo);
+        actionBar.setIcon(R.drawable.pictureapp_logo);
         actionBar.setBackgroundDrawable(new ColorDrawable(Color.WHITE));
     }
 
diff --git a/app/src/main/java/org/eyeseetea/malariacare/network/PushClient.java b/app/src/main/java/org/eyeseetea/malariacare/network/PushClient.java
index 4eb1e641a5..a0a05c9ebc 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/network/PushClient.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/network/PushClient.java
@@ -38,8 +38,8 @@
 import org.eyeseetea.malariacare.database.model.Survey;
 import org.eyeseetea.malariacare.database.model.Tab;
 import org.eyeseetea.malariacare.database.model.Value;
+import org.eyeseetea.malariacare.database.utils.LocationMemory;
 import org.eyeseetea.malariacare.database.utils.PreferencesState;
-import org.eyeseetea.malariacare.database.utils.Session;
 import org.eyeseetea.malariacare.layout.score.ScoreRegister;
 import org.eyeseetea.malariacare.services.SurveyService;
 import org.eyeseetea.malariacare.utils.Constants;
@@ -94,6 +94,10 @@ public PushClient(Survey survey, Activity activity) {
         this.activity = activity;
     }
 
+    public PushClient(Survey survey) {
+        this.survey = survey;
+    }
+
     public PushResult push() {
         try{
             JSONObject data = prepareMetadata();
@@ -109,6 +113,23 @@ public PushResult push() {
         }
     }
 
+    public PushResult pushBackground() {
+        try{
+            JSONObject data = prepareMetadata();
+            data = prepareDataElements(data);
+            PushResult result = new PushResult(pushData(data));
+            if(result.isSuccessful()){
+                //Change status
+                this.survey.setStatus(Constants.SURVEY_SENT);
+                this.survey.save();
+            }
+            return result;
+        }catch(Exception ex){
+            Log.e(TAG, ex.getMessage());
+            return new PushResult(ex);
+        }
+    }
+
     public void updateSurveyState(){
         //Change status
         this.survey.setStatus(Constants.SURVEY_SENT);
@@ -134,20 +155,28 @@ private JSONObject prepareMetadata() throws Exception{
         object.put(TAG_EVENTDATE, android.text.format.DateFormat.format("yyyy-MM-dd", survey.getCompletionDate()));
         object.put(TAG_STATUS, COMPLETED);
         object.put(TAG_STOREDBY, survey.getUser().getName());
-        object.put(TAG_COORDINATE, prepareCoordinates());
+
+        Location lastLocation = LocationMemory.get(survey.getId());
+        //If there is no location (location is required) -> exception
+        if(lastLocation==null){
+            throw new Exception(activity.getString(R.string.dialog_error_push_no_location));
+        }
+        object.put(TAG_COORDINATE, prepareCoordinates(lastLocation));
 
         Log.d(TAG, "prepareMetadata: " + object.toString());
         return object;
     }
 
-    private JSONObject prepareCoordinates() throws Exception{
-        Location lastLocation= Session.getLocation();
-        if(lastLocation==null){
-            throw new Exception(activity.getString(R.string.dialog_error_push_no_location));
+    private JSONObject prepareCoordinates(Location location) throws Exception{
+        JSONObject coordinate = new JSONObject();
+
+        if (location == null) {
+            coordinate.put(TAG_COORDINATE_LAT, JSONObject.NULL);
+            coordinate.put(TAG_COORDINATE_LNG, JSONObject.NULL);
+        } else {
+            coordinate.put(TAG_COORDINATE_LAT, location.getLatitude());
+            coordinate.put(TAG_COORDINATE_LNG, location.getLongitude());
         }
-        JSONObject coordinate=new JSONObject();
-        coordinate.put(TAG_COORDINATE_LAT,lastLocation.getLatitude());
-        coordinate.put(TAG_COORDINATE_LNG,lastLocation.getLongitude());
         return coordinate;
     }
 
diff --git a/app/src/main/java/org/eyeseetea/malariacare/receivers/AlarmPushReceiver.java b/app/src/main/java/org/eyeseetea/malariacare/receivers/AlarmPushReceiver.java
new file mode 100644
index 0000000000..7989ccd4c9
--- /dev/null
+++ b/app/src/main/java/org/eyeseetea/malariacare/receivers/AlarmPushReceiver.java
@@ -0,0 +1,57 @@
+package org.eyeseetea.malariacare.receivers;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+import org.eyeseetea.malariacare.R;
+import org.eyeseetea.malariacare.services.PushService;
+import org.eyeseetea.malariacare.services.SurveyService;
+
+/**
+ * Created by rhardjono on 20/09/2015.
+ */
+public class AlarmPushReceiver extends BroadcastReceiver {
+
+    public static final String TAG = ".AlarmPushReceiver";
+
+    //TODO: period has to be parameterized
+    private static final long SECONDS = 1000;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.d(TAG, "onReceive");
+
+        Intent pushIntent=new Intent(context, PushService.class);
+        pushIntent.putExtra(SurveyService.SERVICE_METHOD, PushService.PENDING_SURVEYS_ACTION);
+        context.startService(pushIntent);
+    }
+
+
+    public void setPushAlarm(Context context) {
+        Log.d(TAG, "setPushAlarm");
+
+        long pushPeriod = Long.parseLong(context.getString(R.string.PUSH_PERIOD));
+        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        Intent intent = new Intent(context, AlarmPushReceiver.class);
+        //Note FLAG_UPDATE_CURRENT
+        PendingIntent pi = PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        am.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), pushPeriod * SECONDS, pi);
+
+        //others modes:
+        //am.setInexactRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), AlarmManager.INTERVAL_FIFTEEN_MINUTES, pi);
+    }
+
+    public void cancelPushAlarm(Context context) {
+        Log.d(TAG, "cancelPushAlarm");
+
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        Intent intent = new Intent(context, AlarmPushReceiver.class);
+        PendingIntent sender = PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        alarmManager.cancel(sender);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/eyeseetea/malariacare/services/PushService.java b/app/src/main/java/org/eyeseetea/malariacare/services/PushService.java
new file mode 100644
index 0000000000..d502b7d47e
--- /dev/null
+++ b/app/src/main/java/org/eyeseetea/malariacare/services/PushService.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2015.
+ *
+ * This file is part of Health Network QIS App.
+ *
+ *  Health Network QIS App is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Health Network QIS App is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.eyeseetea.malariacare.services;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.util.Log;
+
+import org.eyeseetea.malariacare.database.model.Survey;
+import org.eyeseetea.malariacare.network.PushClient;
+import org.eyeseetea.malariacare.network.PushResult;
+
+import java.util.List;
+
+/**
+ * A service that runs pushing process for pending surveys.
+ * Created by rhardjon on 19/09/15.
+ */
+public class PushService extends IntentService {
+
+    /**
+     * Constant added to the intent in order to reuse the service for different 'methods'
+     */
+    public static final String SERVICE_METHOD="serviceMethod";
+
+    /**
+     * Name of 'push all pending surveys' action
+     */
+    public static final String PENDING_SURVEYS_ACTION ="org.eyeseetea.malariacare.services.PushService.PENDING_SURVEYS_ACTION";
+
+    /**
+     * Tag for logging
+     */
+    public static final String TAG = ".PushService";
+
+    /**
+     * Constructor required due to a error message in AndroidManifest.xml if it is not present
+     */
+    public PushService(){
+        super(PushService.class.getSimpleName());
+    }
+
+    /**
+     * Creates an IntentService. Invoked by your subclass's constructor.
+     *
+     * @param name Used to name the worker thread, important only for debugging.
+     */
+    public PushService(String name) {
+        super(name);
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        //Take action to be done
+        switch (intent.getStringExtra(SERVICE_METHOD)){
+            case PENDING_SURVEYS_ACTION:
+                pushAllPendingSurveys();
+                break;
+        }
+    }
+
+    /**
+     * Push all pending surveys
+     */
+    private void pushAllPendingSurveys() {
+        Log.d(TAG,"pushAllPendingSurveys (Thread:"+Thread.currentThread().getId()+")");
+
+        //Select surveys from sql
+        List<Survey> surveys = Survey.getAllUnsentSurveys();
+
+        if(surveys!=null && !surveys.isEmpty()){
+            for(Survey survey : surveys){
+                PushClient pushClient=new PushClient(survey);
+                PushResult result = pushClient.pushBackground();
+                if(result.isSuccessful()){
+                    Log.d(TAG, "Estado del push: OK");
+
+                    //Reload data using service
+                    Intent surveysIntent=new Intent(this, SurveyService.class);
+                    surveysIntent.putExtra(SurveyService.SERVICE_METHOD, SurveyService.RELOAD_DASHBOARD_ACTION);
+                    this.startService(surveysIntent);
+                }else{
+                    Log.d(TAG, "Estado del push: ERROR");
+                }
+            }
+        }
+
+    }
+
+}
diff --git a/app/src/main/java/org/eyeseetea/malariacare/utils/Constants.java b/app/src/main/java/org/eyeseetea/malariacare/utils/Constants.java
index c8ae47341f..34f2ec80b5 100644
--- a/app/src/main/java/org/eyeseetea/malariacare/utils/Constants.java
+++ b/app/src/main/java/org/eyeseetea/malariacare/utils/Constants.java
@@ -15,12 +15,15 @@ public class Constants {
             IMAGES_2 = 10,
             IMAGES_4 = 11,
             IMAGES_6 = 12,
-            PHONE = 13;
+            PHONE = 13,
+            IMAGES_3 = 14;
 
     public static final String DEFAULT_SELECT_OPTION = "";
 
     public static final int MAX_INT_CHARS = 5;
 
+    public static final int MAX_INT_AGE = 2;
+
     // ############# TAB TYPE ###############
     public static final int TAB_AUTOMATIC_SCORED = 0,
             TAB_AUTOMATIC_NON_SCORED = 1,
diff --git a/app/src/main/res/drawable-hdpi/pictureapp_logo.png b/app/src/main/res/drawable-hdpi/pictureapp_logo.png
new file mode 100644
index 0000000000..27b5ff7dba
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/pictureapp_logo.png differ
diff --git a/app/src/main/res/drawable-mdpi/pictureapp_logo.png b/app/src/main/res/drawable-mdpi/pictureapp_logo.png
new file mode 100644
index 0000000000..ae46d879f4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/pictureapp_logo.png differ
diff --git a/app/src/main/res/drawable-xhdpi/pictureapp_logo.png b/app/src/main/res/drawable-xhdpi/pictureapp_logo.png
new file mode 100644
index 0000000000..3f78bd75cd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/pictureapp_logo.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/pictureapp_logo.png b/app/src/main/res/drawable-xxhdpi/pictureapp_logo.png
new file mode 100644
index 0000000000..704629db3f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/pictureapp_logo.png differ
diff --git a/app/src/main/res/drawable/background_dynamic_clicked_option.xml b/app/src/main/res/drawable/background_dynamic_clicked_option.xml
index 19644c5a2e..5f76c8c7b3 100644
--- a/app/src/main/res/drawable/background_dynamic_clicked_option.xml
+++ b/app/src/main/res/drawable/background_dynamic_clicked_option.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <solid android:color="@color/button_material_dark"></solid>
-    <stroke
-        android:width="2dp"
-        android:color="@color/amber" />
+
+    <stroke android:width="2dp" android:color="@color/white" />
+    <padding android:left="3dp" android:top="3dp" android:right="3dp" android:bottom="3dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dynamic_tab_phone_row.xml b/app/src/main/res/layout/dynamic_tab_phone_row.xml
index df1035a347..e517da64e6 100644
--- a/app/src/main/res/layout/dynamic_tab_phone_row.xml
+++ b/app/src/main/res/layout/dynamic_tab_phone_row.xml
@@ -15,6 +15,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:phoneNumber="true"
+            android:background="#d3d3d3"
+            android:imeOptions="actionDone"
+            android:singleLine="true"
             android:layout_margin="10dp"/>
         <Button
             android:id="@+id/dynamic_phone_btn"
diff --git a/app/src/main/res/layout/dynamic_tab_positiveint_row.xml b/app/src/main/res/layout/dynamic_tab_positiveint_row.xml
new file mode 100644
index 0000000000..c5cb5e8c98
--- /dev/null
+++ b/app/src/main/res/layout/dynamic_tab_positiveint_row.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_weight="1">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        >
+        <EditText
+            android:id="@+id/dynamic_positiveInt_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:digits="0123456789"
+            android:background="#d3d3d3"
+            android:imeOptions="actionDone"
+            android:singleLine="true"
+            android:layout_margin="10dp"/>
+        <Button
+            android:id="@+id/dynamic_positiveInt_btn"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:text="@string/ok"
+            android:layout_margin="10dp"
+            />
+
+    </LinearLayout>
+
+</TableRow>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dynamic_tab_row.xml b/app/src/main/res/layout/dynamic_tab_row.xml
index 212696a5c3..e015161305 100644
--- a/app/src/main/res/layout/dynamic_tab_row.xml
+++ b/app/src/main/res/layout/dynamic_tab_row.xml
@@ -4,12 +4,12 @@
     android:layout_width="match_parent"
     android:layout_weight="1"
     >
-    <ImageButton
+    <ImageView
         android:layout_height="match_parent"
         android:layout_weight="0.5"
         android:scaleType="centerInside"
         />
-    <ImageButton
+    <ImageView
         android:layout_height="match_parent"
         android:layout_weight="0.5"
         android:scaleType="centerInside"/>
diff --git a/app/src/main/res/layout/dynamic_tab_row_singleitem.xml b/app/src/main/res/layout/dynamic_tab_row_singleitem.xml
new file mode 100644
index 0000000000..de63edcffa
--- /dev/null
+++ b/app/src/main/res/layout/dynamic_tab_row_singleitem.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_weight="1"
+    >
+    <ImageView
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:scaleType="centerInside"
+        />
+</TableRow>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 23c52b6fda..a16e2e4f18 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,7 +6,9 @@
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="ok">Ok</string>
-    <string name="cancel">Annuler</string>
+    <string name="cancel">Cancelar</string>
+    <string name="review">Revisar</string>
+    <string name="send">Enviar</string>
     <string name="score">Puntuación</string>
     <string name="number_zero">0</string>
     <string name="number_zero_percentage">0 % </string>
@@ -62,7 +64,7 @@
     <string name="assessment_title_facility_date">Centro de salud/ Fecha</string>
     <string name="assessment_title_state">Estado</string>
     <string name="assessment_info_delete">Eliminar</string>
-    <string name="assessment_title_header">Evaluación Activa</string>
+    <string name="assessment_title_header">Pendiente de enviar</string>
 
     <!-- feedback -->
     <!-- XXX Should it be replaced by 'assessment_title_facility_date'?-->
@@ -154,6 +156,8 @@
 
     <!-- dynamic -->
     <string name="dynamic_error_phone_format">El télefono dado no esta bien formateado</string>
+    <string name="dynamic_required_field">Este campo es obligatorio</string>
+    <string name="dynamic_error_age">La edad no es válida</string>
 
     <!-- score -->
     <string name="score_title_clinical_fever">Evaluación\nde fiebre\nclínica</string>
@@ -218,7 +222,7 @@
     <string name="dialog_error_push_no_location">Localización no disponible</string>
 
     <string name="assessment_sent_title_state">Estado</string>
-    <string name="assessment_sent_title_header">Evaluación Enviada</string>
+    <string name="assessment_sent_title_header">Encuestas Enviadas</string>
     <string name="assessment_sent_date">Fecha de llenado</string>
     <string name="assessment_title_date_completion">Fecha</string>
     <string name="assessment_title_info">Info</string>
@@ -227,4 +231,17 @@
     <string name="pref_server">Servidor</string>
     <string name="pref_visual">Visual</string>
 
+    <!-- numbers: hardcoded to khmer -->
+    <string name="number_0">0</string>
+    <string name="number_1">1</string>
+    <string name="number_2">2</string>
+    <string name="number_3">3</string>
+    <string name="number_4">4</string>
+    <string name="number_5">5</string>
+    <string name="number_6">6</string>
+    <string name="number_7">7</string>
+    <string name="number_8">8</string>
+    <string name="number_9">9</string>
+    <string name="assessment_title_rdt">RDT</string>
+
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index eba60bbc1b..502b444275 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -6,7 +6,9 @@
     <string name="yes">Oui</string>
     <string name="no">No</string>
     <string name="ok">Ok</string>
-    <string name="cancel">Cancelar</string>
+    <string name="cancel">Annuler</string>
+    <string name="review">Réviser</string>
+    <string name="send">Envoyer</string>
     <string name="score">Score</string>
     <string name="number_zero">0</string>
     <string name="number_zero_percentage">0 % </string>
@@ -63,7 +65,7 @@
     <string name="assessment_title_facility_date">Centre de santé / Date</string>
     <string name="assessment_title_state">État</string>
     <string name="assessment_info_delete">Effacer</string>
-    <string name="assessment_title_header">Evaluation active</string>
+    <string name="assessment_title_header">Attendant Envoyer</string>
 
     <!-- feedback -->
     <!-- XXX Should it be replaced by 'assessment_title_facility_date'?-->
@@ -155,6 +157,8 @@
 
     <!-- dynamic -->
     <string name="dynamic_error_phone_format">"Le numéro de téléphone donné a un format incorrect"</string>
+    <string name="dynamic_required_field">Ce champ est obligatoire</string>
+    <string name="dynamic_error_age">âge invalide</string>
 
     <!-- score -->
     <string name="score_title_clinical_fever">Clinical\nfever\nevaluation</string>
@@ -219,12 +223,26 @@
     <string name="dialog_error_push_no_location">Aucun emplacement disponible</string>
 
     <string name="assessment_sent_title_state">État</string>
-    <string name="assessment_sent_title_header">Evaluation Envoyée</string>
+    <string name="assessment_sent_title_header">Sondages Envoyée</string>
     <string name="assessment_sent_date">Date de remplissement</string>
+    <string name="assessment_title_date_completion">Date</string>
     <string name="assessment_title_info">Info</string>
 
     <string name="pref_data">"Données"</string>
     <string name="pref_server">Serveur</string>
     <string name="pref_visual">Visuel</string>
-    <string name="assessment_title_date_completion">Date</string>
+
+    <!-- numbers: hardcoded to khmer -->
+    <string name="number_0">0</string>
+    <string name="number_1">1</string>
+    <string name="number_2">2</string>
+    <string name="number_3">3</string>
+    <string name="number_4">4</string>
+    <string name="number_5">5</string>
+    <string name="number_6">6</string>
+    <string name="number_7">7</string>
+    <string name="number_8">8</string>
+    <string name="number_9">9</string>
+    <string name="assessment_title_rdt">RDT</string>
+
 </resources>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index 8d0bd85557..1a76f89886 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -3,10 +3,12 @@
 
     <!-- # general -->
     <string name="developers">EyeSeeTea LTD</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-    <string name="ok">Ok</string>
-    <string name="cancel">Cancel</string>
+    <string name="yes">បាទ/ចាស</string>
+    <string name="no">ទេ</string>
+    <string name="ok">យល់ព្រម</string>
+    <string name="cancel">បោះបង់</string>
+    <string name="review">ពិនិត្យឡើងវិញ</string>
+    <string name="send">ផ្ញើ</string>
     <string name="score">Score</string>
     <string name="number_zero">0</string>
     <string name="number_zero_percentage">0 % </string>
@@ -21,9 +23,9 @@
     <!-- settings -->
     <string name="settings_menu_about">អំពី </string>
     <string name="settings_menu_configuration">ការ​កំណត់ </string>
-    <string name="settings_menu_licence">អាជ្ញា​ប​ណ្ណ </string>
+    <string name="settings_menu_licence">អាជ្ញាប័ណ្ណ</string>
     <string name="settings_menu_update">Update questions (DHIS)</string>
-    <string name="settings_menu_logout">ចេញ </string>
+    <string name="settings_menu_logout">ចាកចេញ</string>
 
     <!-- login -->
     <string name="login_info_username">User</string>
@@ -32,8 +34,8 @@
     <string name="login_error_bad_credentials">Your user/password are incorrect</string>
 
     <!-- # dialogs -->
-    <string name="dialog_title_delete_survey">លុប​ការ​ស្ទង់​មតិ </string>
-    <string name="dialog_info_delete_survey">តើ​អ្នក​ប្រាកដ​ជា​ចង់​លុប​ទាំង​ស្រុង​ការ​ស្ទង់​មតិ​នេះ​ទេ​? </string>
+    <string name="dialog_title_delete_survey">លុប​ចោលការស្ទង់មតិ</string>
+    <string name="dialog_info_delete_survey">តើ​អ្នក​ប្រាកដ​ជា​ចង់​លុបចោល​ទាំង​ស្រុង​ការស្ទង់មតិ​នេះ​?</string>
     <string name="dialog_title_error">Error</string>
     <string name="dialog_error_denominator">Error, denominator = 0</string>
     <string name="dialog_title_missing_selection">Missing selection</string>
@@ -65,9 +67,9 @@
     <string name="assessment_sent_title_state">Status</string>
     <string name="assessment_sent_date">កាលបរិច្ឆេទបញ្ចប់</string>
     <string name="assessment_info_delete">Delete</string>
-    <string name="assessment_title_header">ការវាយតំលៃ សកម្ម</string>
-    <string name="assessment_sent_title_header">ការវាយតម្លៃ ដែលបានផ្ញើ</string>
-    <string name="assessment_title_info">ព</string>
+    <string name="assessment_title_header">ការបញ្ជូនមិនទាន់សម្រេច</string>
+    <string name="assessment_sent_title_header">ការស្ទង់មតិ​ បានផ្ញើចេញ</string>
+    <string name="assessment_title_info">ព័ត៌មាន</string>
 
 
     <!-- feedback -->
@@ -99,10 +101,10 @@
     <!-- survey -->
     <string name="survey_title_exit">Really Exit?</string>
     <string name="survey_info_exit">តើអ្នកពិត ជាចង់ចេញ ?</string>
-    <string name="survey_info_exit_delete">ការស្ទង់មតិមួយ ក្នុងការរីកចំរើន នេះ នឹងត្រូវបានលុប</string>
+    <string name="survey_info_exit_delete">ការស្ទង់មតិកំពុងដំណើរការ​ ហើយនឹងត្រូវលុបចោល</string>
     <string name="survey_info_select_tab">Select Tab: </string>
-    <string name="survey_title_completed">ការស្ទង់មតិ បានបញ្ចប់</string>
-    <string name="survey_info_completed">ការអង្កេតនេះ បានបញ្ចប់ដោយជោគជ័យ</string>
+    <string name="survey_title_completed">ការស្ទង់មតិបានបញ្ចប់</string>
+    <string name="survey_info_completed">ការស្ទង់មតិបានបញ្ចប់ដោយជោគជ័យ</string>
 
 
     <!--widget-->
@@ -160,7 +162,9 @@
     <string name="iqatab_info_supervisor_matches">Supervisor matches lab staff?</string>
 
     <!-- dynamic -->
-    <string name="dynamic_error_phone_format">ទ្រង់ទ្រាយ មិនត្រឹមត្រូវសម្រាប់ លេខទូរស័ព្ទ</string>
+    <string name="dynamic_error_phone_format">បញ្ចូលលេខទូរស័ព្ទមិនត្រឹមត្រូវ</string>
+    <string name="dynamic_required_field">វាលនេះគឺត្រូវបានទាមទារ</string>
+    <string name="dynamic_error_age">អាយុមិនត្រឹមត្រូវ</string>
 
     <!-- score -->
     <string name="score_title_clinical_fever">Clinical\nfever\nevaluation</string>
@@ -182,17 +186,17 @@
     <string name="compscore_title_score_percentage">Score (%)</string>
 
     <!-- settings -->
-    <string name="title_activity_settings">Settings</string>
+    <string name="title_activity_settings">ការកំនត់</string>
     <string name="settings_checkbox_show_num_dems">Show num/dems</string>
     <string name="settings_checkbox_description_show_num_dems">When activated, survey questions show their numerators and denominators, used to calc the survey score</string>
-    <string name="settings_checkbox_customize_fonts">ប្ដូរតាមបំណង ពុម្ពអក្សរ</string>
-    <string name="settings_list_font_sizes">ទំហំ ពុម្ពអក្សរ</string>
+    <string name="settings_checkbox_customize_fonts">ប្តូរពុម្ពអក្សរ?</string>
+    <string name="settings_list_font_sizes">ទំហំពុម្ពអក្សរ</string>
     <string-array name="settings_array_titles_font_sizes">
-        <item>តូច បន្ថែម</item>
+        <item>តូចបំផុត</item>
         <item>តូច</item>
         <item>មធ្យម</item>
-        <item>ដែលមានទំហំធំ</item>
-        <item>បន្ថែម ដែលមានទំហំធំ</item>
+        <item>ធំំ</item>
+        <item>ធំបំផុត</item>
     </string-array>
     <string name="settings_text_dhis_server_url">DHIS Server URL</string>
     <string name="pref_header_general">General</string>
@@ -228,7 +232,19 @@
     <string name="pref_data">Data</string>
     <string name="pref_server">Server</string>
     <string name="pref_visual">Visual</string>
-    <string name="assessment_title_date_completion">កាលបរិច្ឆេត</string>
-
+    <string name="assessment_title_date_completion">កាលបរិច្ឆេទ</string>
+
+    <!-- numbers -->
+    <string name="number_0">០</string>
+    <string name="number_1">១</string>
+    <string name="number_2">២</string>
+    <string name="number_3">៣</string>
+    <string name="number_4">៤</string>
+    <string name="number_5">៥</string>
+    <string name="number_6">៦</string>
+    <string name="number_7">៧</string>
+    <string name="number_8">៨</string>
+    <string name="number_9">៩</string>
+    <string name="assessment_title_rdt">អ.ឌី.ធី</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86fce8b9fc..43dee83d8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,13 +2,15 @@
 <resources>
 
     <!-- # general -->
-    <string name="app_name" translatable="false">Malaria Case Surveillance</string>
+    <string name="app_name" translatable="false">QIS Surveillance</string>
     <string name="developers">EyeSeeTea LTD</string>
     <string name="empty_string" translatable="false"></string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="ok">Ok</string>
     <string name="cancel">Cancel</string>
+    <string name="review">Review</string>
+    <string name="send">Send</string>
     <string name="score">Score</string>
     <string name="number_zero">0</string>
     <string name="number_zero_percentage">0 % </string>
@@ -17,6 +19,13 @@
     <string name="good">Good</string>
     <string name="fair">Fair</string>
     <string name="poor">Poor</string>
+    <string name="symbolPlus" translatable="false">+</string>
+    <string name="symbolMinus" translatable="false">-</string>
+    <string name="symbolCross" translatable="false">X</string>
+    <string name="rdtPositive" translatable="false">Positive</string>
+    <string name="rdtNegative" translatable="false">Negative</string>
+    <string name="rdtNotTested" translatable="false">Not Tested</string>
+    <string name="rdtCancel" translatable="false">Cancel</string>
     <string name="plus">+</string>
     <string name="lorem_ipsum">Lorem ipsum dolor sit amet</string>
 
@@ -62,16 +71,15 @@
     <string name="create_info_survey">Survey</string>
 
     <!-- assessment -->
+    <string name="assessment_title_header">Pending Send</string>
+    <string name="assessment_title_rdt">RDT</string>
+    <string name="assessment_title_info">Info</string>
     <string name="assessment_title_facility_date">Facility / Survey</string>
     <string name="assessment_title_state">% complete</string>
+    <string name="assessment_sent_title_header">Sent Surveys</string>
     <string name="assessment_sent_title_state">Status</string>
-    <string name="assessment_sent_date">Completion date</string>
+    <string name="assessment_sent_date">Date</string>
     <string name="assessment_info_delete">Delete</string>
-    <string name="assessment_title_header">Active Assessment</string>
-    <string name="assessment_sent_title_header">Sent Assessment</string>
-    <string name="assessment_title_rdt" translatable="false">RDT</string>
-    <string name="assessment_title_info">Info</string>
-
 
     <!-- feedback -->
     <!-- XXX Should it be replaced by 'assessment_title_facility_date'?-->
@@ -164,6 +172,8 @@
 
     <!-- dynamic -->
     <string name="dynamic_error_phone_format">Invalid format for phone number</string>
+    <string name="dynamic_required_field">This field is required</string>
+    <string name="dynamic_error_age">Invalid age</string>
 
     <!-- score -->
     <string name="score_title_clinical_fever">Clinical\nfever\nevaluation</string>
@@ -243,5 +253,24 @@
     <string name="pref_visual">Visual</string>
     <string name="assessment_title_date_completion">Date</string>
 
+    <!-- numbers: hardcoded to khmer -->
+    <string name="number_0">0</string>
+    <string name="number_1">1</string>
+    <string name="number_2">2</string>
+    <string name="number_3">3</string>
+    <string name="number_4">4</string>
+    <string name="number_5">5</string>
+    <string name="number_6">6</string>
+    <string name="number_7">7</string>
+    <string name="number_8">8</string>
+    <string name="number_9">9</string>
+
+    <!-- async push -->
+    <string name="PUSH_PERIOD" translatable="false">10</string>
+
+    <!-- gps location -->
+    <string name="GPS_PROVIDER_DEFAULT" translatable="false">default</string>
+    <string name="GPS_LATITUDE_DEFAULT" translatable="false">10.0</string>
+    <string name="GPS_LONGITUDE_DEFAULT" translatable="false">103.0</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7bf15ff68f..0649dae669 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,7 +20,7 @@
         <item name="colorPrimaryDark">@color/dark_navy_blue</item>
         <item name="android:windowBackground">@color/light_grey</item>
         <item name="displayOptions">useLogo|showHome|homeAsUp|showTitle</item>
-        <item name="logo">@drawable/qualityapp_logo</item>
+        <item name="logo">@drawable/pictureapp_logo</item>
         <item name="android:windowActionBarOverlay">true</item>
     </style>