diff --git a/src/main/java/org/to/telegramfinalproject/UI/EditProfileController.java b/src/main/java/org/to/telegramfinalproject/UI/EditProfileController.java
index 90543d1..93da353 100644
--- a/src/main/java/org/to/telegramfinalproject/UI/EditProfileController.java
+++ b/src/main/java/org/to/telegramfinalproject/UI/EditProfileController.java
@@ -90,7 +90,7 @@ public class EditProfileController {
 
         backButton.setOnAction(e -> {
             saveChangesAndClose();
-            closeEdit(); // ← قبلاً goBack بود
+            MainController.getInstance().goBack(overlayBackground);
         });
 
         // Load your camera icon image (white camera icon for visibility)
@@ -143,7 +143,6 @@ public class EditProfileController {
     }
 
     private void closeEdit() {
-        //MainController.getInstance().closeOverlay(editCard.getParent());
 //        MainController.getInstance().goBack(overlayBackground);
         MainController.getInstance().closeOverlay(editCard.getParent());
 
diff --git a/src/main/java/org/to/telegramfinalproject/UI/MainController.java b/src/main/java/org/to/telegramfinalproject/UI/MainController.java
index cdcab0d..d6dab47 100644
--- a/src/main/java/org/to/telegramfinalproject/UI/MainController.java
+++ b/src/main/java/org/to/telegramfinalproject/UI/MainController.java
@@ -549,7 +549,7 @@ public class MainController {
     }
 
     @FXML
-    private void closeSidebar() {
+    public void closeSidebar() {
         if (sidebarRoot != null && isSidebarOpen) {
             TranslateTransition slideOut = new TranslateTransition(Duration.millis(250), sidebarRoot);
             slideOut.setToX(-getSidebarWidth());
diff --git a/src/main/java/org/to/telegramfinalproject/UI/SettingsController.java b/src/main/java/org/to/telegramfinalproject/UI/SettingsController.java
index bc04c31..03336c0 100644
--- a/src/main/java/org/to/telegramfinalproject/UI/SettingsController.java
+++ b/src/main/java/org/to/telegramfinalproject/UI/SettingsController.java
@@ -53,7 +53,7 @@ public class SettingsController {
         populateFromSession();
 
         // Make it circular
-        Circle clip = new Circle(48, 28, 38); // centerX, centerY, radius
+        Circle clip = new Circle(40, 30, 38); // centerX, centerY, radius
         profileImage.setClip(clip);
 
         // Buttons
@@ -223,11 +223,11 @@ public class SettingsController {
 
         // ست کردن در UI
         profileName.setText(cachedName);
-        profileId.setText(cachedUsername);
+        profileId.setText("@" + cachedUsername);
         profileImage.setImage(cachedAvatar);
 
         // گرد کردن تصویر (با توجه به اندازه‌ی واقعی)
-        Circle clip = new Circle(38, 38, 38); // centerX, centerY, radius
+        Circle clip = new Circle(40, 30, 38); // centerX, centerY, radius
         profileImage.setClip(clip);
     }
 }
diff --git a/src/main/java/org/to/telegramfinalproject/UI/SidebarMenuController.java b/src/main/java/org/to/telegramfinalproject/UI/SidebarMenuController.java
index c8a4b20..83ee30c 100644
--- a/src/main/java/org/to/telegramfinalproject/UI/SidebarMenuController.java
+++ b/src/main/java/org/to/telegramfinalproject/UI/SidebarMenuController.java
@@ -324,6 +324,7 @@ public class SidebarMenuController {
             boolean opened = false;
             try {
                 MainController.getInstance().openChat(entry);
+                MainController.getInstance().closeSidebar();
                 opened = true;
             } catch (Throwable t) {
                 // مسیر دوم: اگر با id/type باز می‌کنی، یا اول info می‌گیری:
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/img.png b/src/main/resources/org/to/telegramfinalproject/Avatars/img.png
deleted file mode 100644
index 281de74..0000000
Binary files a/src/main/resources/org/to/telegramfinalproject/Avatars/img.png and /dev/null differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/profile_test.png b/src/main/resources/org/to/telegramfinalproject/Avatars/profile_test.png
deleted file mode 100644
index 60b152f..0000000
Binary files a/src/main/resources/org/to/telegramfinalproject/Avatars/profile_test.png and /dev/null differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/profile_test2.png b/src/main/resources/org/to/telegramfinalproject/Avatars/profile_test2.png
deleted file mode 100644
index 138d37e..0000000
Binary files a/src/main/resources/org/to/telegramfinalproject/Avatars/profile_test2.png and /dev/null differ