diff --git a/opensrp-eusm/build.gradle b/opensrp-eusm/build.gradle
index 77c9260..a57d31f 100644
--- a/opensrp-eusm/build.gradle
+++ b/opensrp-eusm/build.gradle
@@ -51,7 +51,7 @@ android {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
         versionCode 1
-        versionName "0.1.1"
+        versionName "0.1.2"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
@@ -218,7 +218,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    implementation('org.smartregister:opensrp-client-native-form:2.1.3-r12-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:2.1.8-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'cardview-v7'
diff --git a/opensrp-eusm/src/main/AndroidManifest.xml b/opensrp-eusm/src/main/AndroidManifest.xml
index 16adf60..eb54988 100644
--- a/opensrp-eusm/src/main/AndroidManifest.xml
+++ b/opensrp-eusm/src/main/AndroidManifest.xml
@@ -76,7 +76,12 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
-
+        <activity
+            android:name="com.vijay.jsonwizard.activities.JsonFormActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
diff --git a/opensrp-eusm/src/main/assets/json.form/flag_problem.json b/opensrp-eusm/src/main/assets/json.form/flag_problem.json
index 87aa8e4..c710de4 100644
--- a/opensrp-eusm/src/main/assets/json.form/flag_problem.json
+++ b/opensrp-eusm/src/main/assets/json.form/flag_problem.json
@@ -50,6 +50,7 @@
   "step1": {
     "title": "{{flag_problem.step1.title}}",
     "next": "step2",
+    "bottom_navigation": true,
     "fields": [
       {
         "key": "flag_problem",
@@ -94,6 +95,8 @@
   },
   "step2": {
     "title": "{{flag_problem.step2.title}}",
+    "bottom_navigation": true,
+    "previous": "step1",
     "fields": [
       {
         "key": "product_picture",
diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/activity/ProductInfoActivity.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/activity/ProductInfoActivity.java
index fb18370..580366a 100644
--- a/opensrp-eusm/src/main/java/org/smartregister/eusm/activity/ProductInfoActivity.java
+++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/activity/ProductInfoActivity.java
@@ -20,6 +20,7 @@
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.vijay.jsonwizard.activities.JsonFormActivity;
 import com.vijay.jsonwizard.activities.JsonWizardFormActivity;
 import com.vijay.jsonwizard.constants.JsonFormConstants;
 import com.vijay.jsonwizard.domain.Form;
@@ -206,14 +207,14 @@ protected void openLooksGoodConfirmationDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setTitle(R.string.mark_as_looks_good_title);
         builder.setMessage(R.string.looks_good_dialog_message);
-        builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 //Do nothing
             }
         });
 
-        builder.setPositiveButton("Looks Good!", new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(getString(R.string.looks_good_button_text), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 //TODO add logic to update
@@ -257,7 +258,7 @@ public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
     @Override
     public void startForm(JSONObject jsonForm) {
         Form form = new Form();
-        form.setWizard(true);
+        form.setWizard(false);
         form.setName(getString(R.string.flag_problem_form_name));
         form.setBackIcon(R.drawable.ic_action_close);
         form.setSaveLabel(getString(R.string.save));
@@ -265,7 +266,7 @@ public void startForm(JSONObject jsonForm) {
         form.setNavigationBackground(R.color.primaryDark);
         form.setHideSaveLabel(true);
 
-        Intent intent = new Intent(getActivity(), JsonWizardFormActivity.class);
+        Intent intent = new Intent(getActivity(), JsonFormActivity.class);
         intent.putExtra(JsonFormConstants.JSON_FORM_KEY.JSON, jsonForm.toString());
         intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, form);
         intent.putExtra(JsonFormConstants.PERFORM_FORM_TRANSLATION, true);
diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java
index 3c05c56..a828126 100644
--- a/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java
+++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/config/AppTaskingLibraryConfiguration.java
@@ -534,9 +534,9 @@ public Pair<Double, Double> getMinMaxZoomMapDownloadPair() {
     public List<BaseLayerSwitchModel> getBaseLayers() {
         return Arrays.asList(
                 BaseLayerSwitchModel.builder().baseLayer(new DigitalGlobeLayer()).build(),
-                BaseLayerSwitchModel.builder().baseLayer(new MapBoxLayer()).isDefault(true).build(),
+                BaseLayerSwitchModel.builder().baseLayer(new MapBoxLayer()).build(),
                 BaseLayerSwitchModel.builder().baseLayer(new StreetsBaseLayer(EusmApplication.getInstance().getBaseContext())).build(),
-                BaseLayerSwitchModel.builder().baseLayer(new SatelliteStreetsLayer(EusmApplication.getInstance().getBaseContext())).build()
+                BaseLayerSwitchModel.builder().baseLayer(new SatelliteStreetsLayer(EusmApplication.getInstance().getBaseContext())).isDefault(true).build()
         );
     }
 
diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java
index 0cfedcf..59e526e 100644
--- a/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java
+++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/layer/SatelliteStreetsLayer.java
@@ -8,6 +8,7 @@
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
+import com.mapbox.mapboxsdk.style.sources.RasterSource;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.mapboxsdk.style.sources.VectorSource;
 
@@ -31,14 +32,17 @@ public class SatelliteStreetsLayer extends BaseLayer {
     private String streetSourceId = "composite";
     private ArrayList<Source> sourcesList = new ArrayList<>();
     private LinkedHashSet<Layer> layers = new LinkedHashSet<>();
+    private String satelliteSourceId = "mapbox://mapbox.satellite";
 
     public SatelliteStreetsLayer(@NonNull Context context) {
         createLayersAndSources(context);
     }
 
     protected void createLayersAndSources(@NonNull Context context) {
+        RasterSource rasterSource = new RasterSource(satelliteSourceId, satelliteSourceId, 256);
         VectorSource streetSource = new VectorSource(streetSourceId, "mapbox://mapbox.mapbox-streets-v8,mapbox.mapbox-terrain-v2");
         sourcesList.add(streetSource);
+        sourcesList.add(rasterSource);
 
         LayerUtil layerUtil = new LayerUtil();
 
diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/service/AppSyncIntentService.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/service/AppSyncIntentService.java
index a3fdf64..0dd7c41 100644
--- a/opensrp-eusm/src/main/java/org/smartregister/eusm/service/AppSyncIntentService.java
+++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/service/AppSyncIntentService.java
@@ -5,14 +5,14 @@
 import androidx.annotation.NonNull;
 
 import org.smartregister.eusm.helper.AppValidateAssignmentHelper;
+import org.smartregister.eusm.util.EusmSyncUtils;
 import org.smartregister.sync.intent.SyncIntentService;
-import org.smartregister.util.SyncUtils;
 
 public class AppSyncIntentService extends SyncIntentService {
 
     @Override
     protected void init(@NonNull Context context) {
         super.init(context);
-        validateAssignmentHelper = new AppValidateAssignmentHelper(new SyncUtils(getBaseContext()));
+        validateAssignmentHelper = new AppValidateAssignmentHelper(new EusmSyncUtils(getBaseContext()));
     }
 }
diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/util/EusmSyncUtils.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/util/EusmSyncUtils.java
new file mode 100644
index 0000000..16805fb
--- /dev/null
+++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/util/EusmSyncUtils.java
@@ -0,0 +1,32 @@
+package org.smartregister.eusm.util;
+
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.NonNull;
+
+import org.smartregister.AllConstants;
+import org.smartregister.eusm.R;
+import org.smartregister.util.SyncUtils;
+
+import static org.smartregister.AllConstants.ACCOUNT_DISABLED;
+
+public class EusmSyncUtils extends SyncUtils {
+
+    private Context context;
+
+    public EusmSyncUtils(Context context) {
+        super(context);
+        this.context = context;
+    }
+
+    @NonNull
+    @Override
+    protected Intent getLogoutUserIntent(int logoutMessage) {
+        Intent intent = super.getLogoutUserIntent(logoutMessage);
+        intent.removeExtra(ACCOUNT_DISABLED);
+        intent.putExtra(AllConstants.INTENT_KEY.DIALOG_MESSAGE, context.getString(logoutMessage));
+        intent.putExtra(AllConstants.INTENT_KEY.DIALOG_TITLE, context.getString(R.string.new_assignment_dialog_title));
+        return intent;
+    }
+}
diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/view/EusmTreeViewDialog.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/view/EusmTreeViewDialog.java
index ccddcda..6f11438 100644
--- a/opensrp-eusm/src/main/java/org/smartregister/eusm/view/EusmTreeViewDialog.java
+++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/view/EusmTreeViewDialog.java
@@ -38,7 +38,7 @@ public TreeNode.BaseNodeViewHolder<String> getNodeViewHolder(Context context, JS
 
     @Override
     public void updateTreeNode(int level, TreeNode curNode, TreeNode parentNode) {
-        curNode.setSelectable(level > 2);
+        curNode.setSelectable(level == 3);
         boolean isSelected = operationalAreas.contains(curNode.getValue().toString());
         curNode.setSelected(isSelected);
     }
diff --git a/opensrp-eusm/src/main/java/org/smartregister/eusm/view/NavigationDrawerView.java b/opensrp-eusm/src/main/java/org/smartregister/eusm/view/NavigationDrawerView.java
index bc59312..1966227 100644
--- a/opensrp-eusm/src/main/java/org/smartregister/eusm/view/NavigationDrawerView.java
+++ b/opensrp-eusm/src/main/java/org/smartregister/eusm/view/NavigationDrawerView.java
@@ -5,8 +5,10 @@
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -25,6 +27,7 @@
 import org.smartregister.tasking.util.PreferencesUtil;
 import org.smartregister.tasking.view.DrawerMenuView;
 import org.smartregister.util.LangUtils;
+import org.smartregister.util.NetworkUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -162,7 +165,16 @@ public void showOperationalAreaSelector(Pair<String, ArrayList<String>> location
             LinearLayout buttonLayout = new LinearLayout(getContext());
             buttonLayout.setGravity(Gravity.CENTER);
 
+            LinearLayout.LayoutParams treeViewLayoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            LinearLayout treeViewLayout = new LinearLayout(getContext());
+            treeViewLayout.setOrientation(LinearLayout.VERTICAL);
+            treeViewLayout.setGravity(Gravity.CENTER);
+            treeViewLayout.setLayoutParams(treeViewLayoutParams);
+
+
+            LinearLayout.LayoutParams buttonLayoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
             Button okButton = new Button(getContext());
+            okButton.setLayoutParams(buttonLayoutParams);
             okButton.setText(R.string.ok_text);
             okButton.setTypeface(Typeface.DEFAULT_BOLD);
             okButton.setTextColor(getContext().getResources().getColor(R.color.white));
@@ -170,9 +182,18 @@ public void showOperationalAreaSelector(Pair<String, ArrayList<String>> location
             okButton.setTextSize(TypedValue.COMPLEX_UNIT_PX, getContext().getResources()
                     .getDimension(com.vijay.jsonwizard.R.dimen.button_text_size));
             okButton.setHeight(getContext().getResources().getDimensionPixelSize(com.vijay.jsonwizard.R.dimen.button_height));
-
             buttonLayout.addView(okButton);
-            linearLayout.addView(buttonLayout);
+
+            ScrollView scrollView = (ScrollView) linearLayout.getChildAt(0);
+            View androidTreeView = scrollView.getChildAt(0);
+            scrollView.removeView(androidTreeView);
+            treeViewLayout.addView(androidTreeView);
+            treeViewLayout.addView(buttonLayout);
+            scrollView.addView(treeViewLayout);
+            linearLayout.removeView(scrollView);
+            linearLayout.setOrientation(LinearLayout.VERTICAL);
+            linearLayout.addView(scrollView);
+
             okButton.setOnClickListener(v -> {
                 List<String> selectedValues = treeViewDialog.getTreeView().getSelectedValues(String.class);
                 getPresenter().onOperationalAreaSelectorClicked(new ArrayList<>(selectedValues));
@@ -195,4 +216,11 @@ public void onDrawerOpened(@NonNull View drawerView) {
             }
         }
     }
+
+    @Override
+    public void toggleProgressBarView(boolean syncing) {
+        super.toggleProgressBarView(syncing);
+        View flexBox = this.activity.getActivity().findViewById(R.id.flex_box);
+        flexBox.setVisibility((syncing && NetworkUtils.isNetworkAvailable()) ? View.GONE : View.VISIBLE);
+    }
 }
diff --git a/opensrp-eusm/src/main/res/layout/activity_product_info.xml b/opensrp-eusm/src/main/res/layout/activity_product_info.xml
index 3971db1..f3d9f6d 100644
--- a/opensrp-eusm/src/main/res/layout/activity_product_info.xml
+++ b/opensrp-eusm/src/main/res/layout/activity_product_info.xml
@@ -141,30 +141,33 @@
             android:id="@+id/layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="70dp"
+            android:layout_gravity="center"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:orientation="horizontal"
-            android:layout_gravity="center"
             android:gravity="center"
+            android:orientation="horizontal"
             android:paddingTop="10dp"
             android:paddingBottom="5dp"
             android:weightSum="1">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:id="@+id/layout_product_looks_good"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="5dp"
                 android:layout_weight="0.5"
                 android:background="@drawable/login_button_bg"
                 android:gravity="center"
                 android:paddingStart="11dp"
-                android:id="@+id/layout_product_looks_good"
                 android:paddingEnd="11dp">
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
                     android:text="@string/looks_good_button_text"
                     android:textAllCaps="false"
                     android:textColor="@color/white"
@@ -174,29 +177,40 @@
 
             <LinearLayout
                 android:id="@+id/layout_flag_problem"
-                android:layout_width="wrap_content"
-                android:layout_height="47dp"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
                 android:layout_marginStart="5dp"
-                android:layout_weight="0.44"
+                android:layout_weight="0.5"
                 android:background="@drawable/structure_task_action_bg"
                 android:gravity="center"
                 android:orientation="horizontal">
 
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:src="@drawable/ic_baseline_warning"
-                    android:textAllCaps="false" />
+                <com.google.android.flexbox.FlexboxLayout
+                    android:id="@+id/flex_box"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:alignContent="stretch"
+                    app:alignItems="stretch"
+                    app:flexWrap="wrap"
+                    app:justifyContent="center">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
-                    android:gravity="center"
-                    android:text="@string/flag_problem_button_text"
-                    android:textColor="#FFB000"
-                    android:textSize="@dimen/activity_title_size"
-                    android:textStyle="bold" />
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:padding="3dp"
+                        android:src="@drawable/ic_baseline_warning" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="10dp"
+                        android:gravity="center"
+                        android:paddingBottom="3dp"
+                        android:text="@string/flag_problem_button_text"
+                        android:textColor="#FFB000"
+                        android:textSize="@dimen/activity_title_size"
+                        android:textStyle="bold" />
+                </com.google.android.flexbox.FlexboxLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/opensrp-eusm/src/main/res/layout/nav_header.xml b/opensrp-eusm/src/main/res/layout/nav_header.xml
index d785a4f..a53188c 100644
--- a/opensrp-eusm/src/main/res/layout/nav_header.xml
+++ b/opensrp-eusm/src/main/res/layout/nav_header.xml
@@ -37,71 +37,86 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/application_version" />
 
-
-    <TextView
-        android:id="@+id/sync_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/drawer_margin"
-        android:layout_marginTop="20dp"
-        android:text="@string/sync"
-        android:textColor="@color/button_blue"
-        android:textSize="18sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/application_updated" />
-
-    <TextView
-        android:id="@+id/sync_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/drawer_second_margin"
-        android:layout_marginTop="20dp"
-        android:paddingStart="15dp"
-        android:paddingTop="5dp"
-        android:paddingEnd="15dp"
-        android:paddingBottom="5dp"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/application_updated" />
-
-    <TextView
-        android:id="@+id/sync_progress_bar_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/drawer_margin"
-        android:layout_marginTop="20dp"
-        android:textColor="@color/text_gray"
-        android:textSize="10sp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toTopOf="@id/sync_progress_bar"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ProgressBar
-        android:id="@+id/sync_progress_bar"
-        style="?android:attr/progressBarStyleHorizontal"
+    <RelativeLayout
+        android:id="@+id/progressbar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="20dp"
         android:layout_marginStart="@dimen/drawer_margin"
-        android:layout_marginTop="@dimen/drawer_margin_vertical"
-        android:indeterminate="false"
-        android:max="100"
-        android:visibility="invisible"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/application_updated" />
+        android:layout_marginTop="20dp"
+        app:layout_constraintTop_toBottomOf="@id/application_updated">
+
+        <com.google.android.flexbox.FlexboxLayout
+            android:id="@+id/flex_box"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:alignContent="stretch"
+            app:alignItems="stretch"
+            app:flexWrap="wrap">
+
+            <TextView
+                android:id="@+id/sync_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sync"
+                android:textColor="@color/button_blue"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/sync_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="3dp"
+                android:paddingStart="15dp"
+                android:paddingTop="5dp"
+                android:paddingEnd="15dp"
+                android:paddingBottom="5dp"
+                android:textSize="16sp" />
+        </com.google.android.flexbox.FlexboxLayout>
+
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/sync_progress_bar_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="3dp"
+                    android:textColor="@color/text_gray"
+                    android:textSize="12sp"
+                    android:visibility="invisible" />
+
+                <ProgressBar
+                    android:id="@+id/sync_progress_bar"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:visibility="invisible" />
+            </LinearLayout>
+        </FrameLayout>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/btn_navMenu_offline_maps"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/drawer_margin"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="5dp"
         android:text="@string/offline_maps"
         android:textColor="@color/button_blue"
         android:textSize="18sp"
         android:visibility="invisible"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sync_progress_bar" />
+        app:layout_constraintTop_toBottomOf="@id/progressbar_layout" />
 
     <TextView
         android:id="@+id/btn_navMenu_language_chooser"
diff --git a/opensrp-eusm/src/main/res/layout/operator_details_and_logout.xml b/opensrp-eusm/src/main/res/layout/operator_details_and_logout.xml
index b959195..39839aa 100644
--- a/opensrp-eusm/src/main/res/layout/operator_details_and_logout.xml
+++ b/opensrp-eusm/src/main/res/layout/operator_details_and_logout.xml
@@ -1,56 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:clickable="false"
-    android:focusable="false"
-    android:layout_height="wrap_content">
+    android:focusable="false">
 
     <RelativeLayout
-        android:focusable="false"
-        android:focusableInTouchMode="false"
         android:layout_width="match_parent"
-        android:layout_height="85dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:gravity="bottom"
-        android:clickable="false"
         android:background="@color/white"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:gravity="bottom"
         android:orientation="vertical">
 
         <View
             android:id="@+id/divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_above="@id/operator_label"
+            android:layout_above="@id/flex_box"
             android:background="#DFDFDF"
             android:gravity="bottom" />
 
-        <TextView
-            android:id="@+id/operator_label"
-            android:layout_width="wrap_content"
+        <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/flex_box"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_above="@id/txt_powered_by"
             android:layout_marginStart="@dimen/drawer_margin"
-            android:layout_marginTop="15dp"
-            android:paddingEnd="10dp"
-            android:text="Operator: "
-            android:textColor="@color/text_black"
-            android:textSize="18sp" />
+            android:layout_marginTop="10dp"
+            app:alignContent="stretch"
+            app:alignItems="stretch"
+            app:flexWrap="wrap">
 
-        <TextView
-            android:id="@+id/logout_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/txt_powered_by"
-            android:layout_toEndOf="@id/operator_label"
-            android:text="@string/logout_text"
-            android:textColor="@color/button_blue"
-            android:textSize="18sp" />
+            <TextView
+                android:id="@+id/operator_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/txt_powered_by"
+                android:paddingEnd="10dp"
+                android:text="@string/operator"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/logout_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/txt_powered_by"
+                android:layout_toEndOf="@id/operator_label"
+                android:text="@string/logout_text"
+                android:textColor="@color/button_blue"
+                android:textSize="18sp" />
+        </com.google.android.flexbox.FlexboxLayout>
 
         <TextView
             android:id="@+id/txt_powered_by"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
+            android:layout_below="@id/flex_box"
             android:layout_marginStart="@dimen/drawer_margin"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="20dp"
diff --git a/opensrp-eusm/src/main/res/values-fr/strings.xml b/opensrp-eusm/src/main/res/values-fr/strings.xml
index 2c7ee2a..8c93ffd 100644
--- a/opensrp-eusm/src/main/res/values-fr/strings.xml
+++ b/opensrp-eusm/src/main/res/values-fr/strings.xml
@@ -15,9 +15,9 @@
     <string name="device_timezone_changed">Le fuseau horaire de l\'appareil a changé. Veuillez vous connecter à nouveau.</string>
     <string name="device_time_changed">L\'heure de l\'appareil a changé. Veuillez vous connecter à nouveau.</string>
 
-    <string name="prompt_password">Saisir le mot de passe</string>
-    <string name="prompt_username">Saisir l\'identifiant</string>
-    <string name="sync">Synchro</string>
+    <string name="prompt_password">Saisir mot de passe</string>
+    <string name="prompt_username">Saisir identifiant</string>
+    <string name="sync">Sync</string>
     <string name="campaign">Mission</string>
     <string name="operational_area">District</string>
     <string name="plan">Mission</string>
@@ -86,24 +86,21 @@
 
     <string name="next_page"><![CDATA[PROCHAIN >>]]></string>
     <string name="previous_page"><![CDATA[<< Précedent]]></string>
-    <string name="product_serial_n_quantity">%s  &#183; %s %s</string>
-    <string name="product_serial_text">Serial # </string>
-    <string name="product_quantity_text">Qty: </string>
     <string name="product_serial">Serial # %s</string>
     <string name="product_serial_n_date_checked">Serial # %s</string>
     <string name="task_item_text">PRODUITS</string>
     <string name="task_checked_text">VERIFIÉ</string>
-    <string name="no_items_to_check">Aucun article à vérifier</string>
-    <string name="no_items_checked_yet">Aucun article n\'a encore été vérifié</string>
+    <string name="no_items_to_check">Aucun produit à vérifier</string>
+    <string name="no_items_checked_yet">Aucun produit n\'a encore été vérifié</string>
     <string name="back">Retour</string>
-    <string name="mark_as_looks_good_title">Marquer comme \" semble en bon état \" ?</string>
-    <string name="looks_good_dialog_message">Le matériel existe, il est en bon état et il est utilisé de manière appropriée.</string>
+    <string name="mark_as_looks_good_title">Confirmer  C\'est OK \" ?</string>
+    <string name="looks_good_dialog_message">Le produit existe, il est en bon état et il est utilisé de manière appropriée.</string>
     <string name="undo_task_title">Annuler évaluation pour %s</string>
     <string name="undo_looks_good_title">Annuler \"C\'est OK !\" pour %s</string>
     <string name="undo_flag_problem_title">Annuler \"Signaler Problème\" pour %s</string>
 
-    <string name="undo_dialog_message">Ceci annulera votre évaluation sur cet article</string>
-    <string name="undo">Annuler</string>
+    <string name="undo_dialog_message">Ceci annulera votre évaluation sur ce produit</string>
+    <string name="undo">Non</string>
     <string name="cancel">Annuler</string>
     <string name="no_of_items">%s produits</string>
     <string name="is_it_there">Existe-t-il ?</string>
@@ -111,7 +108,7 @@
     <string name="is_it_being_used_appropriately">Est-il utilisé de manière appropriée?</string>
     <string name="looks_good_save_dialog">Enregistrement</string>
     <string name="fix_problem_prefix">Résoudre problème : %s</string>
-    <string name="view_inventory">Voir l\'inventaire</string>
+    <string name="view_inventory">Voir les produits</string>
     <string name="tasks_in_progress">En cours</string>
     <string name="tasks_completed">Terminé</string>
     <string name="flag_problem_button_text">Signaler un problème</string>
@@ -122,6 +119,10 @@
     <string name="gps_unknown">Localisation GPS inconnue</string>
 
     <string name="select_campaign_operational_area_title">Mission et District non définis</string>
+    <string name="select_campaign_operational_area">Mission et district non fixé. Sélectionner dans le menu</string>
+    <string name="revoked_plan_operational_area">Mission et district ulterieurement selectionnés sont annulé(s). Sélectionner de nouveau dans le menu</string>
+    <string name="read_and_write_permission_not_granted">Permission de stockage en lecture et écriture non accordée</string>
+
     <string name="service_point_check_task_title">Check point de service</string>
     <string name="record_gps_task_title">Enregistrer GPS</string>
-</resources>
+    </resources>
diff --git a/opensrp-eusm/src/main/res/values/strings.xml b/opensrp-eusm/src/main/res/values/strings.xml
index e4023ce..4023d68 100644
--- a/opensrp-eusm/src/main/res/values/strings.xml
+++ b/opensrp-eusm/src/main/res/values/strings.xml
@@ -143,7 +143,13 @@
     <string name="date_checked">date checked</string>
     <string name="text_selected_a_cluster_point">You\'ve selected a cluster point!</string>
 
-    <string name="stock_type_id_key">identifier</string>
+    <string name="stock_type_id_key" translatable="false">identifier</string>
     <string name="ok_text">OK</string>
-
+    <string name="new_assignment_dialog_title">New Mission Assigned</string>
+    <string name="no_structures_found">There are no structures mapped to this operational area. Please add a point to begin</string>
+    <string name="fetch_location_and_structures_failed">This operational area has not been defined in the system. Please try to sync your device. Please contact the system administrator if that doesn\'t solve the issue noting the operational area number %1$s.</string>
+    <string name="account_disabled">Account Disabled</string>
+    <string name="fetching_structure_title">Fetching Structure Details</string>
+    <string name="fetching_structure_message">Fetching Structure Details. Please wait</string>
+    <string name="map_download_progress">Downloading: %,.2f %%</string>
 </resources>