diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart
index 41b789551..a9cd58c62 100644
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@@ -40,7 +40,6 @@ import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
-import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -383,7 +382,7 @@ class _MemberPageState extends State<MemberPage> {
             ],
           ),
         ),
-        if (kDebugMode || PlatformUtils.isMobile)
+        if (PlatformUtils.isMobile)
           PopupMenuItem(
             onTap: _createShortcut,
             child: const Row(
diff --git a/lib/pages/member/widget/user_info_card.dart b/lib/pages/member/widget/user_info_card.dart
index 7ab6cfab8..383d9f23e 100644
--- a/lib/pages/member/widget/user_info_card.dart
+++ b/lib/pages/member/widget/user_info_card.dart
@@ -880,11 +880,17 @@ class UserInfoCard extends StatelessWidget {
         ),
     ];
     if (children.isNotEmpty) {
+      Widget child;
+      if (children.length == 1) {
+        child = children.first;
+      } else {
+        child = isPortrait
+            ? Row(mainAxisAlignment: .spaceBetween, children: children)
+            : Wrap(spacing: 10, runSpacing: 6, children: children);
+      }
       return Padding(
         padding: const .only(left: 20, right: 20, top: 6),
-        child: isPortrait
-            ? Row(mainAxisAlignment: .spaceBetween, children: children)
-            : Wrap(spacing: 10, runSpacing: 6, children: children),
+        child: child,
       );
     }
     return null;
diff --git a/lib/pages/member_guard/controller.dart b/lib/pages/member_guard/controller.dart
index 1abd90e72..4fcc908b8 100644
--- a/lib/pages/member_guard/controller.dart
+++ b/lib/pages/member_guard/controller.dart
@@ -33,6 +33,8 @@ class MemberGuardController
       tops = list.take(3).toList();
       if (list.length > 3) {
         list.removeRange(0, 3);
+      } else {
+        list.clear();
       }
     }
     return false;