diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
index 76d9e775f..895fe3330 100644
--- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
+++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
@@ -7,6 +7,7 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
@@ -76,7 +77,7 @@ public class JsonFormFragment extends MvpFragment<JsonFormFragmentPresenter, Jso
     protected ScrollView mScrollView;
     private Menu mMenu;
     private JsonApi mJsonApi;
-    private Map<String, List<View>> lookUpMap = new HashMap<>();
+    private final Map<String, List<View>> lookUpMap = new HashMap<>();
     private Button previousButton;
     private Button nextButton;
     private String stepName;
@@ -86,7 +87,7 @@ public class JsonFormFragment extends MvpFragment<JsonFormFragmentPresenter, Jso
 
     private static NativeFormsProperties nativeFormProperties;
 
-    private final Handler handler = new Handler(this);
+    private final Handler handler = new Handler(Looper.getMainLooper(), this);
 
     public static JsonFormFragment getFormFragment(String stepName) {
         JsonFormFragment jsonFormFragment = new JsonFormFragment();
@@ -100,7 +101,7 @@ public static JsonFormFragment getFormFragment(String stepName) {
     @Override
     public boolean handleMessage(@NonNull @NotNull Message msg) {
         //noinspection SwitchStatementWithTooFewBranches
-        switch (msg.what){
+        switch (msg.what) {
             case GRAY_OUT_ACTIVE_WHAT:
                 requireActivity().invalidateOptionsMenu();
                 return true;
@@ -285,7 +286,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_toolbar, menu);
         presenter.setUpToolBar();
 
-        if (getForm() != null && getForm().isGreyOutSaveWhenFormInvalid()){
+        if (getForm() != null && getForm().isGreyOutSaveWhenFormInvalid()) {
             boolean isFormFilled = presenter.areFormViewsFilled();
             if (isFormFilled) {
                 menu.findItem(R.id.action_next).setTitle(R.string.next);
@@ -678,7 +679,7 @@ public void unCheck(String parentKey, String exclusiveKey, CompoundButton compou
                         break;
                     }
                 } else if (isCheckbox(view)) {
-                    CheckBox checkBox = ((LinearLayout) view).findViewWithTag(JsonFormConstants.CHECK_BOX);
+                    CheckBox checkBox = view.findViewWithTag(JsonFormConstants.CHECK_BOX);
                     String parentKeyAtIndex = (String) checkBox.getTag(R.id.key);
                     String childKeyAtIndex = (String) checkBox.getTag(R.id.childKey);
                     if (checkBox.isChecked() && parentKeyAtIndex.equals(parentKey) && childKeyAtIndex.equals(exclusiveKey)) {
@@ -736,7 +737,7 @@ public void run() {
 
                     Form form = getForm();
                     if (!(view instanceof MaterialEditText)
-                            || (form != null && !form.isGreyOutSaveWhenFormInvalid())){
+                            || (form != null && !form.isGreyOutSaveWhenFormInvalid())) {
                         view.requestFocus();
                     }
                 }
diff --git a/gradle.properties b/gradle.properties
index 02f37824f..fec4378b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.1.13-SNAPSHOT
+VERSION_NAME=2.1.14-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard