diff --git a/app/src/main/java/com/example/dubstep/AddAddressActivity.java b/app/src/main/java/com/example/dubstep/AddAddressActivity.java
index 67b9c5f..7706c34 100644
--- a/app/src/main/java/com/example/dubstep/AddAddressActivity.java
+++ b/app/src/main/java/com/example/dubstep/AddAddressActivity.java
@@ -52,7 +52,7 @@ public class AddAddressActivity extends AppCompatActivity {
     TextInputEditText address2EditText;
     TextInputEditText cityEditText;
     TextInputEditText stateEditText;
-    TextView pincodeNotFound;
+    //TextView pincodeNotFound;
     FirebaseUser mUser;
     FirebaseDatabase mDatabase;
     String pincode;
@@ -82,21 +82,24 @@ protected void onCreate(Bundle savedInstanceState) {
         progressDialog.getWindow().setBackgroundDrawableResource(
                 android.R.color.transparent
         );
-        pincodeEditText.addTextChangedListener(new TextWatcher() {
+        /*pincodeEditText.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
             }
 
-            @Override
+            /*@Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 pincodeNotFound.setVisibility(View.INVISIBLE);
             }
 
+
+
             @Override
             public void afterTextChanged(Editable s) {
             }
         });
+        */
         if(getIntent().hasExtra(EXTRA_ADDRESS)) {
             setAddress();
         } else {
@@ -226,8 +229,8 @@ public void onFailure(Call<UserAddress> call, Throwable t) {
         } else {
             //pincodeNotFound.setVisibility(View.VISIBLE);
 
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setMessage("We do not Deliver to that Pincode yet. Stay tuned for more updates!");
+            AlertDialog.Builder builder = new AlertDialog.Builder(this,R.style.CustomAlertDialog);
+            builder.setMessage("We do not deliver to that Pincode yet. Stay tuned for more updates!");
             LayoutInflater inflater = getLayoutInflater();
             View dialogLayout = inflater.inflate(R.layout.alert_dialog_with_imageview, null);
             builder.setPositiveButton(
@@ -235,6 +238,8 @@ public void onFailure(Call<UserAddress> call, Throwable t) {
                     null);
             builder.setView(dialogLayout);
             builder.show();
+            View v = getWindow().getDecorView();
+            v.setBackgroundResource(android.R.color.transparent);
         }
         progressDialog.dismiss();
     }
diff --git a/app/src/main/java/com/example/dubstep/Splash_Screen.java b/app/src/main/java/com/example/dubstep/Splash_Screen.java
index 4339c98..6cdb1f8 100644
--- a/app/src/main/java/com/example/dubstep/Splash_Screen.java
+++ b/app/src/main/java/com/example/dubstep/Splash_Screen.java
@@ -1,11 +1,15 @@
 package com.example.dubstep;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityOptionsCompat;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.view.View;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -30,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash__screen);
 
-        dubstep = findViewById(R.id.dubstepText);
+        dubstep =findViewById(R.id.dubstepText);
         dabba = findViewById(R.id.dabbaText);
         logo = findViewById(R.id.logoImage);
         mAuth = FirebaseAuth.getInstance();
@@ -40,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void run() {
 
+
                 if(currentUser != null) {
                     if (currentUser.isEmailVerified()){
                         if(Splash_Screen.this
@@ -52,27 +57,40 @@ public void run() {
                                         @Override
                                         public void onSuccess(GetTokenResult getTokenResult) {
                                             IdTokenInstance.setToken(getTokenResult.getToken());
-                                            startActivity(new Intent(Splash_Screen.this, MainActivity.class));
+                                            Intent intent=new Intent(Splash_Screen.this, MainActivity.class);
+                                            ActivityOptionsCompat options = ActivityOptionsCompat.
+                                                    makeSceneTransitionAnimation(Splash_Screen.this, (View)logo, "imageMain");
+                                            startActivity(intent, options.toBundle());
                                             finish();
 
                                         }
                                     });
                         }else{
-                            startActivity(new Intent(Splash_Screen.this, LoginActivity.class));
+                            Intent intent=new Intent(Splash_Screen.this, LoginActivity.class);
+                            ActivityOptionsCompat options = ActivityOptionsCompat.
+                                    makeSceneTransitionAnimation(Splash_Screen.this, (View)logo, "imageMain");
+                            startActivity(intent, options.toBundle());
                             finish();
-
                         }
                     } else {
-                        startActivity(new Intent(Splash_Screen.this, LoginActivity.class));
+                        Intent intent=new Intent(Splash_Screen.this, LoginActivity.class);
+                        ActivityOptionsCompat options = ActivityOptionsCompat.
+                                makeSceneTransitionAnimation(Splash_Screen.this, (View)logo, "imageMain");
+                        startActivity(intent, options.toBundle());
                         finish();
-
                     }
                 } else {
-                    startActivity(new Intent(Splash_Screen.this, LoginActivity.class));
+                    Intent intent=new Intent(Splash_Screen.this, LoginActivity.class);
+                    ActivityOptionsCompat options = ActivityOptionsCompat.
+                            makeSceneTransitionAnimation(Splash_Screen.this, (View)logo, "imageMain");
+                    startActivity(intent, options.toBundle());
                     finish();
 
                 }
             }
+
         },SPLASH_SCREEN);
+        Animation myanim = AnimationUtils.loadAnimation(this,R.anim.splashanimation);
+        dubstep.startAnimation(myanim);
     }
 }
diff --git a/app/src/main/java/com/example/dubstep/ThankYouActivity.java b/app/src/main/java/com/example/dubstep/ThankYouActivity.java
index f98c3e4..68f2547 100644
--- a/app/src/main/java/com/example/dubstep/ThankYouActivity.java
+++ b/app/src/main/java/com/example/dubstep/ThankYouActivity.java
@@ -9,7 +9,10 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -38,6 +41,7 @@
 public class ThankYouActivity extends AppCompatActivity implements PaymentResultWithDataListener {
 
     private static final String TAG = "ThankYouActivity";
+    ImageView logo;
     Button continueButton;
    // private ImageView thankYouImage;
 //    LottieAnimationView animationView;
@@ -54,7 +58,7 @@ public class ThankYouActivity extends AppCompatActivity implements PaymentResult
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_thank_you);
-
+        logo = findViewById(R.id.icon_image_view);
         successAnimation = findViewById(R.id.success_animation);
         failAnimation = findViewById(R.id.fail_animation);
         bgView= findViewById(R.id.bg_view);
@@ -102,6 +106,8 @@ public void onClick(View view) {
                 );
             }
         });
+        Animation myanim = AnimationUtils.loadAnimation(this,R.anim.splashanimation);
+        logo.startAnimation(myanim);
     }
 
     private void fetchUserData() {
diff --git a/app/src/main/res/anim/splashanimation.xml b/app/src/main/res/anim/splashanimation.xml
new file mode 100644
index 0000000..8fbf28f
--- /dev/null
+++ b/app/src/main/res/anim/splashanimation.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromAlpha="0.0"
+    android:toAlpha="1.0"
+    android:duration="2000">
+
+</alpha>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_bg.xml b/app/src/main/res/drawable/gradient_bg.xml
new file mode 100644
index 0000000..31c6955
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<gradient
+    android:type="radial"
+    android:gradientRadius="130%p"
+    android:startColor="#FFFFFF"
+    android:endColor="#FF8656" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/oops_alert1.jpg b/app/src/main/res/drawable/oops_alert1.jpg
index a89e3ef..2865657 100644
Binary files a/app/src/main/res/drawable/oops_alert1.jpg and b/app/src/main/res/drawable/oops_alert1.jpg differ
diff --git a/app/src/main/res/drawable/reset_password.png b/app/src/main/res/drawable/reset_password.png
new file mode 100644
index 0000000..bd6e1a9
Binary files /dev/null and b/app/src/main/res/drawable/reset_password.png differ
diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml
index 67b084e..4a5e751 100644
--- a/app/src/main/res/layout/activity_add_address.xml
+++ b/app/src/main/res/layout/activity_add_address.xml
@@ -13,10 +13,10 @@
 
         <ImageView
             android:id="@+id/imageView6"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleX="1.3"
+            android:layout_width="304dp"
+            android:layout_height="66dp"
             android:layout_marginTop="32dp"
+            android:scaleX="1.3"
             android:src="@drawable/ic_brush_stroke"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -24,17 +24,20 @@
 
         <TextView
             android:id="@+id/add_address_textView"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
+            android:layout_width="321dp"
+            android:layout_height="58dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="32dp"
-            android:layout_width="wrap_content"
+            android:layout_marginEnd="16dp"
             android:padding="12dp"
             android:text="Enter New Address"
-            android:textSize="28sp"
+            android:textAlignment="center"
+            android:textSize="30sp"
+            android:fontFamily="sans-serif-condensed-medium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
+
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -135,7 +138,6 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:hint="City"
-                    android:text="Bhubaneswar"
                     android:enabled="false"
                     android:id="@+id/city_editText"
                     android:inputType="text"
@@ -150,6 +152,7 @@
                     app:layout_constraintTop_toBottomOf="@id/address2_editText" >
 
                     <com.google.android.material.textfield.TextInputEditText
+                        android:text="Bhubaneshwar"
                         android:id="@+id/city_editText1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"/>
@@ -158,7 +161,6 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:hint="State"
-                    android:text="Odisha"
                     android:enabled="false"
                     android:id="@+id/state_editText"
                     android:inputType="text"
@@ -172,6 +174,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/city_editText" >
                     <com.google.android.material.textfield.TextInputEditText
+                        android:text="Odisha"
                         android:id="@+id/state_editText1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/activity_cart_main.xml b/app/src/main/res/layout/activity_cart_main.xml
index 3198180..316a319 100644
--- a/app/src/main/res/layout/activity_cart_main.xml
+++ b/app/src/main/res/layout/activity_cart_main.xml
@@ -26,7 +26,9 @@
         android:layout_width="wrap_content"
         android:text="Cart empty!"
         android:padding="4dp"
-        android:textSize="20sp"
+        android:textAlignment="center"
+        android:textSize="30sp"
+        android:fontFamily="sans-serif-condensed-medium"
         android:textStyle="bold"
         android:gravity="center"
         android:background="@drawable/ic_brush_stroke"
@@ -56,25 +58,23 @@
 
             <TextView
                 android:id="@+id/cart_total_textView"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
-                android:layout_width="wrap_content"
+                android:layout_marginEnd="16dp"
                 android:text="@string/cart_total"
                 android:textAlignment="center"
-                android:textColor="@color/black"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/DdeliveryTextView"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
                 android:layout_marginTop="8dp"
-                android:layout_width="wrap_content"
+                android:layout_marginEnd="16dp"
                 android:text="@string/delivery_charge"
                 android:textAlignment="center"
-                android:textColor="@color/black"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/cart_total_textView" />
 
@@ -88,14 +88,13 @@
 
             <TextView
                 android:id="@+id/total_price_text_view"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="4dp"
                 android:layout_weight="1"
-                android:layout_width="wrap_content"
                 android:text="Total Price : ₹ --"
                 android:textAlignment="center"
-                android:textColor="@color/black"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_confirm.xml b/app/src/main/res/layout/activity_confirm.xml
index 4743872..25a5e16 100644
--- a/app/src/main/res/layout/activity_confirm.xml
+++ b/app/src/main/res/layout/activity_confirm.xml
@@ -13,13 +13,13 @@
         android:padding="25dp"
         android:background="@drawable/border"
         >
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Are you sure?"
-            android:textSize="25dp"
             android:layout_marginBottom="20dp"
-            />
+            android:text="Are you sure?"
+            android:textSize="26dp" />
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -30,6 +30,7 @@
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:text="Yes"
+                android:textColor="@android:color/white"
                 android:layout_marginHorizontal="5dp"
                 android:background="@drawable/button_rounded"/>
 
@@ -38,6 +39,7 @@
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
                 android:text="No"
+                android:textColor="@android:color/white"
                 android:layout_marginHorizontal="5dp"
                 android:background="@drawable/button_rounded"/>
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_food_item.xml b/app/src/main/res/layout/activity_food_item.xml
index b20931b..929133f 100644
--- a/app/src/main/res/layout/activity_food_item.xml
+++ b/app/src/main/res/layout/activity_food_item.xml
@@ -11,19 +11,19 @@
 
     <TextView
         android:id="@+id/food_item_base_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/food_item_recycler"
+        android:layout_width="249dp"
+        android:layout_height="72dp"
         android:background="@drawable/ic_brush_stroke"
-        android:textAlignment="center"
+        android:fontFamily="sans-serif-condensed-medium"
+        android:padding="15dp"
         android:text="BaseName"
+        android:textAlignment="center"
+        android:textSize="30sp"
         android:textStyle="bold"
-        android:padding="15dp"
-        android:textSize="26sp"
-        />
+        app:layout_constraintBottom_toTopOf="@id/food_item_recycler"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/food_item_recycler"
@@ -41,17 +41,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|start"
-        android:layout_margin="32dp"
         android:clickable="true"
         android:src="@drawable/cart_icon"
         app:backgroundTint="@color/colorPrimaryDark"
         app:fabSize="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.019"
+        app:layout_constraintHorizontal_bias="0.966"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.995"
+        app:layout_constraintVertical_bias="0.013"
         app:rippleColor="@color/colorAccent"
         app:tint="@android:color/white" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 7f8f7ff..6e594a2 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -6,8 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="30dp"
-    android:background="@drawable/gradient_food_item"
-    android:backgroundTint="@color/orangeLight"
+    android:background="@drawable/gradient_bg"
     tools:context=".LoginActivity"
     >
 
@@ -18,6 +17,7 @@
         android:layout_marginTop="16dp"
         android:layout_width="match_parent"
         android:padding="20dp"
+        android:transitionName="imageMain"
         android:src="@drawable/logo_circle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -46,6 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="phone"
+            android:textColor="@color/black"
             android:textColorHighlight="#FF5722"
             android:textColorLink="#4CAF50"
             android:maxLength="10"
diff --git a/app/src/main/res/layout/activity_order_placed.xml b/app/src/main/res/layout/activity_order_placed.xml
index 4f9094d..43b7969 100644
--- a/app/src/main/res/layout/activity_order_placed.xml
+++ b/app/src/main/res/layout/activity_order_placed.xml
@@ -66,16 +66,16 @@
             android:layout_marginBottom="10dp"/>
     </LinearLayout>
 
-    <include
-        android:id="@+id/order_details_layout"
-        layout="@layout/order_item_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/linearLayout3"
-        />
+        <include
+            android:id="@+id/order_details_layout"
+            layout="@layout/order_item_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/linearLayout3" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/activity_orders.xml b/app/src/main/res/layout/activity_orders.xml
index 3366574..a4f50b4 100644
--- a/app/src/main/res/layout/activity_orders.xml
+++ b/app/src/main/res/layout/activity_orders.xml
@@ -12,73 +12,71 @@
         android:layout_height="match_parent">
 
 
-    <ImageView
-        android:id="@+id/brush_stroke_order"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scaleX="1.3"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintVertical_bias="0"
-        android:src="@drawable/ic_brush_stroke"/>
-
-    <TextView
-        android:id="@+id/fragment_title_order"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:text="Your Orders"
-        android:textStyle="bold"
-        android:padding="15dp"
-        android:textSize="26sp"
-        />
+        <TextView
+            android:id="@+id/fragment_title_order"
+            android:layout_width="212dp"
+            android:layout_height="58dp"
+            android:background="@drawable/ic_brush_stroke"
+            android:fontFamily="sans-serif-condensed-medium"
+            android:padding="4dp"
+            android:text="Your Orders"
+            android:textAlignment="center"
+            android:textSize="30sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.497"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.02" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/order_empty_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:visibility="visible"
-        >
 
-        <ImageView
-            android:id="@+id/imageView3"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/order_empty_view"
             android:layout_width="match_parent"
-            android:visibility="gone"
             android:layout_height="match_parent"
-            android:src="@drawable/no_orders"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/order_not_present_textview"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="30dp"
-            android:gravity="center"
-            android:text="No orders yet"
-            android:background="@color/orangeLight"
-            android:textSize="30sp"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            app:layout_constraintVertical_bias="1.0">
+
+            <TextView
+                android:id="@+id/order_not_present_textview"
+                android:layout_width="338dp"
+                android:layout_height="60dp"
+                android:layout_margin="30dp"
+                android:background="@color/orangeBg"
+                android:text="No orders yet"
+                android:gravity="center"
+                android:fontFamily="sans-serif-condensed-medium"
+                android:textColor="@color/white"
+                android:textSize="30sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/imageView3"
+                android:layout_width="205dp"
+                android:layout_height="130dp"
+                android:layout_marginTop="80dp"
+                android:src="@drawable/no_orders"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/order_not_present_textview" />
 
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/order_recyclerview"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@id/brush_stroke_order"
+            app:layout_constraintTop_toBottomOf="@id/fragment_title_order"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_password_reset.xml b/app/src/main/res/layout/activity_password_reset.xml
index 49198cb..5c1bfea 100644
--- a/app/src/main/res/layout/activity_password_reset.xml
+++ b/app/src/main/res/layout/activity_password_reset.xml
@@ -8,42 +8,55 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/textViewResetPassword"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Enter email for password reset"
-        android:textSize="24sp"
-        android:textAlignment="center"
+        android:layout_width="405dp"
+        android:layout_height="47dp"
         android:layout_margin="16dp"
+        android:fontFamily="sans-serif-condensed-medium"
+        android:text="Enter Email for password reset"
+        android:textAlignment="center"
+        android:textSize="28sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/textInputEditText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="379dp"
+        android:layout_height="57dp"
         android:layout_margin="16dp"
         android:hint="Enter email"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewResetPassword"
-        app:layout_constraintVertical_bias="0" />
+        app:layout_constraintVertical_bias="0.614" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/reset_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
+        style="?attr/buttonBarPositiveButtonStyle"
+        android:layout_width="382dp"
+        android:layout_height="55dp"
+        android:layout_marginTop="60dp"
+        android:backgroundTint="@color/colorAccent"
+        android:fontFamily="sans-serif-condensed-medium"
+        android:onClick="resetPassword"
         android:text="Reset"
+        android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="@+id/textInputEditText"
-        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="@+id/textInputEditText"
         app:layout_constraintTop_toBottomOf="@+id/textInputEditText"
-        style="?attr/buttonBarPositiveButtonStyle"
-        android:backgroundTint="@color/colorAccent"
-        app:rippleColor="@color/white"
-        android:onClick="resetPassword"
-        />
+        app:rippleColor="@color/white" />
+
+    <ImageView
+        android:id="@+id/imageView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/textInputEditText"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        style="@style/roundedCornersImageView"
+        app:layout_constraintTop_toBottomOf="@+id/textViewResetPassword"
+        app:layout_constraintVertical_bias="0.537"
+        app:srcCompat="@drawable/reset_password" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_referral.xml b/app/src/main/res/layout/activity_referral.xml
index 26b630f..80c3a01 100644
--- a/app/src/main/res/layout/activity_referral.xml
+++ b/app/src/main/res/layout/activity_referral.xml
@@ -48,21 +48,19 @@
 
             <TextView
                 android:id="@+id/cart_total_with_promo"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
-                android:layout_width="wrap_content"
+                android:layout_marginBottom="24dp"
                 android:text="Total Price : ₹ --"
                 android:textAlignment="center"
-                android:textColor="@color/black"
                 android:textSize="18sp"
 
-                app:layout_constraintTop_toBottomOf="@id/line"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toTopOf="@+id/button_place_order"
                 app:layout_constraintStart_toStartOf="parent"
-                />
+                app:layout_constraintTop_toBottomOf="@id/line" />
             <TextView
                 android:id="@+id/dicount_on_promo_textview"
                 android:layout_width="wrap_content"
@@ -120,15 +118,16 @@
         app:layout_constraintTop_toBottomOf="@+id/edit_text_referral" />
 
     <TextView
-        android:background="@drawable/ic_brush_stroke"
-        android:gravity="center"
         android:id="@+id/promocode_dicount_text"
-        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/ic_brush_stroke"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center"
         android:padding="4dp"
         android:text="No Promocode Found"
         android:textAlignment="center"
-        android:textSize="18sp"
+        android:textSize="20sp"
         android:textStyle="bold"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_select_address.xml b/app/src/main/res/layout/activity_select_address.xml
index 9ed9ce8..a244859 100644
--- a/app/src/main/res/layout/activity_select_address.xml
+++ b/app/src/main/res/layout/activity_select_address.xml
@@ -9,10 +9,10 @@
 
     <ImageView
         android:id="@+id/imageView6"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scaleX="1.3"
+        android:layout_width="253dp"
+        android:layout_height="64dp"
         android:layout_marginTop="8dp"
+        android:scaleX="1.3"
         android:src="@drawable/ic_brush_stroke"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -20,15 +20,16 @@
 
     <TextView
         android:id="@+id/select_address_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_width="182dp"
+        android:layout_height="51dp"
+        android:layout_margin="12dp"
+        android:fontFamily="sans-serif-condensed-medium"
         android:text="Your Address"
+        android:textAlignment="center"
         android:textSize="32sp"
-        android:layout_margin="12dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/address_recycler_view"
@@ -64,14 +65,16 @@
         />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:backgroundTint="@color/colorAccent"
         android:id="@+id/set_address_btn"
-        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:backgroundTint="@color/colorAccent"
+        android:fontFamily="sans-serif-condensed-medium"
         android:onClick="changeAddress"
         android:text="Add Address"
         android:textAllCaps="false"
         android:textColor="@color/white"
+        android:textSize="18sp"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 84a8729..691a8ae 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -9,26 +9,30 @@
     android:paddingHorizontal="15dp"
     android:paddingVertical="40dp"
     tools:context=".SignUpActivity">
+
     <ImageView
         android:id="@+id/imageView5"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
+        android:layout_width="256dp"
+        android:layout_height="62dp"
+        android:layout_marginTop="2dp"
         android:scaleX="1.3"
         android:src="@drawable/ic_brush_stroke"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.496"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:gravity="center"
         android:id="@+id/textView"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:layout_width="match_parent"
+        android:fontFamily="sans-serif-condensed-medium"
+        android:gravity="center"
         android:text="Register"
         android:textAlignment="center"
         android:textColor="@color/white"
-        android:textSize="30sp"
+        android:textSize="32sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.662"
         app:layout_constraintStart_toStartOf="parent"
@@ -173,10 +177,11 @@
     </androidx.cardview.widget.CardView>
 
     <Button
-        android:background="@drawable/button_rounded"
         android:id="@+id/SignUpButton"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/button_rounded"
+        android:fontFamily="sans-serif-condensed-medium"
         android:text="Sign Up"
         android:textColor="#ffffff"
         android:textSize="20sp"
diff --git a/app/src/main/res/layout/activity_splash__screen.xml b/app/src/main/res/layout/activity_splash__screen.xml
index fb05ec4..94eea78 100644
--- a/app/src/main/res/layout/activity_splash__screen.xml
+++ b/app/src/main/res/layout/activity_splash__screen.xml
@@ -13,6 +13,7 @@
         android:id="@+id/logoImage"
         android:layout_height="350dp"
         android:layout_width="match_parent"
+        android:transitionName="imageMain"
         android:src="@drawable/logo_circle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/alert_dialog_with_imageview.xml b/app/src/main/res/layout/alert_dialog_with_imageview.xml
index ea9bea6..9b88fc6 100644
--- a/app/src/main/res/layout/alert_dialog_with_imageview.xml
+++ b/app/src/main/res/layout/alert_dialog_with_imageview.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
     <ImageView android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="350dp"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_marginTop="30dp"
+
+        android:layout_gravity="center"
         android:scaleType="centerCrop"
         android:adjustViewBounds="true"
         android:src="@drawable/oops_alert1"/>
diff --git a/app/src/main/res/layout/bottom_sheet_layout_payment_mode.xml b/app/src/main/res/layout/bottom_sheet_layout_payment_mode.xml
index cf56c6f..8ec63ba 100644
--- a/app/src/main/res/layout/bottom_sheet_layout_payment_mode.xml
+++ b/app/src/main/res/layout/bottom_sheet_layout_payment_mode.xml
@@ -10,12 +10,12 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:fontFamily="sans-serif-condensed-medium"
         android:text="Please select your mode of payment"
         android:textAlignment="center"
-        android:textSize="24sp"
-        android:layout_margin="12dp"
-        android:textStyle="bold"
-        />
+        android:textSize="25sp"
+        android:textStyle="bold" />
 
     <View
         android:layout_width="match_parent"
@@ -51,13 +51,14 @@
         android:id="@+id/continue_order_btn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="12dp"
         android:layout_marginTop="43dp"
-        android:text="Continue Order"
-        android:background="@drawable/button_rounded"
         android:layout_marginBottom="24dp"
-        android:layout_marginHorizontal="12dp"
+        android:background="@drawable/button_rounded"
+        android:fontFamily="sans-serif-condensed-medium"
+        android:text="Continue Order"
         android:textColor="@color/white"
-        />
+        android:textSize="18sp" />
 
 
 
diff --git a/app/src/main/res/layout/cart_item_layout.xml b/app/src/main/res/layout/cart_item_layout.xml
index 722018e..66d2f29 100644
--- a/app/src/main/res/layout/cart_item_layout.xml
+++ b/app/src/main/res/layout/cart_item_layout.xml
@@ -34,12 +34,11 @@
 
         <TextView
             android:id="@+id/food_name_textView"
+            android:layout_width="180dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginTop="16dp"
-            android:layout_width="180dp"
             android:text="ITEM NAME"
-            android:textColor="@color/black"
             android:textSize="14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toEndOf="@+id/item_icon"
@@ -61,16 +60,16 @@
 
         <TextView
             android:id="@+id/total_price_item_text_view"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginEnd="10dp"
+            android:layout_width="61dp"
+            android:layout_height="27dp"
             android:layout_marginTop="16dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="4dp"
             android:layout_weight="1"
-            android:layout_width="wrap_content"
             android:text="Total Price: xxxx"
+            android:textAlignment="center"
+            android:textSize="14sp"
             android:textStyle="bold"
-            android:textSize="12sp"
-            android:textColor="@color/black"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/quantity_btns" />
diff --git a/app/src/main/res/layout/food_item_layout_2.xml b/app/src/main/res/layout/food_item_layout_2.xml
index d724df5..7a441f3 100644
--- a/app/src/main/res/layout/food_item_layout_2.xml
+++ b/app/src/main/res/layout/food_item_layout_2.xml
@@ -1,105 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-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="200dp"
-android:padding="10dp"
-android:layout_marginTop="10dp"
-android:layout_marginStart="15dp"
-android:layout_marginEnd="15dp"
-app:cardElevation="15dp"
-app:cardCornerRadius="15dp"
-    >
 
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
 
-
-    <TextView
-        android:id="@+id/food_name"
+    <FrameLayout 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"
+        style="?attr/actionButtonStyle"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="29dp"
-        android:layout_marginStart="4dp"
-        android:layout_width="150dp"
-        android:padding="6dp"
-        android:text="ITEM NAME"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:elevation="5dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:padding="2dp"
+        android:clipToPadding="false">
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_margin="4dp"
+            app:cardElevation="10dp"
+            app:cardCornerRadius="15dp"
+            >
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="4dp">
 
-    <TextView
-        android:id="@+id/food_price"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:layout_marginStart="48dp"
-        android:layout_marginTop="16dp"
-        android:elevation="5dp"
-        android:layout_width="wrap_content"
-        android:text="PRICE:"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/food_name" />
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:id="@+id/food_item_imageView"
+                    android:layout_height="50dp"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_width="50dp"
+                    app:layout_constraintHeight_percent="110"
+                    app:layout_constraintHorizontal_weight="1"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    tools:srcCompat="@tools:sample/avatars"
+                    app:shapeAppearanceOverlay="@style/roundedCornersImageView"
+                    />
 
+                <TextView
+                    android:id="@+id/food_name"
+                    android:layout_width="180dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="10dp"
+                    android:text="ITEM NAME"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/food_item_imageView"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.button.MaterialButton
-        style="?attr/materialButtonOutlinedStyle"
-        android:id="@+id/addtocart_btn"
-        android:layout_gravity="bottom"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="Add to cart"
-        android:backgroundTint="@color/orangeBg"
-        android:textColor="@color/white"
-        android:textAllCaps="false"
-        android:elevation="6dp"
-        android:layout_marginEnd="6dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+                <TextView
+                    android:id="@+id/food_price"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
+                    android:text="Price:xxxx"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/food_item_imageView"
+                    app:layout_constraintTop_toBottomOf="@+id/food_name" />
 
-    <ImageView
-        android:elevation="1dp"
-        android:id="@+id/imageView4"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"
-        android:layout_marginStart="56dp"
-        android:layout_width="wrap_content"
-        android:scaleX="20"
-        android:scaleY="20"
-        android:src="@drawable/circle"
-        app:layout_constraintBottom_toBottomOf="@+id/food_item_imageView"
-        app:layout_constraintStart_toStartOf="parent" />
 
-    <ImageView
-        android:id="@+id/veg_non_veg_icon"
-        android:layout_height="26dp"
-        android:layout_width="26dp"
-        android:layout_marginEnd="18dp"
-        android:layout_marginBottom="16dp"
-        android:elevation="6dp"
-        android:src="@drawable/ic_non_veg_icon"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/food_item_imageView" />
 
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/food_item_imageView"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        app:layout_constraintHeight_percent="110"
-        app:layout_constraintHorizontal_weight="1"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:srcCompat="@tools:sample/avatars"
-        android:foreground="@drawable/gradient_food_item"
-        app:shapeAppearanceOverlay="@style/roundedCornersImageView"
-        />
+                <ImageView
+                    android:id="@+id/veg_non_veg_icon"
+                    android:layout_height="26dp"
+                    android:layout_width="26dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginEnd="6dp"
+                    android:layout_marginBottom="50dp"
+                    android:elevation="6dp"
+                    android:src="@drawable/ic_non_veg_icon"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/addtocart_btn"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginTop="40dp"
+                    android:layout_marginEnd="6dp"
+                    app:layout_constraintTop_toBottomOf="@+id/veg_non_veg_icon"
+                    android:backgroundTint="@color/orangeBg"
+                    android:elevation="6dp"
+                    android:fontFamily="sans-serif-condensed-medium"
+                    android:text="Add to cart"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    android:textSize="15sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
 
+        </com.google.android.material.card.MaterialCardView>
 
+    </FrameLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about_us.xml b/app/src/main/res/layout/fragment_about_us.xml
index b4240c4..0b792c6 100644
--- a/app/src/main/res/layout/fragment_about_us.xml
+++ b/app/src/main/res/layout/fragment_about_us.xml
@@ -17,18 +17,18 @@
             android:id="@+id/about_us"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
             android:background="@drawable/ic_brush_stroke"
+            android:fontFamily="sans-serif-condensed-medium"
             android:padding="15dp"
-            android:layout_marginTop="8dp"
             android:text="About Us"
             android:textAlignment="center"
-            android:textSize="26sp"
+            android:textSize="30sp"
             android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/scrollAboutUs"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/scrollAboutUs"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <ScrollView
diff --git a/app/src/main/res/layout/fragment_contact_us.xml b/app/src/main/res/layout/fragment_contact_us.xml
index 3d8bbf3..9816487 100644
--- a/app/src/main/res/layout/fragment_contact_us.xml
+++ b/app/src/main/res/layout/fragment_contact_us.xml
@@ -16,16 +16,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
+            android:background="@drawable/ic_brush_stroke"
+            android:fontFamily="sans-serif-condensed-medium"
             android:padding="15dp"
             android:text="Contact Us"
-            android:textSize="26sp"
+            android:textAlignment="center"
+            android:textSize="30sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:background="@drawable/ic_brush_stroke"
-            android:textAlignment="center"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ScrollView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_edit_profile.xml b/app/src/main/res/layout/fragment_edit_profile.xml
index f00d79f..1d0af23 100644
--- a/app/src/main/res/layout/fragment_edit_profile.xml
+++ b/app/src/main/res/layout/fragment_edit_profile.xml
@@ -11,14 +11,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|top"
+            android:layout_margin="16dp"
             android:background="@drawable/ic_brush_stroke"
+            android:fontFamily="sans-serif-condensed-medium"
             android:padding="12dp"
-            android:text="EDIT PROFILE"
+            android:text="Edit Profile"
             android:textAlignment="center"
             android:textColor="#650E08"
-            android:textSize="30sp"
-            android:layout_margin="16dp"
-            />
+            android:textSize="30sp" />
 
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
@@ -134,15 +134,16 @@
 
                 </com.google.android.material.textfield.TextInputLayout>
 
-        <Button
-            android:id="@+id/UpdateButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:background="@drawable/button_rounded"
-            android:text="UPDATE"
-            android:textColor="#ffffff"
-            android:textSize="25sp" />
+                <Button
+                    android:id="@+id/UpdateButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="40dp"
+                    android:background="@drawable/button_rounded"
+                    android:fontFamily="sans-serif-condensed-medium"
+                    android:text="UPDATE"
+                    android:textColor="#ffffff"
+                    android:textSize="25sp" />
         </LinearLayout>
         </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e7e9aa8..fb2e746 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -18,6 +18,7 @@
         android:layout_marginTop="20dp"
         android:layout_width="80dp"
         android:src="@drawable/logo_circle"
+        android:transitionName="imageMain"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_terms_and_condition.xml b/app/src/main/res/layout/fragment_terms_and_condition.xml
index 2dded53..99d46c8 100644
--- a/app/src/main/res/layout/fragment_terms_and_condition.xml
+++ b/app/src/main/res/layout/fragment_terms_and_condition.xml
@@ -17,14 +17,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginTop="8dp"
             android:background="@drawable/ic_brush_stroke"
-            android:text="LEGALS"
+            android:fontFamily="sans-serif-condensed-medium"
+            android:padding="12dp"
+            android:text="Legals"
             android:textAlignment="center"
             android:textColor="#650E08"
-            android:textSize="30sp"
-            android:padding="12dp"
-            android:layout_marginTop="8dp"
-            />
+            android:textSize="34sp" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/terms_condition_card"
diff --git a/app/src/main/res/layout/header_layout.xml b/app/src/main/res/layout/header_layout.xml
index 8fe0f6f..39cf3b2 100644
--- a/app/src/main/res/layout/header_layout.xml
+++ b/app/src/main/res/layout/header_layout.xml
@@ -23,17 +23,17 @@
         android:id="@+id/userNameTextView"
         android:layout_width="180dp"
         android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:text="USERNAME"
+        android:fontFamily="sans-serif-condensed-medium"
+        android:text="Username "
         android:textAlignment="textStart"
         android:textColor="@color/white"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/imageView"
-        app:layout_constraintTop_toTopOf="@id/imageView"
+        android:textSize="18sp"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@id/imageView"
+        app:layout_constraintEnd_toStartOf="@id/imageView"
         app:layout_constraintHorizontal_bias="0.1"
-        app:layout_constraintVertical_bias="0.2"
-        />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/imageView"
+        app:layout_constraintVertical_bias="0.2" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/order_item_details.xml b/app/src/main/res/layout/order_item_details.xml
index 57e8b6f..ae8b266 100644
--- a/app/src/main/res/layout/order_item_details.xml
+++ b/app/src/main/res/layout/order_item_details.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
     <com.google.android.material.card.MaterialCardView
@@ -27,10 +26,10 @@
 
             <TextView
                 android:id="@+id/textview_order"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
-                android:layout_width="wrap_content"
                 android:text="Order Id"
                 android:textSize="22sp"
                 android:textStyle="bold"
@@ -79,10 +78,10 @@
 
             <TextView
                 android:id="@+id/textview_time"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
-                android:layout_width="wrap_content"
                 android:text="Time of Order"
                 android:textSize="22sp"
                 android:textStyle="bold"
@@ -129,10 +128,10 @@
 
             <TextView
                 android:id="@+id/textview_payment"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
-                android:layout_width="wrap_content"
                 android:text="Payment Details"
                 android:textSize="24sp"
                 android:textStyle="bold"
@@ -196,10 +195,10 @@
 
             <TextView
                 android:id="@+id/textview_person"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
-                android:layout_width="wrap_content"
                 android:text="Details of Person"
                 android:textSize="24sp"
                 android:textStyle="bold"
@@ -299,10 +298,9 @@
                 android:textSize="24sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/textview_person_details_pincode"
                 app:layout_constraintHorizontal_bias="0"
-                />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/textview_person_details_pincode" />
             <TableLayout
                 android:id="@+id/table_layout_orders_details"
                 android:layout_width="match_parent"
@@ -342,7 +340,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
                 android:text="Total Price"
-                android:textSize="23sp"
+                android:textSize="24sp"
                 android:textStyle="normal"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -352,35 +350,34 @@
 
             <TextView
                 android:id="@+id/textview_order_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="221dp"
+                android:layout_height="47dp"
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginVertical="4dp"
                 android:text="Order Status"
                 android:textSize="24sp"
-                android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/textview_total_price_orders"
                 app:layout_constraintHorizontal_bias="0"
-                />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/textview_total_price_orders" />
+
             <com.google.android.material.chip.Chip
                 android:id="@+id/chip_status"
-                android:layout_width="wrap_content"
+                android:layout_width="110dp"
                 android:layout_height="wrap_content"
-                android:text="Pending"
                 android:layout_margin="16dp"
-                app:chipCornerRadius="24dp"
-                android:textColor="@color/white"
+                android:background="@color/orangeBg"
                 android:padding="8dp"
-                app:rippleColor="@color/white"
+                android:text="Pending"
+                android:textColor="@color/white"
+                android:textSize="16sp"
                 app:chipBackgroundColor="@color/orangeBg"
-                android:background="@color/orangeBg"
+                app:chipCornerRadius="24dp"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/textview_order_status"
-                app:layout_constraintHorizontal_bias="0"
-                />
+                app:rippleColor="@color/white" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 96c089b..99bd0bd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,8 +9,11 @@
         <item name="viewInflaterClass">androidx.appcompat.app.AppCompatViewInflater</item>
         <item name="android:fontFamily">@font/voces</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
+        <item name="android:windowContentTransitions">true</item>
+    </style>
+    <style name="CustomAlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:windowBackground">@drawable/border</item>
     </style>
-
     <style parent="android:Widget.TextView" name="SansSerif">
         <item name="android:fontFamily">@font/voces</item>
     </style>