diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..58a6060
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+ekart
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 943d60e..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\dulth\.android\avd\Pixel_3_XL_API_31.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-09-25T10:18:52.660859400Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 96a2f7f..082c308 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,35 +3,54 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/drawable/buttons.xml" value="0.17871621621621622" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/drawable/input_border.xml" value="0.206640625" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_about_us.xml" value="0.16824324324324325" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_admin_add_new_product.xml" value="0.2" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_admin_category.xml" value="0.264" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_admin_new_orders.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_admin_user_products.xml" value="0.1" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_cart.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_confirm_final_order.xml" value="0.264" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_contact_us.xml" value="0.2" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_feedback.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_home.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_inquiry.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_login.xml" value="0.152" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_main.xml" value="0.11486486486486487" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_product_details.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_register.xml" value="0.16458333333333333" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_search_products.xml" value="0.15472972972972973" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/activity_settins.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/cart_items_layout.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/content.xml" value="0.16824324324324325" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/header.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/orders_layout.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/layout/product_items_layout.xml" value="0.19453125" />
+        <entry key="..\:/MAD_Labsheets/Team-Oreo/app/src/main/res/menu/main_menu.xml" value="0.19453125" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/drawable/input_border.xml" value="0.2755208333333333" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/drawable/side_nav_bar.xml" value="0.17871621621621622" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/drawable/yellow_border.xml" value="0.2212962962962963" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/font/aclonica.xml" value="0.28512820512820514" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_about_us.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_add_new_product.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_category.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_new_orders.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_user_products.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_cart.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_confirm_final_order.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_contact_us.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_feedback.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_home.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_inquiry.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_login.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_main.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_product_details.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_register.xml" value="0.2" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_search_products.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_settins.xml" value="0.264" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_add_new_product.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_category.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_new_orders.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_admin_user_products.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_cart.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_confirm_final_order.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_home.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_login.xml" value="0.2" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_main.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_product_details.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_register.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_search_products.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/activity_settins.xml" value="0.259375" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/cart_items_layout.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/content.xml" value="0.2" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/content.xml" value="0.259375" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/header.xml" value="0.259375" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/orders_layout.xml" value="0.264" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/product_items_layout.xml" value="0.2" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/orders_layout.xml" value="0.259375" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/product_items_layout.xml" value="0.259375" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/test.xml" value="0.16824324324324325" />
-        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/toolbar.xml" value="0.264" />
+        <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/layout/toolbar.xml" value="0.259375" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/menu/main_menu.xml" value="0.259375" />
         <entry key="..\:/Users/dulth/Desktop/ekart/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.17871621621621622" />
       </map>
diff --git a/app/build.gradle b/app/build.gradle
index fb39291..ad3346d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,13 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.firebase:firebase-database:20.0.2'
+    implementation 'com.basgeekball:awesome-validation:4.2'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
diff --git a/app/src/main/java/com/dhruva/shopping/AdminAddNewProductActivity.java b/app/src/main/java/com/dhruva/shopping/AdminAddNewProductActivity.java
index b7c5e80..914089d 100644
--- a/app/src/main/java/com/dhruva/shopping/AdminAddNewProductActivity.java
+++ b/app/src/main/java/com/dhruva/shopping/AdminAddNewProductActivity.java
@@ -33,6 +33,7 @@
 public class AdminAddNewProductActivity extends AppCompatActivity {
     private String CategoryName, Description, Price, Pname, saveCurrentDate, saveCurrentTime;
     private Button AddNewProductButton;
+    private Button Back_btn;
     private ImageView InputProductImage;
     private EditText InputProductName, InputProductDescription, InputProductPrice;
     private static final int GalleryPick = 1;
@@ -44,8 +45,7 @@ public class AdminAddNewProductActivity extends AppCompatActivity {
 
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_admin_add_new_product);
 
@@ -56,6 +56,7 @@ protected void onCreate(Bundle savedInstanceState)
 
 
         AddNewProductButton = (Button) findViewById(R.id.add_new_product);
+        Back_btn = (Button) findViewById(R.id.admin_new_itempage_back);
         InputProductImage = (ImageView) findViewById(R.id.select_product_image);
         InputProductName = (EditText) findViewById(R.id.product_name);
         InputProductDescription = (EditText) findViewById(R.id.product_description);
@@ -65,8 +66,8 @@ protected void onCreate(Bundle savedInstanceState)
 
         InputProductImage.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view)
-            {
+            public void onClick(View view) {
+
                 OpenGallery();
             }
         });
@@ -74,14 +75,23 @@ public void onClick(View view)
 
         AddNewProductButton.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view)
-            {
+            public void onClick(View view) {
+
                 ValidateProductData();
             }
         });
-    }
 
+        Back_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent btnIntent = new Intent(AdminAddNewProductActivity.this,AdminCategoryActivity.class);
+                startActivity(btnIntent);
+            }
+        });
+    }
 
+    //Sub Function 01
+    //Pick a image from the device gallery
     private void OpenGallery(){
         Intent galleryIntent = new Intent();
         galleryIntent.setAction(Intent.ACTION_GET_CONTENT);
@@ -89,8 +99,7 @@ private void OpenGallery(){
         startActivityForResult(galleryIntent, GalleryPick);
     }
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode==GalleryPick  &&  resultCode==RESULT_OK  &&  data!=null)
@@ -99,6 +108,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data)
             InputProductImage.setImageURI(ImageUri);
         }
     }
+
+    //Sub Function 02
+    //Validate input fields fullfill with correct data or not
     private void ValidateProductData() {
         Description = InputProductDescription.getText().toString();
         Price = InputProductPrice.getText().toString();
@@ -125,8 +137,10 @@ else if (TextUtils.isEmpty(Pname))
         }
 
     }
-    private void StoreProductInformation()
-    {
+
+    //Sub Function 03
+    //Set data for firebase storage
+    private void StoreProductInformation() {
         loadingBar.setTitle("Add New Product");
         loadingBar.setMessage("Dear Admin, please wait while we are adding the new product.");
         loadingBar.setCanceledOnTouchOutside(false);
@@ -187,8 +201,10 @@ public void onComplete(@NonNull Task<Uri> task) {
         });
 
     }
-    private void SaveProductInfoToDatabase()
-    {
+
+    //Sub Function 04
+    //Input data save to the DB
+    private void SaveProductInfoToDatabase() {
         HashMap<String, Object> productMap = new HashMap<>();
         productMap.put("pid", productRandomKey);
         productMap.put("date", saveCurrentDate);
diff --git a/app/src/main/java/com/dhruva/shopping/DAOFeed.java b/app/src/main/java/com/dhruva/shopping/DAOFeed.java
index 7f74119..d367e94 100644
--- a/app/src/main/java/com/dhruva/shopping/DAOFeed.java
+++ b/app/src/main/java/com/dhruva/shopping/DAOFeed.java
@@ -1,5 +1,6 @@
 package com.dhruva.shopping;
 
+import com.dhruva.shopping.Model.Feed;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
@@ -11,14 +12,13 @@ public class DAOFeed
     private DatabaseReference databaseReference;
     public DAOFeed()
     {
-        FirebaseDatabase db = FirebaseDatabase.getInstance("https://foodie-app-fdc64-default-rtdb.firebaseio.com/");
+        FirebaseDatabase db = FirebaseDatabase.getInstance();
         databaseReference = db.getReference(Feed.class.getSimpleName());
     }
 
     public Task<Void> add(Feed feed)
 
     {
-
         return databaseReference.push().setValue(feed);
     }
 
@@ -29,7 +29,6 @@ public Task<Void> update(String key, HashMap<String, Object> hashMap)
 
     public Task<Void> remove(String key)
     {
-
         return databaseReference.child(key).removeValue();
     }
 
diff --git a/app/src/main/java/com/dhruva/shopping/DAOFeed2.java b/app/src/main/java/com/dhruva/shopping/DAOFeed2.java
new file mode 100644
index 0000000..880f45d
--- /dev/null
+++ b/app/src/main/java/com/dhruva/shopping/DAOFeed2.java
@@ -0,0 +1,20 @@
+package com.dhruva.shopping;
+
+import com.dhruva.shopping.Model.Feed2;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+public class DAOFeed2 {
+    private DatabaseReference databaseReference;
+    public DAOFeed2()
+    {
+        FirebaseDatabase db = FirebaseDatabase.getInstance();
+        databaseReference = db.getReference(Feed2.class.getSimpleName());
+    }
+
+    public Task<Void> add(Feed2 feed2)
+    {
+        return databaseReference.push().setValue(feed2);
+    }
+}
diff --git a/app/src/main/java/com/dhruva/shopping/Feedback.java b/app/src/main/java/com/dhruva/shopping/Feedback.java
index 8ef5f34..0e136f9 100644
--- a/app/src/main/java/com/dhruva/shopping/Feedback.java
+++ b/app/src/main/java/com/dhruva/shopping/Feedback.java
@@ -5,65 +5,118 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.RatingBar;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import com.basgeekball.awesomevalidation.AwesomeValidation;
+import com.basgeekball.awesomevalidation.ValidationStyle;
+import com.basgeekball.awesomevalidation.utility.RegexTemplate;
+import com.dhruva.shopping.Model.Feed2;
 
 public class Feedback extends AppCompatActivity {
 
     Button btnWith;
     TextView text_feedback3;
     RatingBar ratingBar;
+    EditText editTextTextMultiLine;
+    Button submit1;
+
+    AwesomeValidation awesomeValidation;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_feedback);
 
-        btnWith=(Button)findViewById(R.id.With);
-        btnWith.setOnClickListener((v) ->{
-            startActivity(new Intent(Feedback.this,Contact_Us.class));
-        });
+        editTextTextMultiLine = findViewById(R.id.editTextTextMultiLine);
+        final EditText editTextTextMultiLine = findViewById(R.id.editTextTextMultiLine);
+        submit1 = findViewById(R.id.submit1);
 
-        getSupportActionBar().setTitle("FOODIE Feedback");
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        DAOFeed2 dao = new DAOFeed2();
 
-        text_feedback3 = findViewById(R.id.text_feedback3);
-        ratingBar = findViewById(R.id.ratingBar);
+        submit1.setOnClickListener(v->{
 
-        ratingBar.setOnRatingBarChangeListener(new RatingBar.OnRatingBarChangeListener() {
+            //initialize validation style
+            awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC);
+
+            //Add validation for name
+            awesomeValidation.addValidation(this,R.id.editTextTextMultiLine,
+                    RegexTemplate.NOT_EMPTY,R.string.invalid_feedback);
+
+        /*submit1.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onRatingChanged(RatingBar ratingBar, float v, boolean b) {
-                if (v == 0)
-                {
-                    text_feedback3.setText("Very Dissatisfied");
+            public void onClick(View view) {
+                if (awesomeValidation.validate()) {
+                    Toast.makeText(getApplicationContext()
+                            , "Successfully Feedback", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(getApplicationContext()
+                            , "Failed", Toast.LENGTH_SHORT).show();
                 }
+            }
+        });*/
 
-                else if (v == 1)
-                {
-                    text_feedback3.setText("Dissatisfied");
-                }
 
-                else if (v == 2 || v == 3)
-                {
-                    text_feedback3.setText("Ok");
-                }
 
-                else if (v == 4)
-                {
-                    text_feedback3.setText("Satisfied");
+            Feed2 feed2 = new Feed2(editTextTextMultiLine.getText().toString());
+            dao.add(feed2).addOnSuccessListener(suc->
+            {
+                if (awesomeValidation.validate()) {
+                    Toast.makeText(this, "Successfully Feedback", Toast.LENGTH_SHORT).show();
                 }
+            }).addOnFailureListener(er->
+                    Toast.makeText(this,""+er.getMessage(),Toast.LENGTH_SHORT).show());
 
-                else if (v == 5)
-                {
-                    text_feedback3.setText("Very Satisfied");
-                }
 
-                else
-                {
 
-                }
+            btnWith=(Button)findViewById(R.id.With);
+            btnWith.setOnClickListener((z) ->{
+                startActivity(new Intent(Feedback.this,Contact_Us.class));
+            });
 
-            }
+            getSupportActionBar().setTitle("FOODIE Feedback");
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+            text_feedback3 = findViewById(R.id.text_feedback3);
+            ratingBar = findViewById(R.id.ratingBar);
+
+            ratingBar.setOnRatingBarChangeListener(new RatingBar.OnRatingBarChangeListener() {
+                @Override
+                public void onRatingChanged(RatingBar ratingBar, float v, boolean b) {
+                    if (v == 0)
+                    {
+                        text_feedback3.setText("Very Dissatisfied");
+                    }
+
+                    else if (v == 1)
+                    {
+                        text_feedback3.setText("Dissatisfied");
+                    }
+
+                    else if (v == 2 || v == 3)
+                    {
+                        text_feedback3.setText("Ok");
+                    }
+
+                    else if (v == 4)
+                    {
+                        text_feedback3.setText("Satisfied");
+                    }
+
+                    else if (v == 5)
+                    {
+                        text_feedback3.setText("Very Satisfied");
+                    }
+
+                    else
+                    {
+
+                    }
+
+                }
+            });
         });
     }
 
diff --git a/app/src/main/java/com/dhruva/shopping/HomeActivity.java b/app/src/main/java/com/dhruva/shopping/HomeActivity.java
index c9dce26..38bcc9d 100644
--- a/app/src/main/java/com/dhruva/shopping/HomeActivity.java
+++ b/app/src/main/java/com/dhruva/shopping/HomeActivity.java
@@ -165,26 +165,27 @@ public boolean onNavigationItemSelected(MenuItem item) {
         if (id == R.id.nav_store) {
             Intent intent = new Intent(HomeActivity.this,CartActivity.class);
             startActivity(intent);
+
         } else if (id == R.id.nav_search) {
             Intent intent = new Intent(HomeActivity.this,SearchProductsActivity.class);
             startActivity(intent);
 
-        } else if (id == R.id.nav_categories) {
+        } else if (id == R.id.nav_inquiry) {
+            Intent intent = new Intent(HomeActivity.this,Inquiry.class);
+            startActivity(intent);
 
         } else if (id == R.id.nav_profile) {
-            Intent intent=new Intent(HomeActivity.this,SettinsActivity.class);
+            Intent intent = new Intent(HomeActivity.this,SettinsActivity.class);
             startActivity(intent);
 
         } else if (id == R.id.nav_logout) {
             Paper.book().destroy();
-            Intent intent=new Intent(HomeActivity.this,MainActivity.class);
+            Intent intent = new Intent(HomeActivity.this,MainActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK |Intent.FLAG_ACTIVITY_CLEAR_TASK );
             startActivity(intent);
             finish();
-
         }
 
-
         drawerLayout.closeDrawer(GravityCompat.START);
         return true;
     }
diff --git a/app/src/main/java/com/dhruva/shopping/Inquiry.java b/app/src/main/java/com/dhruva/shopping/Inquiry.java
index a09d75a..aecbf7a 100644
--- a/app/src/main/java/com/dhruva/shopping/Inquiry.java
+++ b/app/src/main/java/com/dhruva/shopping/Inquiry.java
@@ -1,6 +1,5 @@
 package com.dhruva.shopping;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Button;
 import android.widget.EditText;
@@ -8,70 +7,63 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.basgeekball.awesomevalidation.AwesomeValidation;
+import com.basgeekball.awesomevalidation.ValidationStyle;
+import com.basgeekball.awesomevalidation.utility.RegexTemplate;
+import com.dhruva.shopping.Model.Feed;
+
 public class Inquiry extends AppCompatActivity {
 
-    Button nextbutton;
+    Button submitbutton;
+    AwesomeValidation awesomeValidation;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_inquiry);
 
+        final EditText edit_name = findViewById(R.id.edit_name);
+        final EditText edit_Inquiry = findViewById(R.id.edit_Inquiry);
+        final EditText edit_Contact = findViewById(R.id.edit_Contact);
+        final EditText edit_Inquire = findViewById(R.id.edit_Inquire);
 
-        nextbutton = (Button) findViewById(R.id.nextbutton);
-        nextbutton.setOnClickListener((V) ->
-        {
-            startActivity(new Intent(Inquiry.this, Feedback.class));
-
-            final EditText edit_name = findViewById(R.id.edit_name);
-            final EditText edit_Inquiry = findViewById(R.id.edit_Inquiry);
-            final EditText edit_Contact = findViewById(R.id.edit_Contact);
-            final EditText edit_Inquire = findViewById(R.id.edit_Inquire);
-
-            Button btn = findViewById(R.id.submitbutton);
-            DAOFeed dao = new DAOFeed();
+        submitbutton = findViewById(R.id.submitbutton);
 
-            btn.setOnClickListener(v ->
-            {
-                Feed feed = new Feed(edit_name.getText().toString(), edit_Inquiry.getText().toString(), edit_Contact.getText().toString(), edit_Inquire.getText().toString());
-                dao.add(feed).addOnSuccessListener(suc ->
-                {
-                    Toast.makeText(this, "Inquiry was submitted", Toast.LENGTH_SHORT).show();
+        submitbutton.setOnClickListener(v -> {
 
-                }).addOnFailureListener(er ->
-                {
-                    Toast.makeText(this, "Some thing went wrong" + er, Toast.LENGTH_SHORT).show();
-                });
+            //initialize validation style
+            awesomeValidation = new AwesomeValidation(ValidationStyle.BASIC);
 
+            //Add validation for name
+            awesomeValidation.addValidation(this, R.id.edit_name,
+                    RegexTemplate.NOT_EMPTY, R.string.invalid_name);
 
-            /*HashMap<String, Object> hashMap = new HashMap<>();
-            hashMap.put("name", edit_name.getText().toString());
-            hashMap.put("Inquiry", edit_Inquiry.getText().toString());
-            hashMap.put("Contact", edit_Contact.getText().toString());
-            hashMap.put("Inquire", edit_Inquire.getText().toString());
+            //validation for Inquiry
+            awesomeValidation.addValidation(this, R.id.edit_Inquiry,
+                    RegexTemplate.NOT_EMPTY, R.string.invalid_inquiry);
 
-            dao.update("-MkMlKbKhpREFol5JVKr", hashMap).addOnSuccessListener(suc ->
-            {
-                Toast.makeText(this, "Record is updated", Toast.LENGTH_SHORT).show();
+            //validation for contact
+            awesomeValidation.addValidation(this, R.id.edit_Contact
+                    , "[5-9]{1}[0-9]{9}$", R.string.invalid_number);
 
-            }).addOnFailureListener(er ->
+            //validation for Inquire
+            awesomeValidation.addValidation(this, R.id.edit_Inquire,
+                    RegexTemplate.NOT_EMPTY, R.string.invalid_inquire);
 
-            {
-                Toast.makeText(this, "" + er.getMessage(), Toast.LENGTH_SHORT).show();
-            });*/
 
+            DAOFeed dao = new DAOFeed();
 
-            /*dao.remove("-MkMlKbKhpREFol5JVKr").addOnSuccessListener(suc ->
+            Feed feed = new Feed(edit_name.getText().toString(), edit_Inquiry.getText().toString(), edit_Contact.getText().toString(), edit_Inquire.getText().toString());
+            dao.add(feed).addOnSuccessListener(suc ->
             {
-                Toast.makeText(this, "Record is removed", Toast.LENGTH_SHORT).show();
-
+                if (awesomeValidation.validate()) {
+                    Toast.makeText(this, "Inquiry was submitted", Toast.LENGTH_SHORT).show();
+                }
             }).addOnFailureListener(er ->
-
-            {
-                Toast.makeText(this, "" + er.getMessage(), Toast.LENGTH_SHORT).show();
-            });*/
+                    Toast.makeText(this, "" + er, Toast.LENGTH_SHORT).show());
 
             });
-        });
+
+
     }
 }
diff --git a/app/src/main/java/com/dhruva/shopping/LoginActivity.java b/app/src/main/java/com/dhruva/shopping/LoginActivity.java
index 67e8063..a187bec 100644
--- a/app/src/main/java/com/dhruva/shopping/LoginActivity.java
+++ b/app/src/main/java/com/dhruva/shopping/LoginActivity.java
@@ -43,6 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
         loadingBar = new ProgressDialog(this);
         chkBoxRememberMe = (CheckBox) findViewById(R.id.remember_me_chkb);
         Paper.init(this);
+
         LoginButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -52,18 +53,17 @@ public void onClick(View view) {
 
         AdminLink.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view)
-            {
+            public void onClick(View view) {
                 LoginButton.setText("Login Admin");
                 AdminLink.setVisibility(View.INVISIBLE);
                 NotAdminLink.setVisibility(View.VISIBLE);
                 parentDbName = "Admins";
             }
         });
+
         NotAdminLink.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view)
-            {
+            public void onClick(View view) {
                 LoginButton.setText("Login");
                 AdminLink.setVisibility(View.VISIBLE);
                 NotAdminLink.setVisibility(View.INVISIBLE);
@@ -72,21 +72,18 @@ public void onClick(View view)
         });
 
     }
-    private void LoginUser()
-    {
+
+    private void LoginUser() {
         String phone = InputPhoneNumber.getText().toString();
         String password = InputPassword.getText().toString();
 
-        if (TextUtils.isEmpty(phone))
-        {
+        if (TextUtils.isEmpty(phone)) {
             Toast.makeText(this, "Please write your phone number...", Toast.LENGTH_SHORT).show();
         }
-        else if (TextUtils.isEmpty(password))
-        {
+        else if (TextUtils.isEmpty(password)) {
             Toast.makeText(this, "Please write your password...", Toast.LENGTH_SHORT).show();
         }
-        else
-        {
+        else {
             loadingBar.setTitle("Login Account");
             loadingBar.setMessage("Please wait, while we are checking the credentials.");
             loadingBar.setCanceledOnTouchOutside(false);
@@ -96,11 +93,10 @@ else if (TextUtils.isEmpty(password))
             AllowAccessToAccount(phone, password);
         }
     }
-    private void AllowAccessToAccount(final String phone, final String password)
-    {
 
-        if(chkBoxRememberMe.isChecked())
-        {
+    private void AllowAccessToAccount(final String phone, final String password) {
+
+        if(chkBoxRememberMe.isChecked()) {
             Paper.book().write(Prevalent.UserPhoneKey, phone);
             Paper.book().write(Prevalent.UserPasswordKey, password);
         }
@@ -112,12 +108,9 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                 if (dataSnapshot.child(parentDbName).child(phone).exists()){
 
                     Users usersData = dataSnapshot.child(parentDbName).child(phone).getValue(Users.class);
-                    if (usersData.getPhone().equals(phone))
-                    {
-                        if (usersData.getPassword().equals(password))
-                        {
-                            if(parentDbName.equals("Admins"))
-                            {
+                    if (usersData.getPhone().equals(phone)) {
+                        if (usersData.getPassword().equals(password)) {
+                            if(parentDbName.equals("Admins")) {
                                 Toast.makeText(LoginActivity.this, "Welcome Admin, you are logged in Successfully...", Toast.LENGTH_SHORT).show();
                                 loadingBar.dismiss();
 
diff --git a/app/src/main/java/com/dhruva/shopping/Feed.java b/app/src/main/java/com/dhruva/shopping/Model/Feed.java
similarity index 94%
rename from app/src/main/java/com/dhruva/shopping/Feed.java
rename to app/src/main/java/com/dhruva/shopping/Model/Feed.java
index 78cdda9..93dd2b3 100644
--- a/app/src/main/java/com/dhruva/shopping/Feed.java
+++ b/app/src/main/java/com/dhruva/shopping/Model/Feed.java
@@ -1,4 +1,4 @@
-package com.dhruva.shopping;
+package com.dhruva.shopping.Model;
 
 public class Feed
 {
@@ -9,8 +9,7 @@ public class Feed
 
     public Feed(){}
 
-    public Feed(String name, String inquiry, String contact, String inquire)
-    {
+    public Feed(String name, String inquiry, String contact, String inquire) {
         this.name = name;
         this.Inquiry = inquiry;
         this.Contact = contact;
diff --git a/app/src/main/java/com/dhruva/shopping/Model/Feed2.java b/app/src/main/java/com/dhruva/shopping/Model/Feed2.java
new file mode 100644
index 0000000..0229590
--- /dev/null
+++ b/app/src/main/java/com/dhruva/shopping/Model/Feed2.java
@@ -0,0 +1,21 @@
+package com.dhruva.shopping.Model;
+
+public class Feed2 {
+    private String feedback;
+
+    public Feed2() {
+    }
+
+    public Feed2(String feedback) {
+        this.feedback = feedback;
+    }
+
+
+    public String getFeedback() {
+        return feedback;
+    }
+
+    public void setFeedback(String feedback) {
+        this.feedback = feedback;
+    }
+}
diff --git a/app/src/main/java/com/dhruva/shopping/SettinsActivity.java b/app/src/main/java/com/dhruva/shopping/SettinsActivity.java
index 3dcb165..8e74bfe 100644
--- a/app/src/main/java/com/dhruva/shopping/SettinsActivity.java
+++ b/app/src/main/java/com/dhruva/shopping/SettinsActivity.java
@@ -47,7 +47,7 @@ public class SettinsActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settins);
-        storageProfilePrictureRef = FirebaseStorage.getInstance("https://ekart-cf358-default-rtdb.firebaseio.com/").getReference().child("Profile pictures");
+        storageProfilePrictureRef = FirebaseStorage.getInstance().getReference().child("Profile pictures");
 
         profileImageView = (CircleImageView) findViewById(R.id.settings_profile_image);
         fullNameEditText = (EditText) findViewById(R.id.settings_full_name);
@@ -96,7 +96,7 @@ public void onClick(View view)
     }
 
     private void updateOnlyUserInfo() {
-        DatabaseReference ref = FirebaseDatabase.getInstance("https://ekart-cf358-default-rtdb.firebaseio.com/").getReference().child("Users");
+        DatabaseReference ref = FirebaseDatabase.getInstance().getReference().child("Users");
 
         HashMap<String, Object> userMap = new HashMap<>();
         userMap. put("name", fullNameEditText.getText().toString());
@@ -180,7 +180,7 @@ public void onComplete(@NonNull Task<Uri> task) {
                     if (task.isSuccessful()) {
                         Uri downloadUrl = task.getResult();
                         myUrl = downloadUrl.toString();
-                        DatabaseReference ref = FirebaseDatabase.getInstance("https://ekart-cf358-default-rtdb.firebaseio.com/").getReference().child("Users");
+                        DatabaseReference ref = FirebaseDatabase.getInstance().getReference().child("Users");
                         HashMap<String, Object> userMap = new HashMap<>();
                         userMap. put("name", fullNameEditText.getText().toString());
                         userMap. put("address", addressEditText.getText().toString());
@@ -207,7 +207,7 @@ public void onComplete(@NonNull Task<Uri> task) {
     }
     private void userInfoDisplay(final CircleImageView profileImageView, final EditText fullNameEditText, final EditText userPhoneEditText, final EditText addressEditText)
     {
-        DatabaseReference UsersRef = FirebaseDatabase.getInstance("https://ekart-cf358-default-rtdb.firebaseio.com/").getReference().child("Users").child(Prevalent.currentOnlineUser.getPhone());
+        DatabaseReference UsersRef = FirebaseDatabase.getInstance().getReference().child("Users").child(Prevalent.currentOnlineUser.getPhone());
         UsersRef.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(DataSnapshot dataSnapshot) {
diff --git a/app/src/main/res/drawable/inquiry_icon.xml b/app/src/main/res/drawable/inquiry_icon.xml
new file mode 100644
index 0000000..30cd88d
--- /dev/null
+++ b/app/src/main/res/drawable/inquiry_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_admin_add_new_product.xml b/app/src/main/res/layout/activity_admin_add_new_product.xml
index 1d32d44..cc3ab74 100644
--- a/app/src/main/res/layout/activity_admin_add_new_product.xml
+++ b/app/src/main/res/layout/activity_admin_add_new_product.xml
@@ -12,7 +12,7 @@
         android:layout_width="320dp"
         android:layout_height="200dp"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="40dp"
         android:cropToPadding="false"
         android:scaleType="centerCrop"
         android:src="@drawable/upload" />
@@ -77,4 +77,21 @@
         android:textColor="@color/colorOnSecondary"
         android:textSize="18sp" />
 
+    <Button
+        android:id="@+id/admin_new_itempage_back"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/add_new_product"
+        android:layout_centerHorizontal="true"
+        android:layout_marginLeft="45dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="45dp"
+        android:background="@drawable/buttons"
+        android:fontFamily="@font/aladin"
+        android:padding="17dp"
+        android:text="Back"
+        android:textAllCaps="false"
+        android:textColor="@color/colorOnSecondary"
+        android:textSize="18sp" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_admin_category.xml b/app/src/main/res/layout/activity_admin_category.xml
index a3fe59f..a7b7461 100644
--- a/app/src/main/res/layout/activity_admin_category.xml
+++ b/app/src/main/res/layout/activity_admin_category.xml
@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/wood"
     tools:context=".AdminCategoryActivity">
+
     <TextView
         android:id="@+id/slogan_category"
         android:layout_width="match_parent"
@@ -16,8 +17,7 @@
         android:text="Add New Product"
         android:textAlignment="center"
         android:textSize="26sp"
-        android:textStyle="bold"
-        />
+        android:textStyle="bold" />
     <LinearLayout
         android:id="@+id/linear1_category_layout"
         android:layout_width="match_parent"
@@ -33,24 +33,24 @@
         <RelativeLayout
             android:layout_width="80dp"
             android:layout_height="120dp">
+
             <ImageView
                 android:id="@+id/f_rice"
                 android:layout_width="70dp"
                 android:layout_height="80dp"
                 android:layout_centerHorizontal="true"
-                android:src="@drawable/friderice"
-                />
+                android:src="@drawable/friderice" />
 
             <TextView
                 android:layout_width="70dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="80dp"
+                android:layout_marginRight="8dp"
                 android:padding="4dp"
                 android:text="Fried rice"
-                android:layout_marginRight="8dp"
                 android:textAlignment="center"
                 android:textAllCaps="false"
-                android:layout_marginTop="80dp"
-                android:textColor="@color/black"/>
+                android:textColor="@color/black" />
 
         </RelativeLayout>
 
@@ -61,11 +61,10 @@
             <ImageView
                 android:id="@+id/koththu_r"
                 android:layout_width="wrap_content"
-                android:layout_centerHorizontal="true"
                 android:layout_height="62dp"
+                android:layout_centerHorizontal="true"
                 android:layout_marginTop="10dp"
-                android:src="@drawable/koththu"
-                />
+                android:src="@drawable/koththu" />
 
             <TextView
                 android:layout_width="70dp"
@@ -87,10 +86,9 @@
                 android:id="@+id/noodles_i"
                 android:layout_width="70dp"
                 android:layout_height="65dp"
-                android:layout_marginTop="10dp"
                 android:layout_centerHorizontal="true"
-                android:src="@drawable/noodles"
-                />
+                android:layout_marginTop="10dp"
+                android:src="@drawable/noodles" />
 
             <TextView
                 android:layout_width="70dp"
diff --git a/app/src/main/res/layout/activity_admin_new_orders.xml b/app/src/main/res/layout/activity_admin_new_orders.xml
index 0d1b036..bc4be68 100644
--- a/app/src/main/res/layout/activity_admin_new_orders.xml
+++ b/app/src/main/res/layout/activity_admin_new_orders.xml
@@ -6,13 +6,13 @@
     android:layout_height="match_parent"
     android:background="@drawable/wood"
     tools:context=".AdminNewOrdersActivity">
+
     <RelativeLayout
         android:id="@+id/r2"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="@color/colorPrimaryDark"
         android:layout_alignParentTop="true"
-        >
+        android:background="@color/colorPrimaryDark">
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_confirm_final_order.xml b/app/src/main/res/layout/activity_confirm_final_order.xml
index 49053ff..37c798b 100644
--- a/app/src/main/res/layout/activity_confirm_final_order.xml
+++ b/app/src/main/res/layout/activity_confirm_final_order.xml
@@ -1,77 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/yellowback"
     tools:context=".ConfirmFinalOrderActivity">
-    <TextView
-        android:id="@+id/txt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Please write your Shipment Details"
-        android:textSize="18dp"
-        android:textColor="@color/colorPrimaryDark"
-        android:layout_margin="25dp"
-        android:textAlignment="center"
-        android:textStyle="bold"
 
-        />
-    <EditText
-        android:id="@+id/shippment_name"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/txt"
-        android:layout_marginTop="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:hint="Your Name"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        />
-    <EditText
-        android:id="@+id/shippment_phone_number"
-        android:inputType="number"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/shippment_name"
-        android:layout_marginTop="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:hint="Your Phone Number"
-        />
-    <EditText
-        android:id="@+id/shippment_address"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/shippment_phone_number"
-        android:layout_marginTop="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:hint="Your Home Address"
-        />
-    <EditText
-        android:id="@+id/shippment_city"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/shippment_address"
-        android:layout_marginTop="40dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:hint="Your City Name"
-        />
+        <TextView
+            android:id="@+id/txt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="40dp"
+            android:layout_marginTop="100dp"
+            android:fontFamily="@font/aladin"
+            android:gravity="center_horizontal|center_vertical"
+            android:text="Please Provide Your Shipment Details"
+            android:textAlignment="center"
+            android:textColor="@color/colorPrimaryDark"
+            android:textSize="24sp"
+            android:textStyle="bold" />
 
-    <Button
-        android:id="@+id/confirm_final_order_btn"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="20dp"
-        android:background="@drawable/buttons"
-        android:fontFamily="@font/aladin"
-        android:text="Confirm"
-        android:textColor="@android:color/black"
-        android:textSize="30dp" />
-</RelativeLayout>
\ No newline at end of file
+        <EditText
+            android:id="@+id/shippment_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/txt"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="20dp"
+            android:hint="Customer Name"
+
+            android:minHeight="48dp"
+            android:textColorHint="#000000" />
+
+        <EditText
+            android:id="@+id/shippment_phone_number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/shippment_name"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginRight="20dp"
+            android:hint="Phone Number"
+            android:inputType="number"
+            android:minHeight="48dp"
+            android:textColorHint="#000000" />
+
+        <EditText
+            android:id="@+id/shippment_address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/shippment_phone_number"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginRight="20dp"
+            android:hint="Home Address"
+            android:minHeight="48dp"
+            android:textColorHint="#000000" />
+
+        <EditText
+            android:id="@+id/shippment_city"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/shippment_address"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginRight="20dp"
+            android:hint="City"
+            android:minHeight="48dp"
+            android:textColorHint="#000000" />
+
+        <Button
+            android:id="@+id/confirm_final_order_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="280dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="20dp"
+            android:background="@drawable/buttons"
+            android:fontFamily="@font/aladin"
+            android:text="Confirm"
+            android:textColor="@android:color/black"
+            android:textSize="30dp" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_contact_us.xml b/app/src/main/res/layout/activity_contact_us.xml
index f33a5e3..d862009 100644
--- a/app/src/main/res/layout/activity_contact_us.xml
+++ b/app/src/main/res/layout/activity_contact_us.xml
@@ -144,10 +144,11 @@
         android:layout_width="153dp"
         android:layout_height="24dp"
         android:layout_marginTop="55dp"
+        android:fontFamily="@font/aladin"
         android:gravity="center|center_horizontal|center_vertical"
         android:text="@string/text_contact"
         android:textColor="@color/black"
-        android:textSize="20sp"
+        android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_inquiry.xml b/app/src/main/res/layout/activity_inquiry.xml
index 48b36ce..2b347a5 100644
--- a/app/src/main/res/layout/activity_inquiry.xml
+++ b/app/src/main/res/layout/activity_inquiry.xml
@@ -7,16 +7,43 @@
     android:background="@drawable/yellowback"
     tools:context=".Inquiry">
 
+    <TextView
+        android:id="@+id/text_feedback"
+        android:layout_width="335dp"
+        android:layout_height="29dp"
+        android:layout_marginTop="55dp"
+        android:fontFamily="@font/aladin"
+        android:gravity="center|center_horizontal|center_vertical"
+        android:text="Do You Need Our Support?"
+        android:textColor="@color/black"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view"
+        android:layout_width="357dp"
+        android:layout_height="2dp"
+        android:layout_margin="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/cardview_dark_background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_feedback" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/container1"
         android:layout_width="350dp"
         android:layout_height="550dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="107dp"
         android:background="@drawable/round_corner_top"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.189">
+        app:layout_constraintTop_toBottomOf="@+id/view">
 
         <TextView
             android:id="@+id/textinqure1"
@@ -30,8 +57,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        //name
-
         <ImageView
             android:id="@+id/image01"
             android:layout_width="100dp"
@@ -65,7 +90,7 @@
             android:layout_height="30dp"
             android:background="@color/white"
             android:ems="10"
-            android:hint="@string/txthint1"
+            android:hint="Enter Your Name"
             android:inputType="textPersonName"
             android:shadowColor="@color/black"
             android:text="@string/name_id"
@@ -75,7 +100,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/name"
             tools:ignore="TouchTargetSizeCheck" />
-        //type
 
         <TextView
             android:id="@+id/texttype"
@@ -95,7 +119,7 @@
             android:layout_height="30dp"
             android:background="@color/white"
             android:ems="10"
-            android:hint="@string/txthint2"
+            android:hint="Enter Inquiry Type"
             android:inputType="textPersonName"
             android:text="@string/inquiry_id"
             android:textColor="@color/black"
@@ -105,8 +129,6 @@
             app:layout_constraintTop_toBottomOf="@+id/texttype"
             tools:ignore="TouchTargetSizeCheck" />
 
-        //Contact
-
         <TextView
             android:id="@+id/textcontactno"
             android:layout_width="154dp"
@@ -127,7 +149,7 @@
             android:layout_height="30dp"
             android:background="@color/white"
             android:ems="10"
-            android:hint="@string/txthint3"
+            android:hint="Enter Your Phone Number"
             android:inputType="textPersonName"
             android:text="@string/contact_id"
             android:textColor="@color/black"
@@ -137,8 +159,6 @@
             app:layout_constraintTop_toBottomOf="@+id/textcontactno"
             tools:ignore="TouchTargetSizeCheck" />
 
-        //inquiry
-
         <TextView
             android:id="@+id/textinqurytype"
             android:layout_width="165dp"
@@ -157,7 +177,7 @@
             android:layout_height="94dp"
             android:background="@color/white"
             android:ems="10"
-            android:hint="@string/txthint"
+            android:hint="Inquiry Description"
             android:inputType="textPersonName"
             android:lines="6"
             android:text="@string/inquiry_type"
@@ -188,24 +208,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <Button
-        android:id="@+id/nextbutton"
-        android:layout_width="142dp"
-        android:layout_height="45dp"
-        android:layout_marginTop="35dp"
-        android:layout_marginBottom="56dp"
-        android:background="@drawable/input_design"
-        android:fontFamily="@font/aladin"
-        android:text="Next"
-        android:textColor="@color/white"
-        app:backgroundTint="@color/black"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/container1"
-        tools:ignore="TouchTargetSizeCheck" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index 9f9c84e..f463a71 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-<group>
+    <group android:checkableBehavior="single">
 
         <item
             android:id="@+id/nav_home"
@@ -22,14 +22,19 @@
         <item
             android:id="@+id/nav_categories"
             android:icon="@drawable/category"
-            android:title="Cashier" />
+            android:title="Category" />
 
         <item
             android:id="@+id/nav_setting"
             android:icon="@drawable/setting_icon"
             android:title="Setting" />
 
-</group>
+        <item
+            android:id="@+id/nav_inquiry"
+            android:icon="@drawable/inquiry_icon"
+            android:title="Inquiries" />
+
+    </group>
 
 
     <item android:title="Profile">
@@ -49,18 +54,19 @@
     </item>
 
 
-    <item android:title="Communicate">
+<!--    <item android:title="Communicate">-->
+
+<!--        <menu>-->
+<!--            <item-->
+<!--                android:id="@+id/nav_inquiry"-->
+<!--                android:icon="@drawable/inquiry_icon"-->
+<!--                android:title="Inquiries" />-->
+
+<!--            <item-->
+<!--                android:id="@+id/nav_rate"-->
+<!--                android:icon="@drawable/rate_icon"-->
+<!--                android:title="Rate" />-->
+<!--        </menu>-->
+<!--    </item>-->
 
-        <menu>
-            <item
-                android:id="@+id/nav_share"
-                android:icon="@drawable/share_icon"
-                android:title="Share" />
-
-            <item
-                android:id="@+id/nav_rate"
-                android:icon="@drawable/rate_icon"
-                android:title="Rate" />
-        </menu>
-    </item>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2305c4f..167e137 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,8 +29,7 @@
     <string name="submit1">SEND FEEDBACK</string>
     <string name="textarea" />
     <string name="text_contact">Contact Us</string>
-    <string name="text_about2">No: 48/53 Main road, Dharmapala Mawatha
-        Colombo 7</string>
+    <string name="text_about2">No: 48/53 Main road, Dharmapala Mawatha Colombo 7</string>
     <string name="text_user">0477625789</string>
     <string name="text_facebook">WWW.FoodieLK</string>
     <string name="text_insta">WWW.FoodieLKInstagram</string>
@@ -60,10 +59,11 @@
     <string name="With">WITH US</string>
     <string name="callbutton">CALL</string>
     <string name="heading">Hotline </string>
-    <string name="txthint1">customer name</string>
-    <string name="txthint2">any issue category</string>
-    <string name="txthint3">customer tel number</string>
-    <string name="txthint">inquiry description</string>
+    <string name="invalid_name">Please Enter the name</string>
+    <string name="invalid_inquiry">Please Enter Inquiry type</string>
+    <string name="invalid_number">Please enter contact no</string>
+    <string name="invalid_inquire">Please type your inquire here</string>
+    <string name="invalid_feedback">Please enter the feedback</string>
 
 
 </resources>
\ No newline at end of file