diff --git a/app/src/main/java/org/amfoss/templeapp/activities/DeleteData.java b/app/src/main/java/org/amfoss/templeapp/activities/DeleteData.java
index 7eb0440..d209564 100644
--- a/app/src/main/java/org/amfoss/templeapp/activities/DeleteData.java
+++ b/app/src/main/java/org/amfoss/templeapp/activities/DeleteData.java
@@ -43,13 +43,13 @@ public void radioGroupOnCheckedChanged(RadioGroup group, int checkedId) {
                 case R.id.radio_donate:
                     binding.totalView.setVisibility(View.VISIBLE);
                     flag = 0;
-                    Toast.makeText(getBaseContext(), getString(R.string.delete_donated), Toast.LENGTH_LONG)
+                    Toast.makeText(getBaseContext(), getString(R.string.delete_donated), Toast.LENGTH_SHORT)
                             .show();
                     break;
                 case R.id.radio_pooja:
                     binding.totalView.setVisibility(View.VISIBLE);
                     flag = 1;
-                    Toast.makeText(getBaseContext(), getString(R.string.delete_pooja), Toast.LENGTH_LONG)
+                    Toast.makeText(getBaseContext(), getString(R.string.delete_pooja), Toast.LENGTH_SHORT)
                             .show();
                     break;
             }
@@ -93,7 +93,7 @@ protected Void doInBackground(Void... params) {
         protected void onPostExecute(Void aVoid) {
             super.onPostExecute(aVoid);
             dialog.dismiss();
-            Toast.makeText(getApplicationContext(), result, Toast.LENGTH_LONG).show();
+            Toast.makeText(getBaseContext(), result, Toast.LENGTH_SHORT).show();
         }
     }
 }
diff --git a/app/src/main/java/org/amfoss/templeapp/activities/InsertData.java b/app/src/main/java/org/amfoss/templeapp/activities/InsertData.java
index 6508622..9e4da04 100644
--- a/app/src/main/java/org/amfoss/templeapp/activities/InsertData.java
+++ b/app/src/main/java/org/amfoss/templeapp/activities/InsertData.java
@@ -83,7 +83,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
                     insertDataBinding.amount.setVisibility(View.GONE);
                     id = getResources().getString(R.string.DON);
                     flag = 0;
-                    Toast.makeText(getBaseContext(), getString(R.string.selected_donate), Toast.LENGTH_LONG)
+                    Toast.makeText(getBaseContext(), getString(R.string.selected_donate), Toast.LENGTH_SHORT)
                             .show();
                     break;
 
@@ -93,7 +93,8 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
                     insertDataBinding.spinner1.setVisibility(View.VISIBLE);
                     id = getString(R.string.REG);
                     flag = 1;
-                    Toast.makeText(getBaseContext(), getString(R.string.selected_register), Toast.LENGTH_LONG)
+                    Toast.makeText(
+                                    getBaseContext(), getString(R.string.selected_register), Toast.LENGTH_SHORT)
                             .show();
                     break;
             }
@@ -161,7 +162,7 @@ protected Void doInBackground(Void... params) {
         protected void onPostExecute(Void aVoid) {
             super.onPostExecute(aVoid);
             dialog.dismiss();
-            Toast.makeText(getApplicationContext(), result, Toast.LENGTH_LONG).show();
+            Toast.makeText(getBaseContext(), result, Toast.LENGTH_SHORT).show();
         }
     }
 }
diff --git a/app/src/main/java/org/amfoss/templeapp/activities/MainActivity.java b/app/src/main/java/org/amfoss/templeapp/activities/MainActivity.java
index d8c2d62..4867d07 100644
--- a/app/src/main/java/org/amfoss/templeapp/activities/MainActivity.java
+++ b/app/src/main/java/org/amfoss/templeapp/activities/MainActivity.java
@@ -49,8 +49,8 @@ public void onClick(DialogInterface dialog, int id) {
 
     public class Presenter {
         public void onInsertClick(View view) {
-            if (InternetConnection.checkConnection(getApplicationContext())) {
-                Intent intent = new Intent(getApplicationContext(), InsertData.class);
+            if (InternetConnection.checkConnection(getBaseContext())) {
+                Intent intent = new Intent(getBaseContext(), InsertData.class);
                 startActivity(intent);
             } else {
                 createNetErrorDialog();
@@ -58,8 +58,8 @@ public void onInsertClick(View view) {
         }
 
         public void onReadAllClick(View view) {
-            if (InternetConnection.checkConnection(getApplicationContext())) {
-                Intent intent = new Intent(getApplicationContext(), ReadAllData.class);
+            if (InternetConnection.checkConnection(getBaseContext())) {
+                Intent intent = new Intent(getBaseContext(), ReadAllData.class);
                 startActivity(intent);
             } else {
                 createNetErrorDialog();
@@ -67,8 +67,8 @@ public void onReadAllClick(View view) {
         }
 
         public void onUpdateClick(View view) {
-            if (InternetConnection.checkConnection(getApplicationContext())) {
-                Intent intent = new Intent(getApplicationContext(), UpdateData.class);
+            if (InternetConnection.checkConnection(getBaseContext())) {
+                Intent intent = new Intent(getBaseContext(), UpdateData.class);
                 startActivity(intent);
             } else {
                 createNetErrorDialog();
@@ -76,8 +76,8 @@ public void onUpdateClick(View view) {
         }
 
         public void onReadSingleData(View view) {
-            if (InternetConnection.checkConnection(getApplicationContext())) {
-                Intent intent = new Intent(getApplicationContext(), ReadSingleData.class);
+            if (InternetConnection.checkConnection(getBaseContext())) {
+                Intent intent = new Intent(getBaseContext(), ReadSingleData.class);
                 startActivity(intent);
             } else {
                 createNetErrorDialog();
@@ -85,8 +85,8 @@ public void onReadSingleData(View view) {
         }
 
         public void onDeleteClick(View view) {
-            if (InternetConnection.checkConnection(getApplicationContext())) {
-                Intent intent = new Intent(getApplicationContext(), DeleteData.class);
+            if (InternetConnection.checkConnection(getBaseContext())) {
+                Intent intent = new Intent(getBaseContext(), DeleteData.class);
                 startActivity(intent);
             } else {
                 createNetErrorDialog();
diff --git a/app/src/main/java/org/amfoss/templeapp/activities/ReadAllData.java b/app/src/main/java/org/amfoss/templeapp/activities/ReadAllData.java
index ddb40fc..223b02e 100644
--- a/app/src/main/java/org/amfoss/templeapp/activities/ReadAllData.java
+++ b/app/src/main/java/org/amfoss/templeapp/activities/ReadAllData.java
@@ -88,8 +88,7 @@ public void readAllButton(View view) {
                     || readAllBinding.poojaNotPaid.isChecked()
                     || readAllBinding.donatePaid.isChecked()
                     || readAllBinding.donateNotPaid.isChecked())) {
-                Toast.makeText(
-                                getApplicationContext(), getString(R.string.error_notSelected), Toast.LENGTH_LONG)
+                Toast.makeText(getBaseContext(), getString(R.string.error_notSelected), Toast.LENGTH_SHORT)
                         .show();
             } else {
                 new ReadData1().execute();
@@ -220,8 +219,7 @@ protected void onPostExecute(Void aVoid) {
                 readAllBinding.heading.setVisibility(TextView.VISIBLE);
 
             } else {
-                Toast.makeText(getApplicationContext(), getString(R.string.no_data), Toast.LENGTH_LONG)
-                        .show();
+                Toast.makeText(getBaseContext(), getString(R.string.no_data), Toast.LENGTH_SHORT).show();
                 readAllBinding.heading.setVisibility(TextView.INVISIBLE);
             }
         }
diff --git a/app/src/main/java/org/amfoss/templeapp/activities/ReadSingleData.java b/app/src/main/java/org/amfoss/templeapp/activities/ReadSingleData.java
index 1e30b47..f66b1c0 100644
--- a/app/src/main/java/org/amfoss/templeapp/activities/ReadSingleData.java
+++ b/app/src/main/java/org/amfoss/templeapp/activities/ReadSingleData.java
@@ -50,13 +50,14 @@ public void radioGroup(RadioGroup group, int checkedId) {
                 case R.id.radio_donate:
                     binding.totalView.setVisibility(View.VISIBLE);
                     flag = 0;
-                    Toast.makeText(getBaseContext(), getString(R.string.selected_donate), Toast.LENGTH_LONG)
+                    Toast.makeText(getBaseContext(), getString(R.string.selected_donate), Toast.LENGTH_SHORT)
                             .show();
                     break;
                 case R.id.radio_pooja:
                     binding.totalView.setVisibility(View.VISIBLE);
                     flag = 1;
-                    Toast.makeText(getBaseContext(), getString(R.string.selected_register), Toast.LENGTH_LONG)
+                    Toast.makeText(
+                                    getBaseContext(), getString(R.string.selected_register), Toast.LENGTH_SHORT)
                             .show();
                     break;
             }
@@ -134,7 +135,7 @@ protected void onPostExecute(Void aVoid) {
                 binding.paidL.setText(getString(R.string.paid_status));
 
             } else
-                Toast.makeText(getApplicationContext(), getString(R.string.id_not_found), Toast.LENGTH_LONG)
+                Toast.makeText(getBaseContext(), getString(R.string.id_not_found), Toast.LENGTH_SHORT)
                         .show();
         }
     }
diff --git a/app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java b/app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java
index 4504f0e..33ce212 100644
--- a/app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java
+++ b/app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java
@@ -83,7 +83,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
                     binding.moneyDonated.setVisibility(View.VISIBLE);
                     id = getString(R.string.DON);
                     flag = 0;
-                    Toast.makeText(getBaseContext(), getString(R.string.UPDATE), Toast.LENGTH_LONG).show();
+                    Toast.makeText(getBaseContext(), getString(R.string.UPDATE), Toast.LENGTH_SHORT).show();
                     break;
                 case R.id.radio_pooja:
                     binding.totalView.setVisibility(View.VISIBLE);
@@ -92,7 +92,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
                     binding.amount.setVisibility(View.VISIBLE);
                     id = getString(R.string.REG);
                     flag = 1;
-                    Toast.makeText(getBaseContext(), getString(R.string.update_pooja), Toast.LENGTH_LONG)
+                    Toast.makeText(getBaseContext(), getString(R.string.update_pooja), Toast.LENGTH_SHORT)
                             .show();
                     break;
             }
@@ -152,7 +152,7 @@ protected Void doInBackground(Void... params) {
         protected void onPostExecute(Void aVoid) {
             super.onPostExecute(aVoid);
             dialog.dismiss();
-            Toast.makeText(getApplicationContext(), result, Toast.LENGTH_LONG).show();
+            Toast.makeText(getBaseContext(), result, Toast.LENGTH_SHORT).show();
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4eb8cb4..5f79323 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,141 +9,146 @@
             name="Presenter"
             type="org.amfoss.templeapp.activities.MainActivity.Presenter" />
     </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#eee"
-        android:orientation="vertical"
-        tools:context=".activities.MainActivity">
-
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/height_162"
-            android:layout_gravity="top"
-            android:layout_marginTop="@dimen/margin_0"
-            android:layout_marginBottom="@dimen/margin_15"
-            android:background="#E7CDDA"
-            android:padding="@dimen/padding_0"
-            android:scaleType="fitXY"
-            android:tint="#6F000000"
-            app:srcCompat="@drawable/temple_default_cover" />
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginRight="@dimen/margin_5">
+            android:background="#eee"
+            android:orientation="vertical"
+            tools:context=".activities.MainActivity">
 
-            <Button
-                android:id="@+id/insert_btn"
+            <ImageView
+                android:id="@+id/imageView"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/height_120"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/margin_5"
-                android:layout_weight="@dimen/weight_1"
-                android:background="@color/orange"
-                android:drawableTop="@android:drawable/ic_menu_add"
-                android:drawablePadding="@dimen/padding_0"
-                android:drawableTint="#fff"
-                android:onClick="@{Presenter::onInsertClick}"
-                android:padding="@dimen/padding_20"
-                android:text="Add Pooja/Dontation"
-                android:textAllCaps="false"
-                android:textColor="#fff" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginRight="@dimen/margin_5">
-
-            <Button
-                android:id="@+id/read_btn"
+                android:layout_height="@dimen/height_162"
+                android:layout_gravity="top"
+                android:layout_marginTop="@dimen/margin_0"
+                android:layout_marginBottom="@dimen/margin_15"
+                android:background="#E7CDDA"
+                android:padding="@dimen/padding_0"
+                android:scaleType="fitXY"
+                android:tint="#6F000000"
+                app:srcCompat="@drawable/temple_default_cover" />
+
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/height_120"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="@dimen/margin_5"
-                android:layout_weight="@dimen/weight_1"
-                android:background="@color/orange"
-                android:drawableTop="@android:drawable/ic_menu_search"
-                android:drawablePadding="@dimen/padding_0"
-                android:drawableTint="#fff"
-                android:onClick="@{Presenter::onReadSingleData}"
-                android:padding="@dimen/padding_20"
-                android:text="Search Pooja/Donation"
-                android:textAllCaps="false"
-                android:textColor="#fff" />
-
-            <Button
-                android:id="@+id/read_all_btn"
+                android:layout_marginLeft="@dimen/margin_5"
+                android:layout_marginRight="@dimen/margin_5">
+
+                <Button
+                    android:id="@+id/insert_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_120"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/margin_5"
+                    android:layout_weight="@dimen/weight_1"
+                    android:background="@color/orange"
+                    android:drawableTop="@android:drawable/ic_menu_add"
+                    android:drawablePadding="@dimen/padding_0"
+                    android:drawableTint="#fff"
+                    android:onClick="@{Presenter::onInsertClick}"
+                    android:padding="@dimen/padding_20"
+                    android:text="Add Pooja/Dontation"
+                    android:textAllCaps="false"
+                    android:textColor="#fff" />
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/height_120"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="@dimen/margin_5"
-                android:layout_weight="@dimen/weight_1"
-                android:background="@color/orange"
-                android:drawableTop="@android:drawable/ic_menu_view"
-                android:drawablePadding="@dimen/padding_0"
-                android:drawableTint="#fff"
-                android:onClick="@{Presenter::onReadAllClick}"
-                android:padding="@dimen/padding_20"
-                android:text="View All Pooja/Donation"
-                android:textAllCaps="false"
-                android:textColor="#fff" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/margin_5"
-            android:layout_marginRight="@dimen/margin_5">
-
-
-            <Button
-                android:id="@+id/update_btn"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/height_120"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/margin_5"
-                android:layout_weight="@dimen/weight_1"
-                android:background="@color/orange"
-                android:drawableTop="@android:drawable/ic_menu_edit"
-                android:drawablePadding="@dimen/padding_0"
-                android:drawableTint="#fff"
-                android:onClick="@{Presenter::onUpdateClick}"
-                android:padding="@dimen/padding_20"
-                android:text="Edit Pooja/Donation"
-                android:textAllCaps="false"
-                android:textColor="#fff" />
-
-            <Button
-                android:id="@+id/delete_btn"
+                android:layout_marginLeft="@dimen/margin_5"
+                android:layout_marginRight="@dimen/margin_5">
+
+                <Button
+                    android:id="@+id/read_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_120"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/margin_5"
+                    android:layout_weight="@dimen/weight_1"
+                    android:background="@color/orange"
+                    android:drawableTop="@android:drawable/ic_menu_search"
+                    android:drawablePadding="@dimen/padding_0"
+                    android:drawableTint="#fff"
+                    android:onClick="@{Presenter::onReadSingleData}"
+                    android:padding="@dimen/padding_20"
+                    android:text="Search Pooja/Donation"
+                    android:textAllCaps="false"
+                    android:textColor="#fff" />
+
+                <Button
+                    android:id="@+id/read_all_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_120"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/margin_5"
+                    android:layout_weight="@dimen/weight_1"
+                    android:background="@color/orange"
+                    android:drawableTop="@android:drawable/ic_menu_view"
+                    android:drawablePadding="@dimen/padding_0"
+                    android:drawableTint="#fff"
+                    android:onClick="@{Presenter::onReadAllClick}"
+                    android:padding="@dimen/padding_20"
+                    android:text="View All Pooja/Donation"
+                    android:textAllCaps="false"
+                    android:textColor="#fff" />
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/height_120"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_margin="@dimen/margin_5"
-                android:layout_weight="@dimen/weight_1"
-                android:background="@color/orange"
-                android:drawableTop="@android:drawable/ic_menu_delete"
-                android:drawablePadding="@dimen/padding_0"
-                android:drawableTint="#fff"
-                android:onClick="@{Presenter::onDeleteClick}"
-                android:padding="@dimen/padding_20"
-                android:text="Delete Pooja/Donation"
-                android:textAllCaps="false"
-                android:textColor="#fff" />
-
+                android:layout_marginLeft="@dimen/margin_5"
+                android:layout_marginRight="@dimen/margin_5">
+
+
+                <Button
+                    android:id="@+id/update_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_120"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/margin_5"
+                    android:layout_weight="@dimen/weight_1"
+                    android:background="@color/orange"
+                    android:drawableTop="@android:drawable/ic_menu_edit"
+                    android:drawablePadding="@dimen/padding_0"
+                    android:drawableTint="#fff"
+                    android:onClick="@{Presenter::onUpdateClick}"
+                    android:padding="@dimen/padding_20"
+                    android:text="Edit Pooja/Donation"
+                    android:textAllCaps="false"
+                    android:textColor="#fff" />
+
+                <Button
+                    android:id="@+id/delete_btn"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/height_120"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/margin_5"
+                    android:layout_weight="@dimen/weight_1"
+                    android:background="@color/orange"
+                    android:drawableTop="@android:drawable/ic_menu_delete"
+                    android:drawablePadding="@dimen/padding_0"
+                    android:drawableTint="#fff"
+                    android:onClick="@{Presenter::onDeleteClick}"
+                    android:padding="@dimen/padding_20"
+                    android:text="Delete Pooja/Donation"
+                    android:textAllCaps="false"
+                    android:textColor="#fff" />
+
+
+            </LinearLayout>
 
         </LinearLayout>
-
-    </LinearLayout>
+    </ScrollView>
 </layout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index cb067a2..a54ed03 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,4 @@ org.gradle.daemon=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
diff --git a/pull_request_template.md b/pull_request_template.md
new file mode 100644
index 0000000..31e44ef
--- /dev/null
+++ b/pull_request_template.md
@@ -0,0 +1,14 @@
+# Related Issue
+- Reduce Toast Duration
+
+
+# Proposed Changes
+- Change duration input from Toast.LENGTH_LONG  to Toast.LENGTH_SHORT
+
+# Checklist
+- [x] Test
+- [ ] Verified
+- [ ] Documentation
+
+
+