diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d67eed9..d03fd7d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,10 +14,12 @@
         tools:targetApi="31">
         <activity
             android:name=".notedetails"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"/>
         <activity
             android:name=".editnoteactivity"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"/>
         <activity
             android:name=".createnote"
             android:exported="false"
diff --git a/app/src/main/java/com/example/notemania/editnoteactivity.java b/app/src/main/java/com/example/notemania/editnoteactivity.java
index bddebf9..8a64c80 100644
--- a/app/src/main/java/com/example/notemania/editnoteactivity.java
+++ b/app/src/main/java/com/example/notemania/editnoteactivity.java
@@ -13,12 +13,12 @@ public class editnoteactivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
+//        EdgeToEdge.enable(this);
         setContentView(R.layout.activity_editnoteactivity);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
+//        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
+//            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+//            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
+//            return insets;
+//        });
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/notemania/notedetails.java b/app/src/main/java/com/example/notemania/notedetails.java
index d951f8a..d02d2a8 100644
--- a/app/src/main/java/com/example/notemania/notedetails.java
+++ b/app/src/main/java/com/example/notemania/notedetails.java
@@ -1,6 +1,7 @@
 package com.example.notemania;
 
 import android.os.Bundle;
+import android.widget.TextView;
 
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
@@ -8,17 +9,24 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 public class notedetails extends AppCompatActivity {
 
+    private TextView mtitleofnotedetail,mcontentofnotedetail;
+    FloatingActionButton mgotoeditnote;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
+//        EdgeToEdge.enable(this);
         setContentView(R.layout.activity_notedetails);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
+//        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
+//            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+//            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
+//            return insets;
+//        });
+        mtitleofnotedetail=findViewById(R.id.titleofnotedetail);
+        mcontentofnotedetail=findViewById(R.id.contentofnotedetail);
+        mgotoeditnote=findViewById(R.id.gotoeditnote);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/notemania/notesActivity.java b/app/src/main/java/com/example/notemania/notesActivity.java
index bfe10fd..4e602e2 100644
--- a/app/src/main/java/com/example/notemania/notesActivity.java
+++ b/app/src/main/java/com/example/notemania/notesActivity.java
@@ -21,9 +21,12 @@
 
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter;
 import com.firebase.ui.firestore.FirestoreRecyclerOptions;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.Query;
 
@@ -79,12 +82,17 @@ protected void onBindViewHolder(@NonNull NoteViewHolder noteViewHolder,int i,@No
                 noteViewHolder.notetitle.setText(firebasemodel.getTitle());
                 noteViewHolder.notecontent.setText(firebasemodel.getContent());
 
+                String docId=noteAdapter.getSnapshots().getSnapshot(i).getId();
+
                 noteViewHolder.itemView.setOnClickListener(new View.OnClickListener()
                 {
                     @Override
                     public void onClick(View v){
                    //we have to open note detail activity
                         Intent intent=new Intent(v.getContext(),notedetails.class);
+                        intent.putExtra("title",firebasemodel.getTitle());
+                        intent.putExtra("content",firebasemodel.getContent());
+                        intent.putExtra("noteId",docId);
                         v.getContext().startActivity(intent);
                         //Toast.makeText(getApplicationContext(),"This is Clicked",Toast.LENGTH_SHORT).show();
                     }
@@ -99,6 +107,9 @@ public void onClick(View v){
                             @Override
                             public boolean onMenuItemClick(@NonNull MenuItem item) {
                                 Intent intent=new Intent(v.getContext(),editnoteactivity.class);
+                                intent.putExtra("title",firebasemodel.getTitle());
+                                intent.putExtra("content",firebasemodel.getContent());
+                                intent.putExtra("noteId",docId);
                                 v.getContext().startActivity(intent);
                                 return false;
                             }
@@ -106,7 +117,19 @@ public boolean onMenuItemClick(@NonNull MenuItem item) {
                         popupMenu.getMenu().add("Delete").setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener(){
                             @Override
                             public boolean onMenuItemClick(MenuItem item){
-                                Toast.makeText(v.getContext(),"This Note is Deleted",Toast.LENGTH_SHORT).show();
+//                                Toast.makeText(v.getContext(),"This Note is Deleted",Toast.LENGTH_SHORT).show();
+                                DocumentReference documentReference= firebaseFirestore.collection("notes").document(firebaseUser.getUid()).collection("myNotes").document(docId);
+                                documentReference.delete().addOnSuccessListener(new OnSuccessListener<Void>() {
+                                    @Override
+                                    public void onSuccess(Void unused) {
+                                        Toast.makeText(v.getContext(),"This Note is Deleted",Toast.LENGTH_SHORT).show();
+                                    }
+                                }).addOnFailureListener(new OnFailureListener() {
+                                    @Override
+                                    public void onFailure(@NonNull Exception e) {
+                                        Toast.makeText(v.getContext(),"Failed to Delete",Toast.LENGTH_SHORT).show();
+                                    }
+                                });
                                 return false;
                             }
                         });
@@ -176,7 +199,7 @@ protected void onStart() {
     protected void onStop() {
         super.onStop();
         if(noteAdapter!=null){
-            noteAdapter.startListening();
+            noteAdapter.stopListening();
         }
     }
     private int getRandomcolor()
diff --git a/app/src/main/res/drawable/baseline_arrow_circle_up_24.xml b/app/src/main/res/drawable/baseline_arrow_circle_up_24.xml
new file mode 100644
index 0000000..3709c31
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_arrow_circle_up_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20M12,22c5.52,0 10,-4.48 10,-10c0,-5.52 -4.48,-10 -10,-10C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22L12,22zM11,12l0,4h2l0,-4h3l-4,-4l-4,4H11z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/baseline_edit_24.xml b/app/src/main/res/drawable/baseline_edit_24.xml
new file mode 100644
index 0000000..3c53db7
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_edit_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/activity_editnoteactivity.xml b/app/src/main/res/layout/activity_editnoteactivity.xml
index 195f342..25e9920 100644
--- a/app/src/main/res/layout/activity_editnoteactivity.xml
+++ b/app/src/main/res/layout/activity_editnoteactivity.xml
@@ -49,8 +49,8 @@
         android:layout_marginBottom="30dp"
         android:layout_marginEnd="30dp"
         android:id="@+id/saveeditnote"
-        android:src="@drawable/update"
+        android:src="@drawable/baseline_arrow_circle_up_24"
         app:backgroundTint="#A1F4FB"
-        app:maxImageSize="56dp" />
+        app:maxImageSize="40dp" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_notedetails.xml b/app/src/main/res/layout/activity_notedetails.xml
index db6f617..d32d4dd 100644
--- a/app/src/main/res/layout/activity_notedetails.xml
+++ b/app/src/main/res/layout/activity_notedetails.xml
@@ -31,7 +31,7 @@
 
     </androidx.appcompat.widget.Toolbar>
 
-    <EditText
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:textSize="17sp"
@@ -41,7 +41,9 @@
         android:hint="Enter your note content here"
         android:layout_below="@id/toolbarfornotedetail"
         android:padding="15dp"
-        android:id="@+id/contentofnotedetail" />
+        android:id="@+id/contentofnotedetail">
+
+    </TextView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_width="wrap_content"
@@ -51,8 +53,8 @@
         android:layout_marginBottom="30dp"
         android:layout_marginEnd="30dp"
         android:id="@+id/gotoeditnote"
-        android:src="@drawable/edit"
+        android:src="@drawable/baseline_edit_24"
         app:backgroundTint="#A1F4FB"
-        app:maxImageSize="56dp" />
+        app:maxImageSize="40dp" />
 
 </RelativeLayout>