diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e39a858cd..6cfacb38e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,3 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
-
diff --git a/mifospay/src/main/res/layout/activity_login.xml b/mifospay/src/main/res/layout/activity_login.xml
index 6fc8f9169..a93358962 100644
--- a/mifospay/src/main/res/layout/activity_login.xml
+++ b/mifospay/src/main/res/layout/activity_login.xml
@@ -18,7 +18,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.774"
-        app:srcCompat="@drawable/ic_logo_outline" />
+        app:srcCompat="@drawable/ic_logo_outline"
+        android:contentDescription="@string/todo" />
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/textInputLayout2"
diff --git a/mifospay/src/main/res/layout/activity_merchant_transaction.xml b/mifospay/src/main/res/layout/activity_merchant_transaction.xml
index 46bc8771f..aed9969f1 100644
--- a/mifospay/src/main/res/layout/activity_merchant_transaction.xml
+++ b/mifospay/src/main/res/layout/activity_merchant_transaction.xml
@@ -51,7 +51,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/marginItemsInSectionSmall"
-                    app:srcCompat="@drawable/shape_bottom_sheet_dialog_grip" />
+                    app:srcCompat="@drawable/shape_bottom_sheet_dialog_grip"
+                    android:contentDescription="@string/todo" />
 
                 <TextView
                     android:id="@+id/dialog_home_bottom_sheet_title"
diff --git a/mifospay/src/main/res/layout/activity_read_qr.xml b/mifospay/src/main/res/layout/activity_read_qr.xml
index 49aff4112..de717992d 100644
--- a/mifospay/src/main/res/layout/activity_read_qr.xml
+++ b/mifospay/src/main/res/layout/activity_read_qr.xml
@@ -26,7 +26,8 @@
             android:background="@null"
             android:id="@+id/btn_flash_on"
             android:layout_gravity="bottom|center"
-            app:srcCompat="@drawable/ic_flash_on"/>
+            app:srcCompat="@drawable/ic_flash_on"
+            android:contentDescription="@string/todo" />
         <ImageButton
             android:layout_width="80dp"
             android:layout_height="80dp"
@@ -34,7 +35,8 @@
             android:id="@+id/btn_flash_off"
             android:layout_gravity="bottom|center"
             android:visibility="gone"
-            app:srcCompat="@drawable/ic_flash_off"/>
+            app:srcCompat="@drawable/ic_flash_off"
+            android:contentDescription="@string/todo" />
     </FrameLayout>
 
 
diff --git a/mifospay/src/main/res/layout/activity_receipt.xml b/mifospay/src/main/res/layout/activity_receipt.xml
index f3817e3ae..118fba304 100644
--- a/mifospay/src/main/res/layout/activity_receipt.xml
+++ b/mifospay/src/main/res/layout/activity_receipt.xml
@@ -28,7 +28,8 @@
                         android:layout_width="@dimen/value_120dp"
                         android:layout_height="@dimen/value_120dp"
                         android:layout_gravity="center"
-                        app:srcCompat="@drawable/mifospay_round_logo" />
+                        app:srcCompat="@drawable/mifospay_round_logo"
+                        android:contentDescription="@string/todo" />
 
                     <TextView
                         android:id="@+id/tv_amount"
diff --git a/mifospay/src/main/res/layout/activity_setup_upi_pin.xml b/mifospay/src/main/res/layout/activity_setup_upi_pin.xml
index dd0b53795..4be616f0b 100644
--- a/mifospay/src/main/res/layout/activity_setup_upi_pin.xml
+++ b/mifospay/src/main/res/layout/activity_setup_upi_pin.xml
@@ -54,7 +54,8 @@
                         android:layout_height="24dp"
                         android:layout_alignParentRight="true"
                         android:background="@drawable/ic_verify"
-                        android:visibility="gone"/>
+                        android:visibility="gone"
+                        android:layout_alignParentEnd="true" />
 
                 </RelativeLayout>
 
diff --git a/mifospay/src/main/res/layout/activity_show_qr.xml b/mifospay/src/main/res/layout/activity_show_qr.xml
index 8805fb275..b65a59f07 100644
--- a/mifospay/src/main/res/layout/activity_show_qr.xml
+++ b/mifospay/src/main/res/layout/activity_show_qr.xml
@@ -14,7 +14,8 @@
         <ImageView
             android:id="@+id/iv_qr_code"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:contentDescription="@string/todo" />
     </FrameLayout>
     <Button
         android:id="@+id/btn_set_amount"
diff --git a/mifospay/src/main/res/layout/activity_signup.xml b/mifospay/src/main/res/layout/activity_signup.xml
index 971a8d15f..51ac005a1 100644
--- a/mifospay/src/main/res/layout/activity_signup.xml
+++ b/mifospay/src/main/res/layout/activity_signup.xml
@@ -158,7 +158,8 @@
                     android:background="@drawable/bg_et_round_border"
                     android:hint="@string/email"
                     android:inputType="textEmailAddress"
-                    android:paddingLeft="15dp"/>
+                    android:paddingLeft="15dp"
+                    android:paddingStart="15dp" />
 
                 <EditText
                     android:id="@+id/et_business_shop_name"
diff --git a/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml b/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml
index a14f0b33b..1323a8240 100644
--- a/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml
+++ b/mifospay/src/main/res/layout/content_bottom_sheet_account_details.xml
@@ -11,7 +11,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/marginItemsInSectionSmall"
-        app:srcCompat="@drawable/shape_bottom_sheet_dialog_grip" />
+        app:srcCompat="@drawable/shape_bottom_sheet_dialog_grip"
+        android:contentDescription="@string/todo" />
 
     <TextView
         android:id="@+id/dialog_home_bottom_sheet_title"
diff --git a/mifospay/src/main/res/layout/dialog_transaction_detail.xml b/mifospay/src/main/res/layout/dialog_transaction_detail.xml
index f5df8c43d..42a969ad1 100644
--- a/mifospay/src/main/res/layout/dialog_transaction_detail.xml
+++ b/mifospay/src/main/res/layout/dialog_transaction_detail.xml
@@ -101,14 +101,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:layout_alignParentStart="true">
 
                 <ImageView
                     android:id="@+id/iv_fromImage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:background="@drawable/ic_person"/>
+                    android:background="@drawable/ic_person"
+                    android:contentDescription="@string/todo" />
 
                 <TextView
                     android:id="@+id/tv_fromClientName"
@@ -134,21 +136,24 @@
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
                 android:background="@drawable/ic_send"
-                android:foregroundGravity="center"/>
+                android:foregroundGravity="center"
+                android:contentDescription="@string/todo" />
 
             <LinearLayout
                 android:id="@+id/ll_to"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:layout_alignParentEnd="true">
 
                 <ImageView
                     android:id="@+id/iv_toImage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:background="@drawable/ic_person"/>
+                    android:background="@drawable/ic_person"
+                    android:contentDescription="@string/todo" />
 
                 <TextView
                     android:id="@+id/tv_toClientName"
diff --git a/mifospay/src/main/res/layout/faq_list_group.xml b/mifospay/src/main/res/layout/faq_list_group.xml
index c652c1fe6..921a508d2 100644
--- a/mifospay/src/main/res/layout/faq_list_group.xml
+++ b/mifospay/src/main/res/layout/faq_list_group.xml
@@ -13,5 +13,7 @@
         android:layout_marginRight="16dp"
         android:layout_marginTop="16dp"
         android:layout_weight="8"
-        android:textColor="@android:color/black" />
+        android:textColor="@android:color/black"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/mifospay/src/main/res/layout/fragment_cards.xml b/mifospay/src/main/res/layout/fragment_cards.xml
index 6a6ba714b..8bf6c130f 100644
--- a/mifospay/src/main/res/layout/fragment_cards.xml
+++ b/mifospay/src/main/res/layout/fragment_cards.xml
@@ -20,7 +20,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                app:srcCompat="@drawable/ic_search"/>
+                app:srcCompat="@drawable/ic_search"
+                android:contentDescription="@string/todo" />
             <EditText
                 android:layout_width="match_parent"
                 android:id="@+id/et_search_cards"
diff --git a/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml b/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml
index 0111494f4..e1352106e 100644
--- a/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml
+++ b/mifospay/src/main/res/layout/fragment_kyc_lvl2.xml
@@ -35,7 +35,8 @@
             android:layout_marginRight="@dimen/value_10dp"
             android:background="@drawable/button_round_gray"
             android:text="@string/browse"
-            android:textColor="@color/black"/>
+            android:textColor="@color/black"
+            android:layout_marginEnd="@dimen/value_10dp" />
 
         <TextView
             android:id="@+id/tv_filename"
diff --git a/mifospay/src/main/res/layout/fragment_merchants.xml b/mifospay/src/main/res/layout/fragment_merchants.xml
index 6ad764d55..8c0f49a65 100644
--- a/mifospay/src/main/res/layout/fragment_merchants.xml
+++ b/mifospay/src/main/res/layout/fragment_merchants.xml
@@ -46,7 +46,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                app:srcCompat="@drawable/ic_search"/>
+                app:srcCompat="@drawable/ic_search"
+                android:contentDescription="@string/todo" />
             <EditText
                 android:layout_width="match_parent"
                 android:id="@+id/et_search_merchant"
diff --git a/mifospay/src/main/res/layout/fragment_request.xml b/mifospay/src/main/res/layout/fragment_request.xml
index fc8a675f4..022ab051d 100644
--- a/mifospay/src/main/res/layout/fragment_request.xml
+++ b/mifospay/src/main/res/layout/fragment_request.xml
@@ -11,7 +11,8 @@
         android:layout_marginTop="@dimen/value_30dp"
         android:text="@string/receive"
         android:textColor="@color/primaryDarkBlue"
-        android:textSize="@dimen/value_18sp"/>
+        android:textSize="@dimen/value_18sp"
+        android:layout_marginStart="@dimen/value_20dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,7 +27,8 @@
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginLeft="@dimen/value_20dp"
             android:layout_weight="1"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_marginStart="@dimen/value_20dp">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/mifospay/src/main/res/layout/invoice_item.xml b/mifospay/src/main/res/layout/invoice_item.xml
index 90b4d310d..76c7d0949 100644
--- a/mifospay/src/main/res/layout/invoice_item.xml
+++ b/mifospay/src/main/res/layout/invoice_item.xml
@@ -17,7 +17,7 @@
         android:layout_gravity="center_vertical"
         android:padding="@dimen/value_5dp"
         app:srcCompat="@drawable/ic_remove_circle_outline_black_24dp"
-        />
+        android:contentDescription="@string/todo" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/mifospay/src/main/res/layout/item_casual_list.xml b/mifospay/src/main/res/layout/item_casual_list.xml
index 4b131953f..40f28ee06 100644
--- a/mifospay/src/main/res/layout/item_casual_list.xml
+++ b/mifospay/src/main/res/layout/item_casual_list.xml
@@ -13,7 +13,8 @@
         app:layout_constraintBottom_toBottomOf="@+id/tv_item_casual_list_subtitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_item_casual_list_title"
-        app:srcCompat="@drawable/ic_transaction" />
+        app:srcCompat="@drawable/ic_transaction"
+        android:contentDescription="@string/todo" />
 
     <View
         android:id="@+id/divider3"
diff --git a/mifospay/src/main/res/layout/item_si.xml b/mifospay/src/main/res/layout/item_si.xml
index 6564db3bb..9eff06324 100644
--- a/mifospay/src/main/res/layout/item_si.xml
+++ b/mifospay/src/main/res/layout/item_si.xml
@@ -21,7 +21,7 @@
         android:layout_margin="@dimen/value_10dp"
         android:textColor="@color/colorTextPrimary"
         android:textSize="@dimen/textBody1"
-        android:text="dadas"
+        android:text="@string/from_client_name"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -32,7 +32,7 @@
         android:layout_marginTop="@dimen/value_20dp"
         android:layout_marginStart="@dimen/value_10dp"
         android:textColor="@color/colorTextPrimary"
-        android:text="dadsdasdasd"
+        android:text="@string/to_client_name"
         android:textSize="@dimen/textBody1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/tv_from_client_name" />
diff --git a/mifospay/src/main/res/layout/item_specific_transaction.xml b/mifospay/src/main/res/layout/item_specific_transaction.xml
index b8fbf98ce..95b2047a0 100644
--- a/mifospay/src/main/res/layout/item_specific_transaction.xml
+++ b/mifospay/src/main/res/layout/item_specific_transaction.xml
@@ -31,7 +31,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:background="@drawable/ic_person"/>
+                    android:background="@drawable/ic_person"
+                    android:contentDescription="@string/todo" />
 
                 <TextView
                     android:id="@+id/tv_fromClientName"
@@ -55,7 +56,8 @@
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
                 android:background="@drawable/ic_send"
-                android:foregroundGravity="center"/>
+                android:foregroundGravity="center"
+                android:contentDescription="@string/todo" />
 
             <LinearLayout
                 android:id="@+id/ll_to"
@@ -69,7 +71,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:background="@drawable/ic_person"/>
+                    android:background="@drawable/ic_person"
+                    android:contentDescription="@string/todo" />
 
                 <TextView
                     android:id="@+id/tv_toClientName"
@@ -100,7 +103,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"/>
+                android:layout_centerVertical="true"
+                android:contentDescription="@string/todo" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -140,7 +144,8 @@
                 android:layout_marginRight="@dimen/value_10dp"
                 android:textColor="@android:color/black"
                 android:textSize="@dimen/value_30sp"
-                android:textStyle="bold"/>
+                android:textStyle="bold"
+                android:layout_alignParentEnd="true" />
 
         </RelativeLayout>
 
diff --git a/mifospay/src/main/res/layout/nav_drawer_header.xml b/mifospay/src/main/res/layout/nav_drawer_header.xml
index 95be27b92..131847a78 100644
--- a/mifospay/src/main/res/layout/nav_drawer_header.xml
+++ b/mifospay/src/main/res/layout/nav_drawer_header.xml
@@ -14,14 +14,17 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"/>
+        android:layout_marginLeft="10dp"
+        android:contentDescription="@string/todo"
+        android:layout_marginStart="10dp" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="5dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:layout_marginStart="5dp">
 
         <TextView
             android:id="@+id/tv_user_name"
@@ -32,7 +35,8 @@
             android:lines="1"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/black"
-            android:textSize="17sp"/>
+            android:textSize="17sp"
+            android:layout_marginStart="20dp" />
 
         <TextView
             android:id="@+id/tv_user_email"
@@ -44,7 +48,8 @@
             android:lines="1"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/black"
-            android:textSize="11sp"/>
+            android:textSize="11sp"
+            android:layout_marginStart="20dp" />
 
     </LinearLayout>
 
diff --git a/mifospay/src/main/res/layout/profile_username_and_image.xml b/mifospay/src/main/res/layout/profile_username_and_image.xml
index a418d7962..e509ecf4d 100644
--- a/mifospay/src/main/res/layout/profile_username_and_image.xml
+++ b/mifospay/src/main/res/layout/profile_username_and_image.xml
@@ -19,7 +19,8 @@
         android:layout_height="@dimen/editable_image_hint_shape_size"
         android:src="@drawable/drawable_editable_image_hint"
         app:layout_constraintBottom_toBottomOf="@+id/iv_user_image"
-        app:layout_constraintEnd_toEndOf="@+id/iv_user_image" />
+        app:layout_constraintEnd_toEndOf="@+id/iv_user_image"
+        android:contentDescription="@string/todo" />
 
     <TextView
         android:id="@+id/tv_user_name"
diff --git a/mifospay/src/main/res/values/strings.xml b/mifospay/src/main/res/values/strings.xml
index 7dcc0787b..16615c68a 100644
--- a/mifospay/src/main/res/values/strings.xml
+++ b/mifospay/src/main/res/values/strings.xml
@@ -303,6 +303,8 @@
     <string name="valid_till_date">Valid Till: %1$s</string>
 
     <string name="title_activity_new_si">NewSIActivity</string>
+    <string name="todo">TODO</string>
     <string name="share_receipt">Share Receipt Link</string>
 
+
 </resources>