diff --git a/lib/router/contact_route.dart b/lib/router/contact_route.dart
index 014e1f8..18bd37a 100644
--- a/lib/router/contact_route.dart
+++ b/lib/router/contact_route.dart
@@ -2,27 +2,17 @@ import 'package:flutter/material.dart';
 
 import 'package:go_router/go_router.dart';
 import 'package:together_mobile/models/route_state_model.dart';
-import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_avatar_screen.dart';
-import 'package:together_mobile/screens/group_chat_profile/group_chat_outline_screen/group_chat_outline_screen.dart';
 
 import 'router_key.dart';
 import 'package:together_mobile/models/contact_model.dart';
 import 'package:together_mobile/models/init_get_it.dart';
 import 'package:together_mobile/screens/contact/contact_apply_screen/applicant_profile_screen/applicant_profile_screen.dart';
 import 'package:together_mobile/screens/contact_add/create_group_chat_screen.dart';
-import 'package:together_mobile/screens/contact_add/invite_group_chat_member_screen.dart';
-import 'package:together_mobile/screens/friend_profile/friend_setting_screen/friend_setting_screen.dart';
-import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_intro_screen.dart';
-import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_name_screen.dart';
-import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_group_chat_remark_screen.dart';
-import 'package:together_mobile/screens/group_chat_profile/change_group_chat_screen/change_my_remark_screen.dart';
 import 'package:together_mobile/screens/contact/contact_apply_screen/apply_list_screen.dart';
 import 'package:together_mobile/screens/contact/contact_screen.dart';
 import 'package:together_mobile/screens/contact/manage_group_screen/manage_group_screen.dart';
 import 'package:together_mobile/screens/contact_add/add_friend_screen/add_friend_screen.dart';
 import 'package:together_mobile/screens/contact_add/search_new_contact_screen.dart';
-import 'package:together_mobile/screens/friend_profile/friend_profile_screen.dart';
-import 'package:together_mobile/screens/group_chat_profile/group_chat_profile_screen.dart';
 
 final contactRoute = GoRoute(
   path: '/contact',
diff --git a/lib/router/more_route.dart b/lib/router/more_route.dart
index 1e61033..e311906 100644
--- a/lib/router/more_route.dart
+++ b/lib/router/more_route.dart
@@ -3,9 +3,6 @@ import 'package:go_router/go_router.dart';
 import 'package:together_mobile/models/init_get_it.dart';
 import 'package:together_mobile/models/route_state_model.dart';
 import 'package:together_mobile/screens/more/more_screen.dart';
-import 'package:together_mobile/screens/my_profile/my_profile_screen.dart';
-import 'package:together_mobile/screens/my_profile/change_profile_screen/change_account_screen.dart';
-import 'package:together_mobile/screens/my_profile/change_profile_screen/change_my_avatar_screen.dart';
 import 'package:together_mobile/screens/more/setting_screen/setting_screen.dart';
 import 'router_key.dart';
 
diff --git a/lib/router/router.dart b/lib/router/router.dart
index 7fee65d..d627a6a 100755
--- a/lib/router/router.dart
+++ b/lib/router/router.dart
@@ -1,17 +1,12 @@
 import 'package:flutter/widgets.dart';
 
 import 'package:go_router/go_router.dart';
-import 'package:together_mobile/database/hive_database.dart';
 import 'package:together_mobile/router/profile_router.dart';
 
 import 'router_key.dart';
 import 'chat_route.dart';
 import 'contact_route.dart';
 import 'more_route.dart';
-import 'package:together_mobile/models/init_get_it.dart';
-import 'package:together_mobile/models/token_model.dart';
-import 'package:together_mobile/models/user_model.dart';
-import 'package:together_mobile/request/signup_signin.dart';
 import 'package:together_mobile/screens/signin_signup/signup_screen.dart';
 import 'package:together_mobile/screens/signin_signup/signin_screen.dart';
 import 'package:together_mobile/screens/welcome/welcome_screen.dart';
diff --git a/lib/screens/contact_add/create_group_chat_screen.dart b/lib/screens/contact_add/create_group_chat_screen.dart
index 9522927..e4b5650 100644
--- a/lib/screens/contact_add/create_group_chat_screen.dart
+++ b/lib/screens/contact_add/create_group_chat_screen.dart
@@ -98,15 +98,11 @@ class _CreateGroupChatScreenState extends State<CreateGroupChatScreen> {
                       width: 70,
                       child: Column(
                         children: [
-                          avatar.isEmpty
-                              ? const CircleAvatar(
-                                  backgroundImage:
-                                      AssetImage('assets/images/user_2.png'),
-                                )
-                              : CircleAvatar(
-                                  backgroundImage: CachedNetworkImageProvider(
-                                      '$userAvatarsUrl/$avatar'),
-                                ),
+                          CircleAvatar(
+                            backgroundImage: CachedNetworkImageProvider(
+                              '$userAvatarsUrl/$avatar',
+                            ),
+                          ),
                           Text(
                             name,
                             overflow: TextOverflow.ellipsis,
diff --git a/lib/screens/contact_add/invite_group_chat_member_screen.dart b/lib/screens/contact_add/invite_group_chat_member_screen.dart
index 906bc9c..c6d4871 100644
--- a/lib/screens/contact_add/invite_group_chat_member_screen.dart
+++ b/lib/screens/contact_add/invite_group_chat_member_screen.dart
@@ -18,6 +18,7 @@ class InviteGroupChatMemberScreen extends StatefulWidget {
     super.key,
     required this.groupChatId,
   });
+
   final String groupChatId;
 
   @override
@@ -39,7 +40,8 @@ class _InviteGroupChatMemberScreenState
         .members;
     var myId = getIt.get<UserAccount>().id;
     _friendIds.removeWhere(
-        (element) => memberIds.contains(element) || element == myId);
+      (element) => memberIds.contains(element) || element == myId,
+    );
   }
 
   @override
diff --git a/lib/screens/friend_profile/friend_profile_screen.dart b/lib/screens/friend_profile/friend_profile_screen.dart
index 1b6a3f9..48037b2 100755
--- a/lib/screens/friend_profile/friend_profile_screen.dart
+++ b/lib/screens/friend_profile/friend_profile_screen.dart
@@ -9,7 +9,6 @@ import 'package:together_mobile/common/constants.dart';
 import 'package:together_mobile/models/contact_model.dart';
 import 'package:together_mobile/models/init_get_it.dart';
 import 'package:together_mobile/models/route_state_model.dart';
-import 'package:together_mobile/models/user_model.dart';
 import 'package:together_mobile/request/server.dart';
 
 class FriendProfileScreen extends StatefulWidget {
@@ -189,7 +188,10 @@ class _FriendProfileScreenState extends State<FriendProfileScreen> {
                 ),
                 OutlinedButton(
                   onPressed: () {
-                    context.pushNamed('EditProfile');
+                    context.pushNamed(
+                      'FriendSetting',
+                      queryParameters: {'friendId': widget.friendId},
+                    );
                   },
                   style: OutlinedButton.styleFrom(
                     fixedSize: const Size(100, 45),
@@ -205,12 +207,12 @@ class _FriendProfileScreenState extends State<FriendProfileScreen> {
                 ),
                 FilledButton(
                   onPressed: () {
-                    context.pushNamed(
-                      'Message',
-                      queryParameters: {
-                        'type': '0',
-                        'friendId': getIt.get<UserAccount>().id
-                      },
+                      context.pushNamed(
+                        'Message',
+                        queryParameters: {
+                          'type': '0',
+                          'friendId': widget.friendId,
+                        },
                     );
                   },
                   style: FilledButton.styleFrom(
diff --git a/lib/screens/friend_profile/friend_setting_screen/friend_setting_screen.dart b/lib/screens/friend_profile/friend_setting_screen/friend_setting_screen.dart
index f1f9ea8..9ad02c5 100644
--- a/lib/screens/friend_profile/friend_setting_screen/friend_setting_screen.dart
+++ b/lib/screens/friend_profile/friend_setting_screen/friend_setting_screen.dart
@@ -66,7 +66,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
             child: ExpansionPanelList(
               expansionCallback: (panelIndex, isExpanded) {
                 setState(() {
-                  _expand[panelIndex] = !isExpanded;
+                  _expand[panelIndex] = isExpanded;
                 });
               },
               children: [
@@ -86,7 +86,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
                             getIt
                                 .get<Contact>()
                                 .friends[widget.friendId]!
-                                .friendRemark,
+                                .friendRemark ?? '',
                             style: const TextStyle(
                               fontSize: 16,
                               color: kUnActivatedColor,
@@ -157,6 +157,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
                             }
                           },
                           style: FilledButton.styleFrom(
+                            padding: EdgeInsets.zero,
                             maximumSize: const Size(60, 30),
                             minimumSize: const Size(60, 30),
                             shape: RoundedRectangleBorder(
@@ -180,6 +181,7 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
                   ),
                   isExpanded: _expand[0],
                 ),
+
                 // 设置分组
                 ExpansionPanel(
                   headerBuilder: (BuildContext context, bool isExpanded) {
@@ -265,14 +267,11 @@ class _FriendSettingScreenState extends State<FriendSettingScreen> {
                                 _isGroupChanged = false;
                               });
 
-                              // getIt.get<Contact>().changeFriendGroup(
-                              //       widget.friendId,
-                              //       _group,
-                              //     );
                               getIt.get<Contact>().init(res['data']);
                             }
                           },
                           style: FilledButton.styleFrom(
+                            padding: EdgeInsets.zero,
                             maximumSize: const Size(60, 30),
                             minimumSize: const Size(60, 30),
                             shape: RoundedRectangleBorder(
diff --git a/lib/screens/my_profile/my_profile_screen.dart b/lib/screens/my_profile/my_profile_screen.dart
index 4f6585f..0641c1d 100755
--- a/lib/screens/my_profile/my_profile_screen.dart
+++ b/lib/screens/my_profile/my_profile_screen.dart
@@ -6,6 +6,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:go_router/go_router.dart';
 
 import 'package:together_mobile/common/constants.dart';
+import 'package:together_mobile/database/hive_database.dart';
 import 'package:together_mobile/models/init_get_it.dart';
 import 'package:together_mobile/models/route_state_model.dart';
 import 'package:together_mobile/models/user_model.dart';
@@ -174,12 +175,13 @@ class _MyProfileScreenState extends State<MyProfileScreen> {
                   ),
                 ),
                 FilledButton(
-                  onPressed: () {
+                  onPressed: () async {
+                    await HiveDatabase.openMessageBox(getIt.get<UserAccount>().id);
                     context.pushNamed(
                       'Message',
                       queryParameters: {
                         'type': '0',
-                        'friendId': getIt.get<UserAccount>().id
+                        'friendId': getIt.get<UserAccount>().id,
                       },
                     );
                   },