diff --git a/wake.xcodeproj/project.xcworkspace/xcuserdata/elliwood.xcuserdatad/UserInterfaceState.xcuserstate b/wake.xcodeproj/project.xcworkspace/xcuserdata/elliwood.xcuserdatad/UserInterfaceState.xcuserstate
index 32470b8..bd31ee9 100644
Binary files a/wake.xcodeproj/project.xcworkspace/xcuserdata/elliwood.xcuserdatad/UserInterfaceState.xcuserstate and b/wake.xcodeproj/project.xcworkspace/xcuserdata/elliwood.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/wake.xcodeproj/xcuserdata/elliwood.xcuserdatad/xcschemes/xcschememanagement.plist b/wake.xcodeproj/xcuserdata/elliwood.xcuserdatad/xcschemes/xcschememanagement.plist
index 62e325e..a4c98a3 100644
--- a/wake.xcodeproj/xcuserdata/elliwood.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/wake.xcodeproj/xcuserdata/elliwood.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>wake.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/wake/Info.plist b/wake/Info.plist
index 92853ab..4719d52 100644
--- a/wake/Info.plist
+++ b/wake/Info.plist
@@ -23,7 +23,7 @@
 	<key>UIAppFonts</key>
 	<array>
 		<string>Inter.ttf</string>
-		<string>Quicksand X.ttf</string>
+		<string>Quicksand x.ttf</string>
 		<string>Quicksand-Regular.ttf</string>
 		<string>Quicksand-Bold.ttf</string>
 		<string>Quicksand-SemiBold.ttf</string>
diff --git a/wake/View/Owner/UserInfo/AvatarPicker.swift b/wake/View/Owner/UserInfo/AvatarPicker.swift
index a45f35c..67e9361 100644
--- a/wake/View/Owner/UserInfo/AvatarPicker.swift
+++ b/wake/View/Owner/UserInfo/AvatarPicker.swift
@@ -5,9 +5,11 @@ public struct AvatarPicker: View {
     @State private var showMediaPicker = false
     @State private var isUploading = false
     @Binding var selectedImage: UIImage?
+    @Binding var showUsername: Bool
     
-    public init(selectedImage: Binding<UIImage?>) {
+    public init(selectedImage: Binding<UIImage?>, showUsername: Binding<Bool>) {
         self._selectedImage = selectedImage
+        self._showUsername = showUsername
     }
     
     public var body: some View {
@@ -37,23 +39,25 @@ public struct AvatarPicker: View {
                     }
                 }
             }
-            
-            // Upload button
-            Button(action: {
-                showMediaPicker = true
-            }) {
-                Text("Upload from Gallery")
-                    .font(Typography.font(for: .subtitle, family: .inter))
-                    .fontWeight(.regular)
-                    .frame(maxWidth: .infinity)
-                    .padding()
-                    .foregroundColor(.black)  
-                    .background(
-                        RoundedRectangle(cornerRadius: 16)
-                            .fill(Color.themePrimaryLight)
-                    )   
+            if !showUsername {
+                // Upload button
+                Button(action: {
+                    showMediaPicker = true
+                }) {
+                    Text("Upload from Gallery")
+                        .font(Typography.font(for: .subtitle, family: .inter))
+                        .fontWeight(.regular)
+                        .frame(maxWidth: .infinity)
+                        .padding()
+                        .foregroundColor(.black)  
+                        .background(
+                            RoundedRectangle(cornerRadius: 16)
+                                .fill(Color.themePrimaryLight)
+                        )   
+                }
+                .frame(maxWidth: .infinity)
             }
-            .frame(width: .infinity)
+            
         }
         .sheet(isPresented: $showMediaPicker) {
             MediaPicker(
diff --git a/wake/View/Owner/UserInfo/UserInfo.swift b/wake/View/Owner/UserInfo/UserInfo.swift
index d172d7f..888e4bc 100644
--- a/wake/View/Owner/UserInfo/UserInfo.swift
+++ b/wake/View/Owner/UserInfo/UserInfo.swift
@@ -4,12 +4,13 @@ struct UserInfo: View {
     @Environment(\.dismiss) private var dismiss
     
     // Sample user data - replace with your actual data model
-    @State private var userName = "MeMo"
+    @State private var userName = ""
     @State private var userEmail = "memo@example.com"
     @State private var notificationsEnabled = true
     @State private var darkModeEnabled = false
     @State private var showLogoutAlert = false
-    @State private var avatarImage: UIImage?  // Add this line
+    @State private var avatarImage: UIImage?
+    @State private var showUsername: Bool = false
     
     var body: some View {
         VStack(spacing: 0) {
@@ -46,29 +47,47 @@ struct UserInfo: View {
             Spacer()
             VStack(spacing: 20) {
                 // Title
-                Text("Add Your Avatar")
+                Text(showUsername ? "Add Your Avatar" : "What‘s Your Name？")
                     .font(Typography.font(for: .body, family: .quicksandBold))
                     .frame(maxWidth: .infinity, alignment: .center)
                 
                 // Avatar
                 ZStack {
-                    AvatarPicker(selectedImage: $avatarImage)
+                    AvatarPicker(
+                        selectedImage: $avatarImage,
+                        showUsername: $showUsername
+                    )
                 }
                 .padding(.top, 20)
                 
-                Button(action: {
-                    // Action for second button
-                }) {
-                    Text("Take a Photo")
+                if !showUsername {
+                    Button(action: {
+                        // Action for second button
+                    }) {
+                        Text("Take a Photo")
+                            .font(Typography.font(for: .subtitle, family: .inter))
+                            .fontWeight(.regular)
+                            .frame(maxWidth: .infinity)
+                            .padding()
+                            .foregroundColor(.black)
+                            .background(
+                                RoundedRectangle(cornerRadius: 16)
+                                    .fill(Color.themePrimaryLight)
+                            )
+                    }
+                }
+
+                if showUsername {
+                    TextField("Username", text: $userName)
                         .font(Typography.font(for: .subtitle, family: .inter))
-                        .fontWeight(.regular)
+                        .multilineTextAlignment(.center)
                         .frame(maxWidth: .infinity)
                         .padding()
-                        .foregroundColor(.black)
+                        .foregroundColor(.black)  
                         .background(
                             RoundedRectangle(cornerRadius: 16)
                                 .fill(Color.themePrimaryLight)
-                        )
+                        )   
                 }
             }
             .padding()
@@ -76,7 +95,7 @@ struct UserInfo: View {
             .cornerRadius(20)
             Spacer()
             Button(action: {
-                // Action for next button
+                showUsername = true
             }) {
                 Text("Continue")
                     .font(Typography.font(for: .body))