diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521a..000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 4bec4ea8a..000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a179..000000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index e76ed3f3c..0c0c33838 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,20 +3,7 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State>
-          <runningDeviceTargetSelectedWithDropDown>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="R3CN603FCDX" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-02-12T19:28:59.347679500Z" />
-        </State>
+        <State />
       </entry>
     </value>
   </component>
diff --git a/.idea/dictionaries/jaino.xml b/.idea/dictionaries/jaino.xml
deleted file mode 100644
index 8bf927053..000000000
--- a/.idea/dictionaries/jaino.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="jaino" />
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6ebf526c9..4a72748e6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,9 +16,8 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b0..103e00cbe 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,39 +3,30 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
     </inspection_tool>
   </profile>
 </component>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index d2ce72d10..000000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 25b9e42b7..8978d23db 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,9 @@
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/wap/wapp/MainActivity.kt b/app/src/main/java/com/wap/wapp/MainActivity.kt
index 8f7374744..8b6e9df79 100644
--- a/app/src/main/java/com/wap/wapp/MainActivity.kt
+++ b/app/src/main/java/com/wap/wapp/MainActivity.kt
@@ -28,6 +28,7 @@ import com.wap.wapp.core.domain.usecase.auth.SignInUseCase
 import com.wap.wapp.feature.attendance.management.navigation.attendanceManagementNavigationRoute
 import com.wap.wapp.feature.auth.signin.navigation.signInNavigationRoute
 import com.wap.wapp.feature.auth.signup.navigation.signUpNavigationRoute
+import com.wap.wapp.feature.management.event.navigation.eventEditNavigationRoute
 import com.wap.wapp.feature.management.event.navigation.eventRegistrationNavigationRoute
 import com.wap.wapp.feature.management.survey.navigation.ManagementSurveyRoute
 import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavigationRoute
@@ -114,6 +115,7 @@ private fun handleBottomBarState(
     ManagementSurveyRoute.surveyFormRegistrationRoute -> setBottomBarState(false)
     ManagementSurveyRoute.surveyFormEditRoute("{id}") -> setBottomBarState(false)
     eventRegistrationNavigationRoute -> setBottomBarState(false)
+    eventEditNavigationRoute -> setBottomBarState(false)
     SurveyRoute.answerRoute("{id}") -> setBottomBarState(false)
     surveyCheckRoute -> setBottomBarState(false)
     SurveyCheckRoute.surveyDetailRoute("{id}") -> setBottomBarState(false)
diff --git a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt
index 0c8c407c4..e1a5c3f66 100644
--- a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt
+++ b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt
@@ -93,6 +93,11 @@ fun WappNavHost(
                 )
             },
             navigateToSurveyDetail = navController::navigateToSurveyDetail,
+            navigateToSurvey = {
+                navController.navigateToSurvey(
+                    navOptions { popUpTo(surveyCheckRoute) { inclusive = true } },
+                )
+            },
         )
         managementSurveyNavGraph(
             navigateToManagement = navController::navigateToManagement,
@@ -109,7 +114,13 @@ fun WappNavHost(
         )
         attendanceScreen(
             navigateToSignIn = {
-                navController.navigateToSignIn(navOptions { popUpTo(attendanceNavigationRoute) })
+                navController.navigateToSignIn(
+                    navOptions {
+                        popUpTo(
+                            attendanceNavigationRoute,
+                        )
+                    },
+                )
             },
             navigateToAttendanceManagement = navController::navigateToAttendanceManagement,
         )
diff --git a/core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ThrowableExtensions.kt b/core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ThrowableExtensions.kt
index 717bf5023..be1606f21 100644
--- a/core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ThrowableExtensions.kt
+++ b/core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ThrowableExtensions.kt
@@ -6,42 +6,32 @@ import java.net.UnknownHostException
 
 fun Throwable.toSupportingText(): String {
     return when (this) {
-        is UnknownHostException -> {
-            "네트워크 연결이 원활하지 않습니다."
-        }
-        is FirebaseAuthException -> {
-            this.toSupportingText()
-        }
-        is FirebaseFirestoreException -> {
-            this.toSupportingText()
-        }
-        else -> {
-            "알 수 없는 오류가 발생하였습니다."
-        }
+        is UnknownHostException -> "네트워크 연결이 원활하지 않습니다."
+
+        is FirebaseAuthException -> this.toSupportingText()
+
+        is FirebaseFirestoreException -> this.toSupportingText()
+
+        is IllegalStateException -> this.message.toString()
+
+        else -> "알 수 없는 오류가 발생하였습니다."
     }
 }
 
 fun FirebaseAuthException.toSupportingText(): String {
     return when (this.errorCode) {
-        "ERROR_WEB_CONTEXT_CANCELED", "ERROR_USER_CANCELLED" -> {
-            "다시 시도해 주세요."
-        }
-        else -> {
-            "알 수 없는 오류가 발생하였습니다."
-        }
+        "ERROR_WEB_CONTEXT_CANCELED", "ERROR_USER_CANCELLED" -> "다시 시도해 주세요."
+
+        else -> "알 수 없는 오류가 발생하였습니다."
     }
 }
 
 fun FirebaseFirestoreException.toSupportingText(): String {
     return when (this.code.value()) {
-        7 -> {
-            "접근 권한이 없습니다."
-        }
-        16 -> {
-            "회원이 만료되었습니다. 다시 로그인 해주세요."
-        }
-        else -> {
-            "알 수 없는 오류가 발생하였습니다."
-        }
+        7 -> "접근 권한이 없습니다."
+
+        16 -> "회원이 만료되었습니다. 다시 로그인 해주세요."
+
+        else -> "알 수 없는 오류가 발생하였습니다."
     }
 }
diff --git a/core/designsystem/src/main/java/com/wap/designsystem/component/MainTopBar.kt b/core/designsystem/src/main/java/com/wap/designsystem/component/MainTopBar.kt
index 5dfff653c..b8e6904b9 100644
--- a/core/designsystem/src/main/java/com/wap/designsystem/component/MainTopBar.kt
+++ b/core/designsystem/src/main/java/com/wap/designsystem/component/MainTopBar.kt
@@ -35,7 +35,7 @@ fun WappLeftMainTopBar(
         verticalArrangement = Arrangement.spacedBy(16.dp),
         horizontalAlignment = Alignment.Start,
         modifier = modifier
-            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 20.dp)
+            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 40.dp)
             .fillMaxWidth()
             .wrapContentHeight(),
     ) {
@@ -79,7 +79,7 @@ fun WappRightMainTopBar(
         verticalArrangement = Arrangement.spacedBy(16.dp),
         horizontalAlignment = Alignment.End,
         modifier = modifier
-            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 20.dp)
+            .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 40.dp)
             .fillMaxWidth()
             .wrapContentHeight(),
     ) {
diff --git a/core/designsystem/src/main/java/com/wap/designsystem/component/TextField.kt b/core/designsystem/src/main/java/com/wap/designsystem/component/TextField.kt
index d389ebb4a..aa117d198 100644
--- a/core/designsystem/src/main/java/com/wap/designsystem/component/TextField.kt
+++ b/core/designsystem/src/main/java/com/wap/designsystem/component/TextField.kt
@@ -2,15 +2,21 @@ package com.wap.designsystem.component
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.wap.designsystem.WappTheme
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun WappTextField(
     value: String,
@@ -19,9 +25,11 @@ fun WappTextField(
     isError: Boolean = false,
     supportingText: String = "",
 ) {
+    val keyboardController = LocalSoftwareKeyboardController.current
+
     TextField(
         value = value,
-        onValueChange = { value -> onValueChanged(value) },
+        onValueChange = { newValue -> onValueChanged(newValue) },
         colors = TextFieldDefaults.colors(
             unfocusedContainerColor = WappTheme.colors.black25,
             focusedContainerColor = WappTheme.colors.black25,
@@ -39,6 +47,9 @@ fun WappTextField(
         label = {
             Text(text = stringResource(label))
         },
+        singleLine = true,
+        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+        keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
         isError = isError,
         supportingText = {
             Text(text = supportingText)
@@ -46,6 +57,7 @@ fun WappTextField(
     )
 }
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun WappRoundedTextField(
     value: String,
@@ -53,6 +65,8 @@ fun WappRoundedTextField(
     modifier: Modifier = Modifier,
     @StringRes placeholder: Int,
 ) {
+    val keyboardController = LocalSoftwareKeyboardController.current
+
     TextField(
         value = value,
         onValueChange = onValueChange,
@@ -72,6 +86,8 @@ fun WappRoundedTextField(
                 color = WappTheme.colors.gray82,
             )
         },
+        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+        keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
         shape = RoundedCornerShape(10.dp),
     )
 }
diff --git a/core/designsystem/src/main/java/com/wap/designsystem/modifier/ModifierUtil.kt b/core/designsystem/src/main/java/com/wap/designsystem/modifier/ModifierUtil.kt
new file mode 100644
index 000000000..2152086a1
--- /dev/null
+++ b/core/designsystem/src/main/java/com/wap/designsystem/modifier/ModifierUtil.kt
@@ -0,0 +1,17 @@
+package com.wap.designsystem.modifier
+
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusManager
+import androidx.compose.ui.input.pointer.pointerInput
+
+fun Modifier.addFocusCleaner(focusManager: FocusManager, doOnClear: () -> Unit = {}): Modifier {
+    return this.pointerInput(Unit) {
+        detectTapGestures(
+            onTap = {
+                doOnClear()
+                focusManager.clearFocus()
+            },
+        )
+    }
+}
diff --git a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/AttendanceScreen.kt b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/AttendanceScreen.kt
index af5567c86..9bb72e6ca 100644
--- a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/AttendanceScreen.kt
+++ b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/AttendanceScreen.kt
@@ -83,24 +83,27 @@ internal fun AttendanceRoute(
         }
     }
 
-    when (userRoleState) {
-        is UserRoleState.Loading -> CircleLoader(modifier = Modifier.fillMaxSize())
-        is UserRoleState.Success -> {
-            when ((userRoleState as UserRoleState.Success).userRole) {
-                UserRole.GUEST -> AttendanceGuestScreen(onButtonClicked = navigateToSignIn)
-                UserRole.MANAGER, UserRole.MEMBER -> AttendanceScreen(
-                    userRole = (userRoleState as UserRoleState.Success).userRole,
-                    snackBarHostState = snackBarHostState,
-                    eventsAttendanceStatusState = eventsAttendanceStatusState,
-                    attendanceCode = attendanceCode,
-                    selectedEventTitle = selectedEventTitle,
-                    clearAttendanceCode = viewModel::clearAttendanceCode,
-                    onAttendanceCodeChanged = viewModel::setAttendanceCode,
-                    onSelectEventId = viewModel::setSelectedEventId,
-                    onSelectEventTitle = viewModel::setSelectedEventTitle,
-                    verifyAttendanceCode = viewModel::verifyAttendanceCode,
-                    navigateToAttendanceManagement = navigateToAttendanceManagement,
-                )
+    Column(modifier = Modifier.fillMaxSize()) {
+        when (userRoleState) {
+            is UserRoleState.Loading -> CircleLoader(modifier = Modifier.fillMaxSize())
+            is UserRoleState.Success -> {
+                when ((userRoleState as UserRoleState.Success).userRole) {
+                    UserRole.GUEST -> AttendanceGuestScreen(onButtonClicked = navigateToSignIn)
+                    UserRole.MANAGER, UserRole.MEMBER ->
+                        AttendanceScreen(
+                            userRole = (userRoleState as UserRoleState.Success).userRole,
+                            snackBarHostState = snackBarHostState,
+                            eventsAttendanceStatusState = eventsAttendanceStatusState,
+                            attendanceCode = attendanceCode,
+                            selectedEventTitle = selectedEventTitle,
+                            clearAttendanceCode = viewModel::clearAttendanceCode,
+                            onAttendanceCodeChanged = viewModel::setAttendanceCode,
+                            onSelectEventId = viewModel::setSelectedEventId,
+                            onSelectEventTitle = viewModel::setSelectedEventTitle,
+                            verifyAttendanceCode = viewModel::verifyAttendanceCode,
+                            navigateToAttendanceManagement = navigateToAttendanceManagement,
+                        )
+                }
             }
         }
     }
diff --git a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/component/AttendanceDialog.kt b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/component/AttendanceDialog.kt
index 4536cc5da..f380d12c5 100644
--- a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/component/AttendanceDialog.kt
+++ b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/component/AttendanceDialog.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -18,11 +19,14 @@ import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
@@ -34,6 +38,7 @@ import androidx.compose.ui.window.DialogProperties
 import com.wap.designsystem.WappTheme
 import com.wap.wapp.feature.attendance.R
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal fun AttendanceDialog(
     attendanceCode: String,
@@ -42,6 +47,8 @@ internal fun AttendanceDialog(
     onDismissRequest: () -> Unit,
     onAttendanceCodeChanged: (String) -> Unit,
 ) {
+    val keyboardController = LocalSoftwareKeyboardController.current
+
     Dialog(
         onDismissRequest = onDismissRequest,
         properties = DialogProperties(
@@ -79,7 +86,11 @@ internal fun AttendanceDialog(
                 value = attendanceCode,
                 onValueChange = onAttendanceCodeChanged,
                 textStyle = WappTheme.typography.titleRegular.copy(textAlign = TextAlign.Center),
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Number,
+                    imeAction = ImeAction.Done,
+                ),
+                keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
                 shape = RoundedCornerShape(8.dp),
                 colors = OutlinedTextFieldDefaults.colors(
                     focusedTextColor = WappTheme.colors.white,
diff --git a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementScreen.kt b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementScreen.kt
index 97c2fa77d..ed741d19e 100644
--- a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementScreen.kt
+++ b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementScreen.kt
@@ -57,6 +57,9 @@ internal fun AttendanceManagementRoute(
             viewModel.attendanceManagementEvent.collect { event ->
                 when (event) {
                     is AttendanceManagementEvent.Success -> navigateToAttendance()
+
+                    is AttendanceManagementEvent.Failure ->
+                        snackBarHostState.showSnackbar(message = event.message)
                 }
             }
         }
diff --git a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementViewModel.kt b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementViewModel.kt
index d59d1ed75..30432a920 100644
--- a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementViewModel.kt
+++ b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/AttendanceManagementViewModel.kt
@@ -53,6 +53,13 @@ class AttendanceManagementViewModel @Inject constructor(
     }
 
     fun postAttendance() = viewModelScope.launch {
+        if (_attendanceCode.value.isEmpty()) {
+            _attendanceManagementEvent.emit(
+                AttendanceManagementEvent.Failure("출석 코드는 공란일 수 없습니다."),
+            )
+            return@launch
+        }
+
         postAttendanceUseCase(
             eventId = selectedEventId.value,
             code = _attendanceCode.value,
@@ -81,5 +88,6 @@ class AttendanceManagementViewModel @Inject constructor(
 
     sealed class AttendanceManagementEvent {
         data object Success : AttendanceManagementEvent()
+        data class Failure(val message: String) : AttendanceManagementEvent()
     }
 }
diff --git a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/component/AttendanceManagementDialog.kt b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/component/AttendanceManagementDialog.kt
index 3dacc32e0..f011a0933 100644
--- a/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/component/AttendanceManagementDialog.kt
+++ b/feature/attendance/src/main/java/com/wap/wapp/feature/attendance/management/component/AttendanceManagementDialog.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -18,11 +19,14 @@ import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
@@ -34,6 +38,7 @@ import androidx.compose.ui.window.DialogProperties
 import com.wap.designsystem.WappTheme
 import com.wap.wapp.feature.attendance.R
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal fun AttendanceManagementDialog(
     attendanceCode: String,
@@ -42,6 +47,8 @@ internal fun AttendanceManagementDialog(
     onDismissRequest: () -> Unit,
     onAttendanceCodeChanged: (String) -> Unit,
 ) {
+    val keyboardController = LocalSoftwareKeyboardController.current
+
     Dialog(
         onDismissRequest = onDismissRequest,
         properties = DialogProperties(
@@ -79,7 +86,11 @@ internal fun AttendanceManagementDialog(
                 value = attendanceCode,
                 onValueChange = onAttendanceCodeChanged,
                 textStyle = WappTheme.typography.titleRegular.copy(textAlign = TextAlign.Center),
-                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Number,
+                    imeAction = ImeAction.Done,
+                ),
+                keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
                 shape = RoundedCornerShape(8.dp),
                 colors = OutlinedTextFieldDefaults.colors(
                     focusedTextColor = WappTheme.colors.white,
diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInScreen.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInScreen.kt
index 89436552a..107fc75ec 100644
--- a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInScreen.kt
+++ b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.BottomSheetScaffold
 import androidx.compose.material3.Button
@@ -27,13 +28,18 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.wap.designsystem.WappTheme
+import com.wap.designsystem.modifier.addFocusCleaner
 import com.wap.wapp.core.commmon.extensions.toSupportingText
 import com.wap.wapp.core.domain.model.AuthState
 import com.wap.wapp.core.domain.usecase.auth.SignInUseCase
@@ -53,7 +59,7 @@ internal fun SignInRoute(
     )
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 internal fun SignInScreen(
     signInUseCase: SignInUseCase,
@@ -64,6 +70,8 @@ internal fun SignInScreen(
     val scaffoldState = rememberBottomSheetScaffoldState()
     val snackBarHostState = remember { SnackbarHostState() }
     var email by rememberSaveable { mutableStateOf("") }
+    val keyboardController = LocalSoftwareKeyboardController.current
+    val focusManager = LocalFocusManager.current
 
     BottomSheetScaffold(
         scaffoldState = scaffoldState,
@@ -74,7 +82,9 @@ internal fun SignInScreen(
         modifier = Modifier.fillMaxSize(),
         sheetContent = {
             Column(
-                modifier = Modifier.padding(16.dp),
+                modifier = Modifier
+                    .padding(16.dp)
+                    .addFocusCleaner(focusManager),
             ) {
                 Text(
                     modifier = Modifier.align(Alignment.CenterHorizontally),
@@ -83,6 +93,7 @@ internal fun SignInScreen(
                     color = WappTheme.colors.white,
                     fontSize = 18.sp,
                 )
+
                 Spacer(modifier = Modifier.height(16.dp))
 
                 Text(
@@ -90,11 +101,13 @@ internal fun SignInScreen(
                     color = WappTheme.colors.white,
                     style = WappTheme.typography.labelRegular,
                 )
+
                 Spacer(modifier = Modifier.height(4.dp))
 
                 OutlinedTextField(
                     modifier = Modifier.fillMaxWidth(),
                     value = email,
+                    maxLines = 1,
                     onValueChange = { email = it },
                     placeholder = {
                         Text(
@@ -103,6 +116,10 @@ internal fun SignInScreen(
                     },
                     keyboardOptions = KeyboardOptions(
                         keyboardType = KeyboardType.Email,
+                        imeAction = ImeAction.Done,
+                    ),
+                    keyboardActions = KeyboardActions(
+                        onDone = { keyboardController?.hide() },
                     ),
                     colors = OutlinedTextFieldDefaults.colors(
                         focusedTextColor = WappTheme.colors.white,
@@ -150,13 +167,16 @@ internal fun SignInScreen(
                         style = WappTheme.typography.contentMedium,
                     )
                 }
+
                 Spacer(modifier = Modifier.height(16.dp))
 
                 Divider(
                     color = WappTheme.colors.white,
                     thickness = 1.dp,
                 )
+
                 Spacer(modifier = Modifier.height(8.dp))
+
                 Text(
                     modifier = Modifier.fillMaxWidth(),
                     textAlign = TextAlign.Center,
@@ -164,6 +184,7 @@ internal fun SignInScreen(
                     style = WappTheme.typography.captionMedium,
                     color = WappTheme.colors.yellow34,
                 )
+
                 Spacer(modifier = Modifier.height(32.dp))
             }
         },
diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpChip.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpChip.kt
index 6ac68877f..8e5c76071 100644
--- a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpChip.kt
+++ b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpChip.kt
@@ -1,5 +1,6 @@
 package com.wap.wapp.feature.auth.signup
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyRow
@@ -26,7 +27,10 @@ internal fun SignUpChip(
         stringResource(id = R.string.first_semester),
         stringResource(id = R.string.second_semester),
     )
-    LazyRow(modifier = Modifier.fillMaxWidth()) {
+    LazyRow(
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier = Modifier.fillMaxWidth(),
+    ) {
         items(itemsList) { item ->
             FilterChip(
                 modifier = Modifier.padding(horizontal = 6.dp),
diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpScreen.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpScreen.kt
index c30008d3c..1d4efd890 100644
--- a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpScreen.kt
+++ b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpScreen.kt
@@ -4,12 +4,14 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Text
 import androidx.compose.material3.Button
@@ -22,14 +24,19 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappSubTopBar
+import com.wap.designsystem.modifier.addFocusCleaner
 import com.wap.wapp.core.commmon.extensions.toSupportingText
 import com.wap.wapp.core.designresource.R
 import com.wap.wapp.feature.auth.R.drawable.ic_card
@@ -51,6 +58,7 @@ internal fun SignUpRoute(
     )
 }
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal fun SignUpScreen(
     viewModel: SignUpViewModel,
@@ -58,125 +66,144 @@ internal fun SignUpScreen(
     navigateToSignIn: () -> Unit,
 ) {
     val snackBarHostState = remember { SnackbarHostState() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+    val focusManager = LocalFocusManager.current
 
     LaunchedEffect(true) {
         viewModel.signUpEventFlow.collectLatest {
             when (it) {
-                is SignUpEvent.Success -> {
-                    navigateToNotice()
-                }
+                is SignUpEvent.Success -> navigateToNotice()
 
-                is SignUpEvent.Failure -> {
-                    snackBarHostState.showSnackbar(
-                        message = it.throwable.toSupportingText(),
-                    )
-                }
+                is SignUpEvent.Failure ->
+                    snackBarHostState.showSnackbar(message = it.throwable.toSupportingText())
             }
         }
     }
 
     Scaffold(
         modifier = Modifier.fillMaxSize(),
+        contentWindowInsets = WindowInsets(0.dp),
         containerColor = WappTheme.colors.backgroundBlack,
         snackbarHost = { SnackbarHost(snackBarHostState) },
-    ) { padding ->
+    ) { paddingValue ->
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .padding(horizontal = 16.dp),
+                .addFocusCleaner(focusManager)
+                .padding(paddingValue),
         ) {
             WappSubTopBar(
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 16.dp),
                 titleRes = string.sign_up,
                 showLeftButton = true,
                 onClickLeftButton = { navigateToSignIn() },
             )
-            Spacer(modifier = Modifier.height(16.dp))
 
-            Text(
-                text = stringResource(id = string.sign_up_title),
-                style = WappTheme.typography.titleBold,
-                fontSize = 22.sp,
-                color = WappTheme.colors.white,
-            )
-            Text(
-                text = stringResource(id = string.sign_up_content),
-                style = WappTheme.typography.contentMedium,
-                color = WappTheme.colors.grayA2,
-            )
+            Column(modifier = Modifier.padding(top = 40.dp, start = 20.dp, end = 20.dp)) {
+                Spacer(modifier = Modifier.height(16.dp))
 
-            Spacer(modifier = Modifier.height(32.dp))
-
-            Column(
-                verticalArrangement = Arrangement.spacedBy(32.dp),
-            ) {
-                SignUpTextField(
-                    iconDescription = stringResource(id = string.sign_up_name_description),
-                    text = viewModel.signUpName.collectAsState().value,
-                    title = stringResource(id = string.sign_up_name_title),
-                    onValueChanged = { name -> viewModel.setName(name) },
-                    hint = stringResource(id = string.sign_up_name_hint),
-                    supportingText = stringResource(id = string.sign_up_name_caption),
-                    icon = R.drawable.ic_profile,
-                    modifier = Modifier.fillMaxWidth(),
-                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
+                Text(
+                    text = stringResource(id = string.sign_up_title),
+                    style = WappTheme.typography.titleBold,
+                    fontSize = 22.sp,
+                    color = WappTheme.colors.white,
                 )
 
-                SignUpTextField(
-                    iconDescription = stringResource(
-                        id = string.sign_up_student_id_description,
-                    ),
-                    text = viewModel.signUpStudentId.collectAsState().value,
-                    title = stringResource(id = string.sign_up_student_id_title),
-                    onValueChanged = { name -> viewModel.setStudentId(name) },
-                    hint = stringResource(id = string.sign_up_student_id_hint),
-                    supportingText = stringResource(id = string.sign_up_student_id_caption),
-                    icon = ic_card,
-                    modifier = Modifier.fillMaxWidth(),
-                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                Text(
+                    text = stringResource(id = string.sign_up_content),
+                    style = WappTheme.typography.contentMedium,
+                    color = WappTheme.colors.grayA2,
                 )
 
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
+                Spacer(modifier = Modifier.height(32.dp))
+
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(32.dp),
+                    modifier = Modifier.padding(bottom = 20.dp),
                 ) {
                     SignUpTextField(
-                        iconDescription = stringResource(
-                            id = string.sign_up_registered_at_description,
+                        iconDescription = stringResource(id = string.sign_up_name_description),
+                        text = viewModel.signUpName.collectAsState().value,
+                        title = stringResource(id = string.sign_up_name_title),
+                        onValueChanged = { name -> viewModel.setName(name) },
+                        hint = stringResource(id = string.sign_up_name_hint),
+                        supportingText = stringResource(id = string.sign_up_name_caption),
+                        icon = R.drawable.ic_profile,
+                        modifier = Modifier.fillMaxWidth(),
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = KeyboardType.Text,
+                            imeAction = ImeAction.Done,
                         ),
-                        text = viewModel.signUpYear.collectAsState().value,
-                        title = stringResource(id = string.sign_up_registered_at_title),
-                        onValueChanged = { name -> viewModel.setYear(name) },
-                        hint = stringResource(id = string.sign_up_registered_at_hint),
-                        supportingText = stringResource(
-                            id = string.sign_up_registered_at_caption,
-                        ),
-                        icon = ic_door,
-                        modifier = Modifier.width(150.dp),
-                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                        keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
                     )
 
-                    SignUpChip(
-                        selectedItem = viewModel.signUpSemester.collectAsState().value,
-                        onSelected = { semester -> viewModel.setSemester(semester) },
+                    SignUpTextField(
+                        iconDescription =
+                        stringResource(id = string.sign_up_student_id_description),
+                        text = viewModel.signUpStudentId.collectAsState().value,
+                        title = stringResource(id = string.sign_up_student_id_title),
+                        onValueChanged = { name -> viewModel.setStudentId(name) },
+                        hint = stringResource(id = string.sign_up_student_id_hint),
+                        supportingText = stringResource(id = string.sign_up_student_id_caption),
+                        icon = ic_card,
+                        modifier = Modifier.fillMaxWidth(),
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = KeyboardType.Number,
+                            imeAction = ImeAction.Done,
+                        ),
+                        keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
                     )
-                }
 
-                Button(
-                    onClick = { viewModel.postUserProfile() },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(48.dp),
-                    colors = ButtonDefaults.buttonColors(
-                        containerColor = WappTheme.colors.yellow34,
-                    ),
-                    shape = RoundedCornerShape(10.dp),
-                ) {
-                    Text(
-                        text = stringResource(id = string.done),
-                        style = WappTheme.typography.contentMedium,
-                        color = WappTheme.colors.white,
-                    )
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        SignUpTextField(
+                            iconDescription = stringResource(
+                                id = string.sign_up_registered_at_description,
+                            ),
+                            text = viewModel.signUpYear.collectAsState().value,
+                            title = stringResource(id = string.sign_up_registered_at_title),
+                            onValueChanged = { name -> viewModel.setYear(name) },
+                            hint = stringResource(id = string.sign_up_registered_at_hint),
+                            supportingText =
+                            stringResource(id = string.sign_up_registered_at_caption),
+                            icon = ic_door,
+                            modifier = Modifier.width(150.dp),
+                            keyboardOptions = KeyboardOptions(
+                                keyboardType = KeyboardType.Number,
+                                imeAction = ImeAction.Done,
+                            ),
+                            keyboardActions =
+                            KeyboardActions(onDone = { keyboardController?.hide() }),
+                        )
+
+                        SignUpChip(
+                            selectedItem = viewModel.signUpSemester.collectAsState().value,
+                            onSelected = { semester -> viewModel.setSemester(semester) },
+                        )
+                    }
+
+                    Spacer(modifier = Modifier.weight(1f))
+
+                    Button(
+                        onClick = { viewModel.postUserProfile() },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(48.dp),
+                        colors = ButtonDefaults.buttonColors(
+                            containerColor = WappTheme.colors.yellow34,
+                        ),
+                        shape = RoundedCornerShape(10.dp),
+                    ) {
+                        Text(
+                            text = stringResource(id = string.done),
+                            style = WappTheme.typography.contentMedium,
+                            color = WappTheme.colors.white,
+                        )
+                    }
                 }
             }
         }
diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpTextField.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpTextField.kt
index b688d18cd..ff6245a16 100644
--- a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpTextField.kt
+++ b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpTextField.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
@@ -28,6 +29,7 @@ internal fun SignUpTextField(
     supportingText: String,
     icon: Int,
     keyboardOptions: KeyboardOptions,
+    keyboardActions: KeyboardActions,
     modifier: Modifier,
 ) {
     Column {
@@ -40,13 +42,16 @@ internal fun SignUpTextField(
                 tint = WappTheme.colors.white,
                 modifier = Modifier.size(20.dp),
             )
+
             Spacer(modifier = Modifier.width(8.dp))
+
             Text(
                 text = title,
                 color = WappTheme.colors.white,
                 style = WappTheme.typography.contentBold,
             )
         }
+
         TextField(
             value = text,
             onValueChange = onValueChanged,
@@ -57,12 +62,16 @@ internal fun SignUpTextField(
                 focusedIndicatorColor = WappTheme.colors.white,
                 unfocusedIndicatorColor = WappTheme.colors.white,
             ),
+            maxLines = 1,
             placeholder = {
                 Text(text = hint, color = WappTheme.colors.grayA2)
             },
             keyboardOptions = keyboardOptions,
+            keyboardActions = keyboardActions,
         )
+
         Spacer(modifier = Modifier.height(8.dp))
+
         Text(
             text = supportingText,
             color = WappTheme.colors.yellow34,
diff --git a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpViewModel.kt b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpViewModel.kt
index d060c859e..bafb9840c 100644
--- a/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpViewModel.kt
+++ b/feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpViewModel.kt
@@ -31,35 +31,34 @@ class SignUpViewModel @Inject constructor(
     private val _signUpSemester: MutableStateFlow<String> = MutableStateFlow(FIRST_SEMESTER)
     val signUpSemester: StateFlow<String> get() = _signUpSemester
 
-    fun postUserProfile() {
-        viewModelScope.launch {
-            postUserProfileUseCase(
-                userName = _signUpName.value,
-                studentId = _signUpStudentId.value,
-                registeredAt = "${_signUpYear.value} ${_signUpSemester.value}",
-            ).onSuccess {
-                _signUpEventFlow.emit(SignUpEvent.Success)
-            }.onFailure { throwable ->
-                _signUpEventFlow.emit(SignUpEvent.Failure(throwable))
-            }
+    fun postUserProfile() = viewModelScope.launch {
+        if (!isValidStudentId()) {
+            _signUpEventFlow.emit(
+                SignUpEvent.Failure(IllegalStateException("학번은 9자리로만 입력하실 수 있어요!")),
+            )
+            return@launch
         }
-    }
 
-    fun setName(name: String) {
-        _signUpName.value = name
+        postUserProfileUseCase(
+            userName = _signUpName.value,
+            studentId = _signUpStudentId.value,
+            registeredAt = "${_signUpYear.value} ${_signUpSemester.value}",
+        ).onSuccess {
+            _signUpEventFlow.emit(SignUpEvent.Success)
+        }.onFailure { throwable ->
+            _signUpEventFlow.emit(SignUpEvent.Failure(throwable))
+        }
     }
 
-    fun setStudentId(studentId: String) {
-        _signUpStudentId.value = studentId
-    }
+    fun isValidStudentId(): Boolean = (_signUpStudentId.value.length == STUDENT_ID_LENGTH)
 
-    fun setYear(year: String) {
-        _signUpYear.value = year
-    }
+    fun setName(name: String) { _signUpName.value = name }
 
-    fun setSemester(semester: String) {
-        _signUpSemester.value = semester
-    }
+    fun setStudentId(studentId: String) { _signUpStudentId.value = studentId }
+
+    fun setYear(year: String) { _signUpYear.value = year }
+
+    fun setSemester(semester: String) { _signUpSemester.value = semester }
 
     sealed class SignUpEvent {
         data object Success : SignUpEvent()
@@ -68,5 +67,6 @@ class SignUpViewModel @Inject constructor(
 
     companion object {
         const val FIRST_SEMESTER = "1학기"
+        const val STUDENT_ID_LENGTH = 9
     }
 }
diff --git a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/component/RegistrationTextField.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/component/RegistrationTextField.kt
index 3848324b0..b3b8bffa3 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/component/RegistrationTextField.kt
+++ b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/component/RegistrationTextField.kt
@@ -1,47 +1,69 @@
 package com.wap.wapp.feature.management.event.component
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Text
-import androidx.compose.material3.TextField
-import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.wap.designsystem.WappTheme
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 internal fun RegistrationTextField(
     value: String,
     onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
     textAlign: TextAlign? = null,
+    align: Alignment = Alignment.TopStart,
     placeholder: String,
+    singleline: Boolean = true,
 ) {
-    TextField(
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    BasicTextField(
         value = value,
         onValueChange = onValueChange,
-        shape = RoundedCornerShape(10.dp),
         textStyle = WappTheme.typography.contentMedium.copy(
             textAlign = textAlign,
+            color = WappTheme.colors.white,
         ),
-        colors = TextFieldDefaults.colors(
-            focusedTextColor = WappTheme.colors.white,
-            unfocusedTextColor = WappTheme.colors.white,
-            focusedContainerColor = WappTheme.colors.black25,
-            unfocusedContainerColor = WappTheme.colors.black25,
-            focusedIndicatorColor = WappTheme.colors.black25,
-            unfocusedIndicatorColor = WappTheme.colors.black25,
-            cursorColor = WappTheme.colors.yellow34,
+        cursorBrush = SolidColor(WappTheme.colors.yellow34),
+        visualTransformation = VisualTransformation.None,
+        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+        keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() }),
+        singleLine = singleline,
+        modifier = modifier.background(
+            color = WappTheme.colors.black25,
+            shape = RoundedCornerShape(10.dp),
         ),
-        placeholder = {
-            Text(
-                text = placeholder,
-                color = WappTheme.colors.gray82,
-                style = WappTheme.typography.contentMedium.copy(fontSize = 15.sp),
-            )
-        },
-        modifier = modifier,
-    )
+    ) { innerTextField ->
+        Box(modifier = Modifier.padding(vertical = 8.dp, horizontal = 12.dp)) {
+            if (value.isEmpty()) {
+                Text(
+                    text = placeholder,
+                    color = WappTheme.colors.gray82,
+                    textAlign = TextAlign.Center,
+                    style = WappTheme.typography.contentMedium,
+                    modifier = Modifier.align(align),
+                )
+            }
+
+            Box(modifier = Modifier.align(align)) {
+                innerTextField()
+            }
+        }
+    }
 }
diff --git a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt
index 93475723e..35ea7a060 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt
+++ b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt
@@ -1,9 +1,13 @@
 package com.wap.wapp.feature.management.event.edit
 
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
@@ -12,7 +16,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Divider
@@ -155,7 +161,9 @@ internal fun EventEditScreen(
     var showEndDatePicker by remember { mutableStateOf(false) }
     var showEndTimePicker by remember { mutableStateOf(false) }
     var showDeleteEventDialog by remember { mutableStateOf(false) }
-    val timePickerState = rememberTimePickerState()
+    val startTimePickerState = rememberTimePickerState()
+    val endTimePickerState = rememberTimePickerState()
+    val scrollState = rememberScrollState()
 
     Scaffold(
         snackbarHost = { SnackbarHost(snackBarHostState) },
@@ -163,7 +171,6 @@ internal fun EventEditScreen(
         modifier = Modifier.fillMaxSize(),
         contentWindowInsets = WindowInsets(0.dp),
     ) { paddingValues ->
-
         if (showDeleteEventDialog) {
             DeleteEventDialog(
                 deleteEvent = deleteEvent,
@@ -174,6 +181,8 @@ internal fun EventEditScreen(
         Column(
             modifier = Modifier
                 .fillMaxSize()
+                .verticalScroll(scrollState)
+                .height(IntrinsicSize.Max)
                 .padding(paddingValues)
                 .padding(vertical = 16.dp),
         ) {
@@ -200,6 +209,7 @@ internal fun EventEditScreen(
                 startTime = startTime,
                 endDate = endDate,
                 endTime = endTime,
+                scrollState = scrollState,
                 showStartDatePicker = showStartDatePicker,
                 showStartTimePicker = showStartTimePicker,
                 showEndDatePicker = showEndDatePicker,
@@ -207,7 +217,8 @@ internal fun EventEditScreen(
                 onTitleChanged = onTitleChanged,
                 onContentChanged = onContentChanged,
                 onLocationChanged = onLocationChanged,
-                timePickerState = timePickerState,
+                startTimePickerState = startTimePickerState,
+                endTimePickerState = endTimePickerState,
                 onStartDateChanged = onStartDateChanged,
                 onStartTimeChanged = onStartTimeChanged,
                 onEndDateChanged = onEndDateChanged,
@@ -260,13 +271,21 @@ private fun EventEditStateText(
 private fun EventEditStateProgressBar(
     currentRegistrationProgress: Float,
 ) {
+    val progress by animateFloatAsState(
+        targetValue = currentRegistrationProgress,
+        animationSpec = spring(
+            stiffness = Spring.StiffnessMediumLow,
+            dampingRatio = Spring.DampingRatioMediumBouncy,
+        ),
+    )
+
     LinearProgressIndicator(
         modifier = Modifier
             .fillMaxWidth()
             .height(10.dp),
         color = WappTheme.colors.yellow34,
         trackColor = WappTheme.colors.white,
-        progress = currentRegistrationProgress,
+        progress = progress,
         strokeCap = StrokeCap.Round,
     )
 }
@@ -287,7 +306,7 @@ private fun DeleteEventDialog(
             horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier
                 .wrapContentSize()
-                .padding(horizontal = 30.dp)
+                .padding(horizontal = 20.dp)
                 .clip(RoundedCornerShape(8.dp))
                 .background(WappTheme.colors.black25),
         ) {
@@ -307,7 +326,7 @@ private fun DeleteEventDialog(
                 text = generateDialogContentString(),
                 style = WappTheme.typography.contentRegular,
                 color = WappTheme.colors.white,
-                modifier = Modifier.padding(top = 12.dp, start = 12.dp, end = 12.dp),
+                modifier = Modifier.padding(horizontal = 12.dp),
             )
 
             Row(
@@ -361,7 +380,7 @@ private fun DeleteEventDialog(
 
 @Composable
 private fun generateDialogContentString() = buildAnnotatedString {
-    append("정말로 해당 일정을 삭제하시겠습니까?\n")
+    append("정말로 해당 일정을 삭제하시겠습니까?\n\n")
     withStyle(
         style = SpanStyle(
             textDecoration = TextDecoration.Underline,
diff --git a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt
index 46bf4550f..74ed8604a 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt
+++ b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt
@@ -104,6 +104,11 @@ class EventEditViewModel @Inject constructor(
             return
         }
 
+        if (!isValidEndTime(_eventEndTime.value)) {
+            emitValidationErrorMessage("일정 종료는 시작보다 늦어야 합니다.")
+            return
+        }
+
         viewModelScope.launch {
             updateEventUseCase(
                 eventTitle = _eventTitle.value,
@@ -130,8 +135,17 @@ class EventEditViewModel @Inject constructor(
         }
     }
 
-    private fun isValidEndTime(eventTime: LocalTime): Boolean =
-        _eventEndDate.value == _eventStartDate.value && eventTime > _eventStartTime.value
+    private fun isValidEndTime(eventTime: LocalTime): Boolean {
+        if (_eventEndDate.value > _eventStartDate.value) {
+            return true
+        }
+
+        if (_eventEndDate.value == _eventStartDate.value && eventTime > _eventStartTime.value) {
+            return true
+        }
+
+        return false
+    }
 
     private fun isValidEndDate(eventDate: LocalDate): Boolean = eventDate >= _eventStartDate.value
 
diff --git a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt
index 759a93fae..ba42dad11 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt
+++ b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt
@@ -1,16 +1,19 @@
 package com.wap.wapp.feature.management.event.registration
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.TimePickerState
@@ -18,18 +21,20 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappButton
+import com.wap.designsystem.modifier.addFocusCleaner
 import com.wap.wapp.core.commmon.util.DateUtil
+import com.wap.wapp.feature.management.event.R
 import com.wap.wapp.feature.management.event.component.DeadlineCard
 import com.wap.wapp.feature.management.event.component.RegistrationTextField
 import com.wap.wapp.feature.management.event.component.RegistrationTitle
 import com.wap.wapp.feature.management.event.component.WappDatePickerDialog
 import com.wap.wapp.feature.management.event.component.WappTimePickerDialog
-import com.wap.wapp.feature.management.event.R
 import kotlinx.coroutines.launch
 import java.time.LocalDate
 import java.time.LocalTime
@@ -50,7 +55,9 @@ internal fun EventRegistrationContent(
     showStartTimePicker: Boolean,
     showEndDatePicker: Boolean,
     showEndTimePicker: Boolean,
-    timePickerState: TimePickerState,
+    scrollState: ScrollState,
+    startTimePickerState: TimePickerState,
+    endTimePickerState: TimePickerState,
     onTitleChanged: (String) -> Unit,
     onContentChanged: (String) -> Unit,
     onLocationChanged: (String) -> Unit,
@@ -65,51 +72,64 @@ internal fun EventRegistrationContent(
     onNextButtonClicked: () -> Unit,
     onRegisterButtonClicked: () -> Unit,
 ) {
-    val scrollState = rememberScrollState()
     val coroutineScope = rememberCoroutineScope()
+    val focusManager = LocalFocusManager.current
 
     Column(
         modifier = modifier
             .fillMaxSize()
-            .verticalScroll(scrollState)
-            .height(IntrinsicSize.Max),
+            .addFocusCleaner(focusManager),
     ) {
-        when (eventRegistrationState) {
-            EventRegistrationState.EVENT_DETAILS -> EventDetailsContent(
-                eventTitle = eventTitle,
-                eventContent = eventContent,
-                onTitleChanged = onTitleChanged,
-                onContentChanged = onContentChanged,
-                onNextButtonClicked = {
-                    coroutineScope.launch {
-                        scrollState.scrollTo(0)
-                    }
-                    onNextButtonClicked()
-                },
-            )
+        AnimatedContent(
+            targetState = eventRegistrationState,
+            transitionSpec = {
+                if (targetState.ordinal > initialState.ordinal) {
+                    slideInHorizontally(initialOffsetX = { it }) + fadeIn() togetherWith
+                        slideOutHorizontally(targetOffsetX = { -it }) + fadeOut()
+                } else {
+                    slideInHorizontally(initialOffsetX = { -it }) + fadeIn() togetherWith
+                        slideOutHorizontally(targetOffsetX = { it }) + fadeOut()
+                }
+            },
+        ) { eventState ->
+            when (eventState) {
+                EventRegistrationState.EVENT_DETAILS -> EventDetailsContent(
+                    eventTitle = eventTitle,
+                    eventContent = eventContent,
+                    onTitleChanged = onTitleChanged,
+                    onContentChanged = onContentChanged,
+                    onNextButtonClicked = {
+                        coroutineScope.launch {
+                            scrollState.scrollTo(0)
+                        }
+                        onNextButtonClicked()
+                    },
+                )
 
-            EventRegistrationState.EVENT_SCHEDULE -> EventScheduleContent(
-                location = location,
-                startDate = startDate,
-                startTime = startTime,
-                endDate = endDate,
-                endTime = endTime,
-                timePickerState = timePickerState,
-                onLocationChanged = onLocationChanged,
-                onEndDateChanged = onEndDateChanged,
-                onEndTimeChanged = onEndTimeChanged,
-                onStartDateChanged = onStartDateChanged,
-                onStartTimeChanged = onStartTimeChanged,
-                showStartDatePicker = showStartDatePicker,
-                showStartTimePicker = showStartTimePicker,
-                showEndDatePicker = showEndDatePicker,
-                showEndTimePicker = showEndTimePicker,
-                onStartDatePickerStateChanged = onStartDatePickerStateChanged,
-                onStartTimePickerStateChanged = onStartTimePickerStateChanged,
-                onEndDatePickerStateChanged = onEndDatePickerStateChanged,
-                onEndTimePickerStateChanged = onEndTimePickerStateChanged,
-                onRegisterButtonClicked = onRegisterButtonClicked,
-            )
+                EventRegistrationState.EVENT_SCHEDULE -> EventScheduleContent(
+                    location = location,
+                    startDate = startDate,
+                    startTime = startTime,
+                    endDate = endDate,
+                    endTime = endTime,
+                    startTimePickerState = startTimePickerState,
+                    endTimePickerState = endTimePickerState,
+                    onLocationChanged = onLocationChanged,
+                    onEndDateChanged = onEndDateChanged,
+                    onEndTimeChanged = onEndTimeChanged,
+                    onStartDateChanged = onStartDateChanged,
+                    onStartTimeChanged = onStartTimeChanged,
+                    showStartDatePicker = showStartDatePicker,
+                    showStartTimePicker = showStartTimePicker,
+                    showEndDatePicker = showEndDatePicker,
+                    showEndTimePicker = showEndTimePicker,
+                    onStartDatePickerStateChanged = onStartDatePickerStateChanged,
+                    onStartTimePickerStateChanged = onStartTimePickerStateChanged,
+                    onEndDatePickerStateChanged = onEndDatePickerStateChanged,
+                    onEndTimePickerStateChanged = onEndTimePickerStateChanged,
+                    onRegisterButtonClicked = onRegisterButtonClicked,
+                )
+            }
         }
     }
 }
@@ -156,11 +176,11 @@ private fun EventDetailsContent(
             value = eventContent,
             onValueChange = onContentChanged,
             placeholder = stringResource(R.string.event_content_hint),
+            singleline = false,
             modifier = Modifier
                 .fillMaxWidth()
-                .height(200.dp),
+                .weight(1f),
         )
-        Spacer(modifier = Modifier.weight(1.0F))
 
         WappButton(
             onClick = onNextButtonClicked,
@@ -178,7 +198,8 @@ private fun EventScheduleContent(
     startTime: LocalTime,
     endDate: LocalDate,
     endTime: LocalTime,
-    timePickerState: TimePickerState,
+    startTimePickerState: TimePickerState,
+    endTimePickerState: TimePickerState,
     showStartDatePicker: Boolean,
     showStartTimePicker: Boolean,
     showEndDatePicker: Boolean,
@@ -204,7 +225,7 @@ private fun EventScheduleContent(
 
     if (showEndTimePicker) {
         WappTimePickerDialog(
-            state = timePickerState,
+            state = endTimePickerState,
             onDismissRequest = { onEndTimePickerStateChanged(false) },
             onConfirmButtonClicked = { localTime ->
                 onEndTimeChanged(localTime)
@@ -226,7 +247,7 @@ private fun EventScheduleContent(
 
     if (showStartTimePicker) {
         WappTimePickerDialog(
-            state = timePickerState,
+            state = startTimePickerState,
             onDismissRequest = { onStartTimePickerStateChanged(false) },
             onConfirmButtonClicked = { localTime ->
                 onStartTimeChanged(localTime)
@@ -237,80 +258,80 @@ private fun EventScheduleContent(
             },
         )
     }
+    Column {
+        RegistrationTitle(
+            title = stringResource(id = R.string.event_schedule_title),
+            content = stringResource(id = R.string.event_schedule_content),
+        )
 
-    RegistrationTitle(
-        title = stringResource(id = R.string.event_schedule_title),
-        content = stringResource(id = R.string.event_schedule_content),
-    )
-
-    Column(
-        verticalArrangement = Arrangement.spacedBy(10.dp),
-        modifier = Modifier.padding(top = 40.dp),
-    ) {
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .padding(top = 40.dp)
-                .fillMaxWidth(),
+        Column(
+            verticalArrangement = Arrangement.spacedBy(10.dp),
+            modifier = Modifier.padding(top = 40.dp),
         ) {
-            Text(
-                text = stringResource(R.string.event_location),
-                style = WappTheme.typography.titleBold,
-                color = WappTheme.colors.white,
-                textAlign = TextAlign.Start,
-                modifier = Modifier.weight(2f),
-            )
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxWidth(),
+            ) {
+                Text(
+                    text = stringResource(R.string.event_location),
+                    style = WappTheme.typography.titleBold,
+                    color = WappTheme.colors.white,
+                    textAlign = TextAlign.Start,
+                    modifier = Modifier.weight(2f),
+                )
 
-            RegistrationTextField(
-                value = location,
-                onValueChange = onLocationChanged,
-                placeholder = stringResource(R.string.event_location_hint),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.weight(3f),
-            )
-        }
+                RegistrationTextField(
+                    value = location,
+                    onValueChange = onLocationChanged,
+                    placeholder = stringResource(R.string.event_location_hint),
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.weight(3f),
+                    align = Alignment.Center,
+                )
+            }
 
-        DeadlineCard(
-            title = stringResource(R.string.start_date),
-            hint = startDate.format(DateUtil.yyyyMMddFormatter),
-            onCardClicked = {
-                onStartDatePickerStateChanged(true)
-            },
-            modifier = Modifier.padding(top = 20.dp),
-        )
+            DeadlineCard(
+                title = stringResource(R.string.start_date),
+                hint = startDate.format(DateUtil.yyyyMMddFormatter),
+                onCardClicked = {
+                    onStartDatePickerStateChanged(true)
+                },
+                modifier = Modifier.padding(top = 20.dp),
+            )
 
-        DeadlineCard(
-            title = stringResource(R.string.start_time),
-            hint = startTime.format(DateUtil.HHmmFormatter),
-            onCardClicked = {
-                onStartTimePickerStateChanged(true)
-            },
-            modifier = Modifier.padding(top = 20.dp),
-        )
+            DeadlineCard(
+                title = stringResource(R.string.start_time),
+                hint = startTime.format(DateUtil.HHmmFormatter),
+                onCardClicked = {
+                    onStartTimePickerStateChanged(true)
+                },
+                modifier = Modifier.padding(top = 20.dp),
+            )
 
-        DeadlineCard(
-            title = stringResource(R.string.end_date),
-            hint = endDate.format(DateUtil.yyyyMMddFormatter),
-            onCardClicked = {
-                onEndDatePickerStateChanged(true)
-            },
-            modifier = Modifier.padding(top = 20.dp),
-        )
+            DeadlineCard(
+                title = stringResource(R.string.end_date),
+                hint = endDate.format(DateUtil.yyyyMMddFormatter),
+                onCardClicked = {
+                    onEndDatePickerStateChanged(true)
+                },
+                modifier = Modifier.padding(top = 20.dp),
+            )
 
-        DeadlineCard(
-            title = stringResource(R.string.end_time),
-            hint = endTime.format(DateUtil.HHmmFormatter),
-            onCardClicked = {
-                onEndTimePickerStateChanged(true)
-            },
-            modifier = Modifier.padding(top = 20.dp),
-        )
+            DeadlineCard(
+                title = stringResource(R.string.end_time),
+                hint = endTime.format(DateUtil.HHmmFormatter),
+                onCardClicked = {
+                    onEndTimePickerStateChanged(true)
+                },
+                modifier = Modifier.padding(top = 20.dp),
+            )
 
-        Spacer(modifier = Modifier.weight(1f))
+            Spacer(modifier = Modifier.weight(1f))
 
-        WappButton(
-            onClick = onRegisterButtonClicked,
-            textRes = R.string.register_event,
-        )
+            WappButton(
+                onClick = onRegisterButtonClicked,
+                textRes = R.string.register_event,
+            )
+        }
     }
 }
diff --git a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt
index 16a53c441..b21397f9a 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt
+++ b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationScreen.kt
@@ -1,13 +1,19 @@
 package com.wap.wapp.feature.management.event.registration
 
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Scaffold
@@ -65,17 +71,13 @@ internal fun EventRegistrationRoute(
     LaunchedEffect(true) {
         viewModel.eventRegistrationEvent.collectLatest {
             when (it) {
-                is EventRegistrationEvent.Failure -> {
+                is EventRegistrationEvent.Failure ->
                     snackBarHostState.showSnackbar(it.error.toSupportingText())
-                }
 
-                is EventRegistrationEvent.ValidationError -> {
+                is EventRegistrationEvent.ValidationError ->
                     snackBarHostState.showSnackbar(it.message)
-                }
 
-                is EventRegistrationEvent.Success -> {
-                    navigateToManagement()
-                }
+                is EventRegistrationEvent.Success -> navigateToManagement()
             }
         }
     }
@@ -130,7 +132,9 @@ internal fun EventRegistrationScreen(
     var showStartTimePicker by remember { mutableStateOf(false) }
     var showEndDatePicker by remember { mutableStateOf(false) }
     var showEndTimePicker by remember { mutableStateOf(false) }
-    val timePickerState = rememberTimePickerState()
+    val startTimePickerState = rememberTimePickerState()
+    val endTimePickerState = rememberTimePickerState()
+    val scrollState = rememberScrollState()
 
     Scaffold(
         snackbarHost = { SnackbarHost(snackBarHostState) },
@@ -142,6 +146,8 @@ internal fun EventRegistrationScreen(
         Column(
             modifier = Modifier
                 .fillMaxSize()
+                .verticalScroll(scrollState)
+                .height(IntrinsicSize.Max)
                 .padding(paddingValues) // paddingValue padding
                 .padding(top = 20.dp), // dp value padding
         ) {
@@ -159,12 +165,7 @@ internal fun EventRegistrationScreen(
             EventRegistrationContent(
                 eventRegistrationState = currentRegistrationState,
                 modifier = Modifier
-                    .padding(
-                        top = 50.dp,
-                        start = 20.dp,
-                        end = 20.dp,
-                        bottom = 20.dp,
-                    ),
+                    .padding(top = 50.dp, start = 20.dp, end = 20.dp, bottom = 20.dp),
                 eventTitle = title,
                 eventContent = content,
                 location = location,
@@ -172,6 +173,7 @@ internal fun EventRegistrationScreen(
                 startTime = startTime,
                 endDate = endDate,
                 endTime = endTime,
+                scrollState = scrollState,
                 showStartDatePicker = showStartDatePicker,
                 showStartTimePicker = showStartTimePicker,
                 showEndDatePicker = showEndDatePicker,
@@ -179,7 +181,8 @@ internal fun EventRegistrationScreen(
                 onTitleChanged = onTitleChanged,
                 onContentChanged = onContentChanged,
                 onLocationChanged = onLocationChanged,
-                timePickerState = timePickerState,
+                startTimePickerState = startTimePickerState,
+                endTimePickerState = endTimePickerState,
                 onStartDateChanged = onStartDateChanged,
                 onStartTimeChanged = onStartTimeChanged,
                 onEndDateChanged = onEndDateChanged,
@@ -232,13 +235,21 @@ private fun EventRegistrationStateText(
 private fun EventRegistrationStateProgressBar(
     currentRegistrationProgress: Float,
 ) {
+    val progress by animateFloatAsState(
+        targetValue = currentRegistrationProgress,
+        animationSpec = spring(
+            stiffness = Spring.StiffnessMediumLow,
+            dampingRatio = Spring.DampingRatioMediumBouncy,
+        ),
+    )
+
     LinearProgressIndicator(
         modifier = Modifier
             .fillMaxWidth()
             .height(10.dp),
         color = WappTheme.colors.yellow34,
         trackColor = WappTheme.colors.white,
-        progress = currentRegistrationProgress,
+        progress = progress,
         strokeCap = StrokeCap.Round,
     )
 }
diff --git a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt
index 2f0217dbb..72972ad7e 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt
+++ b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt
@@ -62,7 +62,7 @@ class EventRegistrationViewModel @Inject constructor(
 
     fun setEventStartDate(eventDate: LocalDate) {
         if (!isValidStartDate(eventDate)) {
-            emitValidationErrorMessage("최소 하루 이상 일정 날짜를 지정하세요.")
+            emitValidationErrorMessage("최소 하루 이상 일정 날짜를 지정 하세요.")
             return
         }
         _eventStartDate.value = eventDate
@@ -89,11 +89,11 @@ class EventRegistrationViewModel @Inject constructor(
     fun setEventRegistrationState() {
         if (_currentRegistrationState.value == EVENT_DETAILS) {
             if (!isValidTitle()) {
-                emitValidationErrorMessage("행사 이름을 입력하세요.")
+                emitValidationErrorMessage("행사 이름을 입력 하세요.")
                 return
             }
             if (!isValidContent()) {
-                emitValidationErrorMessage("행사 내용을 입력하세요.")
+                emitValidationErrorMessage("행사 내용을 입력 하세요.")
                 return
             }
             _currentRegistrationState.value = EVENT_SCHEDULE
@@ -102,9 +102,15 @@ class EventRegistrationViewModel @Inject constructor(
 
     fun registerEvent() {
         if (!isValidLocation()) {
-            emitValidationErrorMessage("장소를 입력하세요.")
+            emitValidationErrorMessage("장소를 입력 하세요.")
             return
         }
+
+        if (!isValidEndTime(_eventEndTime.value)) {
+            emitValidationErrorMessage("일정 종료는 시작보다 늦어야 합니다.")
+            return
+        }
+
         viewModelScope.launch {
             postEventUseCase(
                 eventTitle = _eventTitle.value,
@@ -122,8 +128,15 @@ class EventRegistrationViewModel @Inject constructor(
         }
     }
 
-    private fun isValidEndTime(eventTime: LocalTime): Boolean =
-        _eventEndDate.value == _eventStartDate.value && eventTime > _eventStartTime.value
+    private fun isValidEndTime(eventTime: LocalTime): Boolean {
+        if (_eventEndDate.value > _eventStartDate.value) {
+            return true
+        }
+        if (_eventEndDate.value == _eventStartDate.value && eventTime > _eventStartTime.value) {
+            return true
+        }
+        return false
+    }
 
     private fun isValidEndDate(eventDate: LocalDate): Boolean = eventDate >= _eventStartDate.value
 
diff --git a/feature/management-event/src/main/res/values/strings.xml b/feature/management-event/src/main/res/values/strings.xml
index 86e3d685e..27ba1196e 100644
--- a/feature/management-event/src/main/res/values/strings.xml
+++ b/feature/management-event/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="event_location">장소</string>
     <string name="event_date">날짜</string>
     <string name="event_time">시간</string>
-    <string name="event_location_hint">어디에서 진행되는 일정인가요?</string>
+    <string name="event_location_hint">장소를 입력하세요.</string>
     <string name="start_date">시작 날짜</string>
     <string name="start_time">시작 시간</string>
     <string name="end_date">종료 날짜</string>
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyDeadlineContent.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyDeadlineContent.kt
index 89bb23cc9..3ab0a169a 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyDeadlineContent.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyDeadlineContent.kt
@@ -8,7 +8,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -66,9 +68,13 @@ internal fun SurveyDeadlineContent(
         )
     }
 
+    val scrollState = rememberScrollState()
+
     Column(
-        modifier = Modifier.fillMaxSize(),
         verticalArrangement = Arrangement.spacedBy(20.dp),
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(scrollState),
     ) {
         WappTitle(
             title = stringResource(R.string.survey_deadline_title),
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyEventContent.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyEventContent.kt
index db8409d30..070bbf850 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyEventContent.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyEventContent.kt
@@ -38,7 +38,9 @@ internal fun SurveyEventContent(
 
         LazyColumn(
             verticalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.weight(1f),
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f),
         ) {
             when (eventsState) {
                 is EventsState.Loading -> item {
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt
index ce2a49fc1..f9498a286 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormContent.kt
@@ -1,5 +1,11 @@
 package com.wap.wapp.feature.management.survey
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TimePickerState
 import androidx.compose.runtime.Composable
@@ -42,81 +48,92 @@ internal fun SurveyFormContent(
     onAddQuestionButtonClicked: () -> Unit,
     onRegisterButtonClicked: () -> Unit,
 ) {
-    when (surveyRegistrationState) {
-        SurveyFormState.EVENT_SELECTION -> {
-            onEventContentInitialized()
-            SurveyEventContent(
-                eventsState = eventsState,
-                selectedEvent = eventSelection,
-                onEventSelected = onEventSelected,
-                onNextButtonClicked = {
-                    onNextButtonClicked(
-                        SurveyFormState.EVENT_SELECTION,
-                        SurveyFormState.INFORMATION,
-                    )
-                },
-            )
-        }
+    AnimatedContent(
+        targetState = surveyRegistrationState,
+        transitionSpec = {
+            if (targetState.ordinal > initialState.ordinal) {
+                slideInHorizontally(initialOffsetX = { it }) + fadeIn() togetherWith
+                    slideOutHorizontally(targetOffsetX = { -it }) + fadeOut()
+            } else {
+                slideInHorizontally(initialOffsetX = { -it }) + fadeIn() togetherWith
+                    slideOutHorizontally(targetOffsetX = { it }) + fadeOut()
+            }
+        },
+    ) { registrationState ->
+        when (registrationState) {
+            SurveyFormState.EVENT_SELECTION -> {
+                onEventContentInitialized()
+                SurveyEventContent(
+                    eventsState = eventsState,
+                    selectedEvent = eventSelection,
+                    onEventSelected = onEventSelected,
+                    onNextButtonClicked = {
+                        onNextButtonClicked(
+                            SurveyFormState.EVENT_SELECTION,
+                            SurveyFormState.INFORMATION,
+                        )
+                    },
+                )
+            }
 
-        SurveyFormState.INFORMATION -> {
-            SurveyInformationContent(
-                title = title,
-                onTitleChanged = onTitleChanged,
-                content = content,
-                onContentChanged = onContentChanged,
-                onPreviousButtonClicked = {
-                    onPreviousButtonClicked(SurveyFormState.EVENT_SELECTION)
-                },
-                onNextButtonClicked = {
-                    onNextButtonClicked(
-                        SurveyFormState.INFORMATION,
-                        SurveyFormState.QUESTION,
-                    )
-                },
-            )
-        }
+            SurveyFormState.INFORMATION -> {
+                SurveyInformationContent(
+                    title = title,
+                    onTitleChanged = onTitleChanged,
+                    content = content,
+                    onContentChanged = onContentChanged,
+                    onPreviousButtonClicked = {
+                        onPreviousButtonClicked(SurveyFormState.EVENT_SELECTION)
+                    },
+                    onNextButtonClicked = {
+                        onNextButtonClicked(
+                            SurveyFormState.INFORMATION,
+                            SurveyFormState.QUESTION,
+                        )
+                    },
+                )
+            }
 
-        SurveyFormState.QUESTION -> {
-            SurveyQuestionContent(
-                questionTitle = questionTitle,
-                questionType = questionType,
-                onQuestionTypeChanged = { defaultQuestionType ->
-                    onQuestionTypeChanged(defaultQuestionType)
-                },
-                onQuestionChanged = onQuestionTitleChanged,
-                onAddSurveyQuestionButtonClicked = onAddQuestionButtonClicked,
-                currentQuestionNumber = currentQuestionNumber,
-                totalQuestionNumber = totalQuestionNumber,
-                onPreviousButtonClicked = {
-                    onPreviousButtonClicked(SurveyFormState.INFORMATION)
-                },
-                onNextButtonClicked = {
-                    onNextButtonClicked(
-                        SurveyFormState.QUESTION,
-                        SurveyFormState.DEADLINE,
-                    )
-                },
-                onPreviousQuestionButtonClicked = onPreviousQuestionButtonClicked,
-                onNextQuestionButtonClicked = onNextQuestionButtonClicked,
-            )
-        }
+            SurveyFormState.QUESTION -> {
+                SurveyQuestionContent(
+                    questionTitle = questionTitle,
+                    questionType = questionType,
+                    onQuestionTypeChanged = { defaultQuestionType ->
+                        onQuestionTypeChanged(defaultQuestionType)
+                    },
+                    onQuestionChanged = onQuestionTitleChanged,
+                    onAddSurveyQuestionButtonClicked = onAddQuestionButtonClicked,
+                    currentQuestionNumber = currentQuestionNumber,
+                    totalQuestionNumber = totalQuestionNumber,
+                    onPreviousButtonClicked = {
+                        onPreviousButtonClicked(SurveyFormState.INFORMATION)
+                    },
+                    onNextButtonClicked = {
+                        onNextButtonClicked(
+                            SurveyFormState.QUESTION,
+                            SurveyFormState.DEADLINE,
+                        )
+                    },
+                    onPreviousQuestionButtonClicked = onPreviousQuestionButtonClicked,
+                    onNextQuestionButtonClicked = onNextQuestionButtonClicked,
+                )
+            }
 
-        SurveyFormState.DEADLINE -> {
-            SurveyDeadlineContent(
-                timeDeadline = timeDeadline,
-                dateDeadline = dateDeadline,
-                timePickerState = timePickerState,
-                showDatePicker = showDatePicker,
-                showTimePicker = showTimePicker,
-                onDateChanged = onDateChanged,
-                onTimePickerStateChanged = onTimePickerStateChanged,
-                onTimeChanged = onTimeChanged,
-                onRegisterButtonClicked = onRegisterButtonClicked,
-                onDatePickerStateChanged = onDatePickerStateChanged,
-                onPreviousButtonClicked = {
-                    onPreviousButtonClicked(SurveyFormState.QUESTION)
-                },
-            )
+            SurveyFormState.DEADLINE -> {
+                SurveyDeadlineContent(
+                    timeDeadline = timeDeadline,
+                    dateDeadline = dateDeadline,
+                    timePickerState = timePickerState,
+                    showDatePicker = showDatePicker,
+                    showTimePicker = showTimePicker,
+                    onDateChanged = onDateChanged,
+                    onTimePickerStateChanged = onTimePickerStateChanged,
+                    onTimeChanged = onTimeChanged,
+                    onRegisterButtonClicked = onRegisterButtonClicked,
+                    onDatePickerStateChanged = onDatePickerStateChanged,
+                    onPreviousButtonClicked = { onPreviousButtonClicked(SurveyFormState.QUESTION) },
+                )
+            }
         }
     }
 }
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormStateIndicator.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormStateIndicator.kt
index 48696ba9c..1ebd8d6d0 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormStateIndicator.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyFormStateIndicator.kt
@@ -1,5 +1,8 @@
 package com.wap.wapp.feature.management.survey
 
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -8,6 +11,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
@@ -52,13 +56,21 @@ private fun SurveyRegistrationStateText(
 private fun SurveyRegistrationStateProgressBar(
     currentRegistrationProgress: Float,
 ) {
+    val progress by animateFloatAsState(
+        targetValue = currentRegistrationProgress,
+        animationSpec = spring(
+            stiffness = Spring.StiffnessMediumLow,
+            dampingRatio = Spring.DampingRatioMediumBouncy,
+        ),
+    )
+
     LinearProgressIndicator(
         modifier = Modifier
             .fillMaxWidth()
             .height(10.dp),
         color = WappTheme.colors.yellow34,
         trackColor = WappTheme.colors.white,
-        progress = currentRegistrationProgress,
+        progress = progress,
         strokeCap = StrokeCap.Round,
     )
 }
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyInformationContent.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyInformationContent.kt
index ba91f118d..e51cb3b32 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyInformationContent.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyInformationContent.kt
@@ -3,10 +3,8 @@ package com.wap.wapp.feature.management.survey
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -69,13 +67,12 @@ internal fun SurveyInformationContent(
             placeholder = R.string.survey_introduce_hint,
             modifier = Modifier
                 .fillMaxWidth()
-                .height(200.dp),
+                .weight(1f),
         )
 
-        Spacer(modifier = Modifier.weight(1f))
-
         Row(
             horizontalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.padding(top = 4.dp),
         ) {
             WappButton(
                 textRes = R.string.previous,
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt
index 1b1f6adf5..076036df9 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyQuestionContent.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
-import com.wap.wapp.core.designresource.R.drawable
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappButton
 import com.wap.designsystem.component.WappRoundedTextField
 import com.wap.designsystem.component.WappTitle
+import com.wap.wapp.core.designresource.R.drawable
 import com.wap.wapp.core.model.survey.QuestionType
 
 @Composable
diff --git a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/edit/SurveyFormEditScreen.kt b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/edit/SurveyFormEditScreen.kt
index 04f812d60..fcbb07e05 100644
--- a/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/edit/SurveyFormEditScreen.kt
+++ b/feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/edit/SurveyFormEditScreen.kt
@@ -17,11 +17,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappSubTopBar
+import com.wap.designsystem.modifier.addFocusCleaner
 import com.wap.wapp.core.commmon.extensions.toSupportingText
 import com.wap.wapp.core.designresource.R.drawable
 import com.wap.wapp.feature.management.survey.R
@@ -55,8 +57,8 @@ internal fun SurveyFormEditScreen(
     val timePickerState = rememberTimePickerState()
     var showDatePicker by remember { mutableStateOf(false) }
     var showTimePicker by remember { mutableStateOf(false) }
-
     var showDeleteSurveyDialog by remember { mutableStateOf(false) }
+    val focusManager = LocalFocusManager.current
 
     LaunchedEffect(true) {
         viewModel.getSurveyForm(surveyFormId)
@@ -81,8 +83,6 @@ internal fun SurveyFormEditScreen(
     Scaffold(
         snackbarHost = { SnackbarHost(snackBarHostState) },
         containerColor = WappTheme.colors.backgroundBlack,
-        modifier = Modifier.fillMaxSize(),
-        contentWindowInsets = WindowInsets(0.dp),
         topBar = {
             WappSubTopBar(
                 titleRes = R.string.survey_edit,
@@ -94,10 +94,13 @@ internal fun SurveyFormEditScreen(
                 onClickRightButton = { showDeleteSurveyDialog = true },
             )
         },
+        modifier = Modifier.fillMaxSize(),
+        contentWindowInsets = WindowInsets(0.dp),
     ) { paddingValues ->
         Column(
             modifier = Modifier
                 .fillMaxSize()
+                .addFocusCleaner(focusManager)
                 .padding(paddingValues) // paddingValue padding
                 .padding(vertical = 16.dp, horizontal = 20.dp), // dp value padding
             verticalArrangement = Arrangement.spacedBy(20.dp),
@@ -109,9 +112,7 @@ internal fun SurveyFormEditScreen(
                 )
             }
 
-            SurveyFormStateIndicator(
-                surveyRegistrationState = currentRegistrationState,
-            )
+            SurveyFormStateIndicator(surveyRegistrationState = currentRegistrationState)
 
             SurveyFormContent(
                 surveyRegistrationState = currentRegistrationState,
diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementEventCard.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementEventCard.kt
index 3e0f89ad1..565ff8ba7 100644
--- a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementEventCard.kt
+++ b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementEventCard.kt
@@ -69,7 +69,6 @@ private fun ManagementEventContent(
     onAddEventButtonClicked: () -> Unit,
 ) {
     when (eventsState) {
-        is ManagementViewModel.EventsState.Init -> {}
         is ManagementViewModel.EventsState.Loading -> CircleLoader(
             modifier = Modifier
                 .fillMaxWidth()
diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt
index 23202bcf8..462291d24 100644
--- a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt
+++ b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt
@@ -101,15 +101,14 @@ internal fun ManagementScreen(
         containerColor = WappTheme.colors.backgroundBlack,
         snackbarHost = { SnackbarHost(snackBarHostState) },
         contentWindowInsets = WindowInsets(0.dp),
-        topBar = {
-            WappLeftMainTopBar(
-                titleRes = R.string.management,
-                contentRes = R.string.management_content,
-            )
-        },
     ) { paddingValues ->
         LazyColumn(modifier = Modifier.padding(paddingValues)) {
             item {
+                WappLeftMainTopBar(
+                    titleRes = R.string.management,
+                    contentRes = R.string.management_content,
+                )
+
                 ManagementEventCard(
                     eventsState = eventsState,
                     onCardClicked = navigateToEventEdit,
diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementSurveyCard.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementSurveyCard.kt
index 89deda343..60f279819 100644
--- a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementSurveyCard.kt
+++ b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementSurveyCard.kt
@@ -40,16 +40,16 @@ internal fun ManagementSurveyCard(
 ) {
     Card(
         shape = RoundedCornerShape(10.dp),
-        colors = CardDefaults.cardColors(
-            containerColor = WappTheme.colors.black25,
-        ),
+        colors = CardDefaults.cardColors(containerColor = WappTheme.colors.black25),
         modifier = Modifier
             .padding(vertical = 20.dp)
             .padding(horizontal = 8.dp),
     ) {
         Column(
             verticalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.padding(16.dp),
+            modifier = Modifier
+                .padding(16.dp)
+                .fillMaxWidth(),
         ) {
             Text(
                 text = stringResource(string.survey),
@@ -73,7 +73,6 @@ private fun ManagementSurveyContent(
     onAddSurveyButtonClicked: () -> Unit,
 ) {
     when (surveyFormsState) {
-        is ManagementViewModel.SurveyFormsState.Init -> { }
         is ManagementViewModel.SurveyFormsState.Loading -> CircleLoader(
             modifier = Modifier
                 .fillMaxWidth()
diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt
index 30f884851..96daae7ab 100644
--- a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt
+++ b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt
@@ -33,10 +33,10 @@ class ManagementViewModel @Inject constructor(
     val userRole: StateFlow<UserRoleUiState> = _userRole.asStateFlow()
 
     private val _surveyFormList: MutableStateFlow<SurveyFormsState> =
-        MutableStateFlow(SurveyFormsState.Init)
+        MutableStateFlow(SurveyFormsState.Loading)
     val surveyFormList: StateFlow<SurveyFormsState> = _surveyFormList.asStateFlow()
 
-    private val _eventList: MutableStateFlow<EventsState> = MutableStateFlow(EventsState.Init)
+    private val _eventList: MutableStateFlow<EventsState> = MutableStateFlow(EventsState.Loading)
     val eventList: StateFlow<EventsState> = _eventList.asStateFlow()
 
     fun getUserRole() = viewModelScope.launch {
@@ -50,13 +50,12 @@ class ManagementViewModel @Inject constructor(
     }
 
     fun getEventSurveyList() = viewModelScope.launch {
-        launch { getMonthEventList() }
+        getMonthEventList()
         getSurveyFormList()
     }
 
     private suspend fun getMonthEventList() {
         _eventList.value = EventsState.Loading
-
         getMonthEventListUseCase(generateNowDate()).onSuccess { events ->
             _eventList.value = EventsState.Success(events)
         }.onFailure { exception ->
@@ -67,7 +66,6 @@ class ManagementViewModel @Inject constructor(
 
     private suspend fun getSurveyFormList() {
         _surveyFormList.value = SurveyFormsState.Loading
-
         getSurveyFormListUseCase().onSuccess { surveyForms ->
             _surveyFormList.value = SurveyFormsState.Success(surveyForms)
         }.onFailure { exception ->
@@ -82,14 +80,12 @@ class ManagementViewModel @Inject constructor(
     }
 
     sealed class EventsState {
-        data object Init : EventsState()
         data object Loading : EventsState()
         data class Success(val events: List<Event>) : EventsState()
         data class Failure(val throwable: Throwable) : EventsState()
     }
 
     sealed class SurveyFormsState {
-        data object Init : SurveyFormsState()
         data object Loading : SurveyFormsState()
         data class Success(val surveyForms: List<SurveyForm>) : SurveyFormsState()
         data class Failure(val throwable: Throwable) : SurveyFormsState()
diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/validation/ManagementValidationScreen.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/validation/ManagementValidationScreen.kt
index 878051804..7184b20a9 100644
--- a/feature/management/src/main/java/com/wap/wapp/feature/management/validation/ManagementValidationScreen.kt
+++ b/feature/management/src/main/java/com/wap/wapp/feature/management/validation/ManagementValidationScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -23,6 +24,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappButton
 import com.wap.designsystem.component.WappTextField
+import com.wap.designsystem.modifier.addFocusCleaner
 import com.wap.wapp.core.commmon.extensions.toSupportingText
 import com.wap.wapp.feature.management.R
 import kotlinx.coroutines.flow.collectLatest
@@ -36,6 +38,7 @@ fun ManagementValidationScreen(
     val isError by viewModel.isError.collectAsStateWithLifecycle()
     val errorSupportingText by viewModel.errorSupportingText.collectAsStateWithLifecycle()
     val snackBarHostState = remember { SnackbarHostState() }
+    val focusManager = LocalFocusManager.current
 
     LaunchedEffect(true) {
         viewModel.managementCodeUiState.collectLatest {
@@ -56,11 +59,12 @@ fun ManagementValidationScreen(
         snackbarHost = { SnackbarHost(snackBarHostState) },
     ) { paddingValues ->
         Column(
-            modifier = Modifier
-                .padding(paddingValues)
-                .fillMaxSize(),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxSize()
+                .addFocusCleaner(focusManager),
         ) {
             Text(
                 text = stringResource(R.string.management_dialog_title),
diff --git a/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt b/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt
index b2a33ae3f..026b044b0 100644
--- a/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt
+++ b/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt
@@ -4,6 +4,7 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
@@ -24,6 +25,11 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetState
 import androidx.compose.material3.SheetValue
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -132,7 +138,17 @@ private fun EventItem(
     bottomSheetState: SheetState,
     event: Event,
 ) {
-    Column(modifier = Modifier.animateContentSize()) {
+    var eventItemToggle by remember { mutableStateOf(false) }
+
+    LaunchedEffect(bottomSheetState.currentValue) {
+        eventItemToggle = bottomSheetState.currentValue == SheetValue.Expanded
+    }
+
+    Column(
+        modifier = Modifier
+            .animateContentSize()
+            .clickable { eventItemToggle = !eventItemToggle },
+    ) {
         Row(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
             verticalAlignment = Alignment.CenterVertically,
@@ -164,7 +180,7 @@ private fun EventItem(
                     color = WappTheme.colors.white,
                 )
 
-                AnimatedVisibility(bottomSheetState.currentValue == SheetValue.Expanded) {
+                AnimatedVisibility(eventItemToggle) {
                     Column(horizontalAlignment = Alignment.Start) {
                         Text(
                             text = event.location,
diff --git a/feature/notice/src/main/java/com/wap/wapp/feature/notice/Calendar.kt b/feature/notice/src/main/java/com/wap/wapp/feature/notice/Calendar.kt
index 9e4104236..d4b3e894e 100644
--- a/feature/notice/src/main/java/com/wap/wapp/feature/notice/Calendar.kt
+++ b/feature/notice/src/main/java/com/wap/wapp/feature/notice/Calendar.kt
@@ -215,7 +215,6 @@ private fun CalendarMonthItem(
         val thisMonthFirstDayOfWeek = selectedDate.withDayOfMonth(1).dayOfWeek
         val thisMonthDaysToShow: List<Int> = (1..thisMonthLastDate).toList()
         items(thisMonthDaysToShow) { day ->
-            val date = selectedDate.withDayOfMonth(day)
             val currentLocalDate = LocalDate.of(
                 selectedDate.year,
                 selectedDate.month,
@@ -225,7 +224,7 @@ private fun CalendarMonthItem(
             val isEvent = (currentLocalDate in eventDates)
             val isSelected = (day == selectedDate.dayOfMonth)
             CalendarDayText(
-                text = com.wap.wapp.core.commmon.util.DateUtil.ddFormatter.format(date),
+                text = day.toString(),
                 color = getDayColor(day + thisMonthFirstDayOfWeek.value),
                 isEvent = isEvent,
                 isSelected = isSelected,
diff --git a/feature/profile/src/main/java/com/wap/wapp/feature/profile/profilesetting/component/ProfileSettingDialog.kt b/feature/profile/src/main/java/com/wap/wapp/feature/profile/profilesetting/component/ProfileSettingDialog.kt
index 0796aa7a9..c0e6bd3d0 100644
--- a/feature/profile/src/main/java/com/wap/wapp/feature/profile/profilesetting/component/ProfileSettingDialog.kt
+++ b/feature/profile/src/main/java/com/wap/wapp/feature/profile/profilesetting/component/ProfileSettingDialog.kt
@@ -7,8 +7,9 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -46,8 +47,9 @@ internal fun ProfileSettingDialog(
             verticalArrangement = Arrangement.spacedBy(16.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier
-                .wrapContentSize()
-                .padding(horizontal = 30.dp)
+                .wrapContentHeight()
+                .fillMaxWidth()
+                .padding(horizontal = 20.dp)
                 .clip(RoundedCornerShape(8.dp))
                 .background(WappTheme.colors.black25),
         ) {
diff --git a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyCheckScreen.kt b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyCheckScreen.kt
index a2a313c72..e67338fee 100644
--- a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyCheckScreen.kt
+++ b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyCheckScreen.kt
@@ -18,7 +18,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.CircleLoader
-import com.wap.designsystem.component.WappLeftMainTopBar
+import com.wap.designsystem.component.WappRightMainTopBar
 import com.wap.wapp.core.commmon.extensions.toSupportingText
 import kotlinx.coroutines.flow.collectLatest
 
@@ -26,6 +26,7 @@ import kotlinx.coroutines.flow.collectLatest
 internal fun SurveyCheckScreen(
     viewModel: SurveyCheckViewModel = hiltViewModel(),
     navigateToSurveyDetail: (String) -> Unit,
+    navigateToSurvey: () -> Unit,
 ) {
     val surveyListUiState = viewModel.surveyListUiState.collectAsStateWithLifecycle().value
     val snackBarHostState = remember { SnackbarHostState() }
@@ -41,9 +42,11 @@ internal fun SurveyCheckScreen(
         containerColor = WappTheme.colors.backgroundBlack,
         snackbarHost = { SnackbarHost(snackBarHostState) },
         topBar = {
-            WappLeftMainTopBar(
+            WappRightMainTopBar(
                 titleRes = R.string.survey_check,
                 contentRes = R.string.survey_check_content,
+                showBackButton = true,
+                onClickBackButton = navigateToSurvey,
             )
         },
         contentWindowInsets = WindowInsets(0.dp),
@@ -55,10 +58,10 @@ internal fun SurveyCheckScreen(
 
             is SurveyCheckViewModel.SurveyListUiState.Success -> {
                 LazyColumn(
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                    verticalArrangement = Arrangement.spacedBy(20.dp),
                     modifier = Modifier
                         .fillMaxSize()
-                        .padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
+                        .padding(start = 16.dp, end = 16.dp, bottom = 16.dp, top = 20.dp)
                         .padding(paddingValues),
                 ) {
                     val surveyList = surveyListUiState.surveyList
diff --git a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyItemCard.kt b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyItemCard.kt
index e958b9a05..8853e0b95 100644
--- a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyItemCard.kt
+++ b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyItemCard.kt
@@ -30,7 +30,7 @@ internal fun SurveyItemCard(
     ) {
         Column(
             verticalArrangement = Arrangement.spacedBy(16.dp),
-            modifier = Modifier.padding(16.dp),
+            modifier = Modifier.padding(horizontal = 16.dp),
         ) {
             Row(
                 horizontalArrangement = Arrangement.End,
diff --git a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyDetailTopBar.kt b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyDetailTopBar.kt
index ec08152d3..5028b1cac 100644
--- a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyDetailTopBar.kt
+++ b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyDetailTopBar.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.wap.designsystem.WappTheme
-import com.wap.wapp.core.designresource.R.drawable
 import com.wap.wapp.feature.survey.check.R
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -32,21 +31,22 @@ internal fun SurveyDetailTopBar(
                 textAlign = TextAlign.Center,
                 modifier = Modifier.fillMaxWidth(),
                 style = WappTheme.typography.contentBold,
+                color = WappTheme.colors.white,
             )
         },
         navigationIcon = {
             Icon(
-                painter = painterResource(id = drawable.ic_back),
-                contentDescription = stringResource(
-                    id = com.wap.wapp.core.designsystem.R.string.back_button,
-                ),
+                painter = painterResource(id = com.wap.wapp.core.designsystem.R.drawable.ic_back),
+                contentDescription =
+                stringResource(com.wap.wapp.core.designsystem.R.string.back_button),
+                tint = WappTheme.colors.white,
                 modifier = Modifier
                     .padding(start = 16.dp)
                     .clickable { onBackButtonClicked() },
             )
         },
         colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = WappTheme.colors.yellow34,
+            containerColor = WappTheme.colors.black25,
         ),
     )
 }
diff --git a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyInformationCard.kt b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyInformationCard.kt
index bb29d5ce1..5b37a0889 100644
--- a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyInformationCard.kt
+++ b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/detail/SurveyInformationCard.kt
@@ -45,6 +45,7 @@ internal fun SurveyInformationCard(
                     color = WappTheme.colors.white,
                     textAlign = TextAlign.Start,
                 )
+
                 Divider()
             }
 
diff --git a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/navigation/SurveyCheckNavigation.kt b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/navigation/SurveyCheckNavigation.kt
index d853fc4ee..579613271 100644
--- a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/navigation/SurveyCheckNavigation.kt
+++ b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/navigation/SurveyCheckNavigation.kt
@@ -21,10 +21,12 @@ fun NavController.navigateToSurveyCheck(navOptions: NavOptions? = navOptions {})
 fun NavGraphBuilder.surveyCheckNavGraph(
     navigateToSurveyDetail: (String) -> Unit,
     navigateToSurveyCheck: () -> Unit,
+    navigateToSurvey: () -> Unit,
 ) {
     composable(route = SurveyCheckRoute.surveyCheckRoute) {
         SurveyCheckScreen(
             navigateToSurveyDetail = navigateToSurveyDetail,
+            navigateToSurvey = navigateToSurvey,
         )
     }
 
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyScreen.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyScreen.kt
index f24da1876..0c3951f50 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyScreen.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyScreen.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
+import com.wap.designsystem.component.CircleLoader
 import com.wap.designsystem.component.WappLeftMainTopBar
 import com.wap.wapp.core.commmon.extensions.toSupportingText
 import com.wap.wapp.core.model.user.UserRole
@@ -61,7 +62,9 @@ internal fun SurveyScreen(
                 is SurveyViewModel.UserRoleUiState.Init -> {}
                 is SurveyViewModel.UserRoleUiState.Success -> {
                     when (userRoleUiState.userRole) {
-                        UserRole.GUEST -> { isGuest = true }
+                        UserRole.GUEST -> {
+                            isGuest = true
+                        }
 
                         // 비회원이 아닌 경우, 목록 호출
                         UserRole.MEMBER -> viewModel.getSurveyFormList()
@@ -95,6 +98,10 @@ internal fun SurveyScreen(
     ) { paddingValues ->
         when (surveyFormListUiState) {
             is SurveyViewModel.SurveyFormListUiState.Init -> {}
+
+            is SurveyViewModel.SurveyFormListUiState.Loading ->
+                CircleLoader(modifier = Modifier.fillMaxSize())
+
             is SurveyViewModel.SurveyFormListUiState.Success -> {
                 SurveyContent(
                     surveyFormList = surveyFormListUiState.surveyFormList,
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyViewModel.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyViewModel.kt
index a6453d5ee..29b0b6bc9 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyViewModel.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/SurveyViewModel.kt
@@ -36,48 +36,44 @@ class SurveyViewModel @Inject constructor(
         getUserRole()
     }
 
-    private fun getUserRole() {
-        viewModelScope.launch {
-            getUserRoleUseCase()
-                .onSuccess { userRole ->
-                    _userRoleUiState.value = UserRoleUiState.Success(userRole)
-                }
-                .onFailure { throwable ->
-                    _surveyEvent.emit(SurveyUiEvent.Failure(throwable))
-                }
-        }
+    private fun getUserRole() = viewModelScope.launch {
+        getUserRoleUseCase()
+            .onSuccess { userRole ->
+                _userRoleUiState.value = UserRoleUiState.Success(userRole)
+            }
+            .onFailure { throwable ->
+                _surveyEvent.emit(SurveyUiEvent.Failure(throwable))
+            }
     }
 
-    fun getSurveyFormList() {
-        viewModelScope.launch {
-            getSurveyFormListUseCase()
-                .onSuccess { surveyFormList ->
-                    val filteredSurveyFormList = surveyFormList.filter { survey ->
-                        survey.isBeforeDeadline()
-                    }
-                    _surveyFormListUiState.value =
-                        SurveyFormListUiState.Success(filteredSurveyFormList)
-                }
-                .onFailure { throwable ->
-                    _surveyEvent.emit(SurveyUiEvent.Failure(throwable))
+    fun getSurveyFormList() = viewModelScope.launch {
+        _surveyFormListUiState.value = SurveyFormListUiState.Loading
+
+        getSurveyFormListUseCase()
+            .onSuccess { surveyFormList ->
+                val filteredSurveyFormList = surveyFormList.filter { survey ->
+                    survey.isBeforeDeadline()
                 }
-        }
+                _surveyFormListUiState.value =
+                    SurveyFormListUiState.Success(filteredSurveyFormList)
+            }
+            .onFailure { throwable ->
+                _surveyEvent.emit(SurveyUiEvent.Failure(throwable))
+            }
     }
 
-    fun isSubmittedSurvey(surveyFormId: String) {
-        viewModelScope.launch {
-            isSubmittedSurveyUseCase(surveyFormId)
-                .onSuccess { isSubmittedSurvey ->
-                    if (isSubmittedSurvey) {
-                        _surveyEvent.emit(SurveyUiEvent.AlreadySubmitted)
-                    } else {
-                        _surveyEvent.emit(SurveyUiEvent.NotSubmitted(surveyFormId))
-                    }
-                }
-                .onFailure { throwable ->
-                    _surveyEvent.emit(SurveyUiEvent.Failure(throwable))
+    fun isSubmittedSurvey(surveyFormId: String) = viewModelScope.launch {
+        isSubmittedSurveyUseCase(surveyFormId)
+            .onSuccess { isSubmittedSurvey ->
+                if (isSubmittedSurvey) {
+                    _surveyEvent.emit(SurveyUiEvent.AlreadySubmitted)
+                } else {
+                    _surveyEvent.emit(SurveyUiEvent.NotSubmitted(surveyFormId))
                 }
-        }
+            }
+            .onFailure { throwable ->
+                _surveyEvent.emit(SurveyUiEvent.Failure(throwable))
+            }
     }
 
     sealed class UserRoleUiState {
@@ -87,6 +83,7 @@ class SurveyViewModel @Inject constructor(
 
     sealed class SurveyFormListUiState {
         data object Init : SurveyFormListUiState()
+        data object Loading : SurveyFormListUiState()
         data class Success(val surveyFormList: List<SurveyForm>) : SurveyFormListUiState()
     }
 
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/ObjectiveSurveyForm.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/ObjectiveSurveyForm.kt
index 5f5ddbf31..8a1f03a2b 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/ObjectiveSurveyForm.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/ObjectiveSurveyForm.kt
@@ -29,7 +29,7 @@ internal fun ObjectiveSurveyForm(
 ) {
     Column(
         modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(32.dp),
+        verticalArrangement = Arrangement.spacedBy(40.dp),
     ) {
         Text(
             text = questionTitle,
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SubjectiveSurveyForm.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SubjectiveSurveyForm.kt
index 84e427c3f..d01e0fe6c 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SubjectiveSurveyForm.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SubjectiveSurveyForm.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -23,20 +24,18 @@ internal fun SubjectiveSurveyForm(
     onAnswerChanged: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(40.dp),
-    ) {
+    Column(modifier = modifier) {
         Text(
             text = questionTitle,
-            style = WappTheme.typography.titleRegular,
+            style = WappTheme.typography.titleMedium,
             color = WappTheme.colors.white,
             fontSize = 22.sp,
+            modifier = Modifier.padding(bottom = 40.dp),
         )
 
         Column(
             modifier = Modifier.fillMaxWidth(),
-            verticalArrangement = Arrangement.spacedBy(4.dp),
+            verticalArrangement = Arrangement.spacedBy(10.dp),
         ) {
             WappRoundedTextField(
                 value = answer,
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerForm.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerForm.kt
index 61582b852..5adc920f3 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerForm.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerForm.kt
@@ -1,12 +1,21 @@
 package com.wap.wapp.feature.survey.answer
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.unit.dp
 import com.wap.designsystem.component.WappButton
+import com.wap.designsystem.modifier.addFocusCleaner
 import com.wap.wapp.core.model.survey.QuestionType
 import com.wap.wapp.core.model.survey.Rating
 import com.wap.wapp.core.model.survey.SurveyForm
@@ -24,9 +33,12 @@ internal fun SurveyAnswerForm(
     onNextQuestionButtonClicked: () -> Unit,
     onPreviousQuestionButtonClicked: () -> Unit,
 ) {
+    val focusManager = LocalFocusManager.current
+
     Column(
-        verticalArrangement = Arrangement.spacedBy(40.dp),
-        modifier = modifier,
+        modifier = modifier
+            .fillMaxSize()
+            .addFocusCleaner(focusManager),
     ) {
         val surveyQuestion = surveyForm.surveyQuestionList[questionNumber]
         val lastQuestionNumber = surveyForm.surveyQuestionList.lastIndex
@@ -36,45 +48,60 @@ internal fun SurveyAnswerForm(
             size = lastQuestionNumber + 1,
         )
 
-        when (surveyQuestion.questionType) {
-            QuestionType.SUBJECTIVE -> {
-                SubjectiveSurveyForm(
-                    questionTitle = surveyQuestion.questionTitle,
-                    answer = subjectiveAnswer,
-                    onAnswerChanged = onSubjectiveAnswerChanged,
-                    modifier = Modifier.weight(1f),
-                )
-            }
+        AnimatedContent(
+            targetState = questionNumber,
+            transitionSpec = {
+                if (targetState > initialState) {
+                    slideInHorizontally(initialOffsetX = { it }) + fadeIn() togetherWith
+                        slideOutHorizontally(targetOffsetX = { -it }) + fadeOut()
+                } else {
+                    slideInHorizontally(initialOffsetX = { -it }) + fadeIn() togetherWith
+                        slideOutHorizontally(targetOffsetX = { it }) + fadeOut()
+                }
+            },
+        ) { questionNumber ->
+            Column {
+                when (surveyForm.surveyQuestionList[questionNumber].questionType) {
+                    QuestionType.SUBJECTIVE -> {
+                        SubjectiveSurveyForm(
+                            questionTitle = surveyQuestion.questionTitle,
+                            answer = subjectiveAnswer,
+                            onAnswerChanged = onSubjectiveAnswerChanged,
+                            modifier = Modifier.weight(1f),
+                        )
+                    }
 
-            QuestionType.OBJECTIVE -> {
-                ObjectiveSurveyForm(
-                    questionTitle = surveyQuestion.questionTitle,
-                    answer = objectiveAnswer,
-                    onAnswerSelected = onObjectiveAnswerSelected,
-                    modifier = Modifier.weight(1f),
-                )
-            }
-        }
+                    QuestionType.OBJECTIVE -> {
+                        ObjectiveSurveyForm(
+                            questionTitle = surveyQuestion.questionTitle,
+                            answer = objectiveAnswer,
+                            onAnswerSelected = onObjectiveAnswerSelected,
+                            modifier = Modifier.weight(1f),
+                        )
+                    }
+                }
 
-        val isGreaterThanFirstQuestion = questionNumber > 0
-        val isLastQuestion = questionNumber == lastQuestionNumber // 마지막 응답일 경우, 완료로 변경
-        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-            WappButton(
-                textRes = R.string.previous,
-                onClick = onPreviousQuestionButtonClicked,
-                isEnabled = isGreaterThanFirstQuestion,
-                modifier = Modifier.weight(1f),
-            )
+                val isGreaterThanFirstQuestion = questionNumber > 0
+                val isLastQuestion = questionNumber == lastQuestionNumber // 마지막 응답일 경우, 완료로 변경
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    WappButton(
+                        textRes = R.string.previous,
+                        onClick = onPreviousQuestionButtonClicked,
+                        isEnabled = isGreaterThanFirstQuestion,
+                        modifier = Modifier.weight(1f),
+                    )
 
-            SurveyAnswerButton(
-                isLastQuestion = isLastQuestion,
-                onButtonClicked = onNextQuestionButtonClicked,
-                isEnabled = checkQuestionTypeAndSubjectiveAnswer(
-                    questionType = surveyQuestion.questionType,
-                    subjectiveAnswer = subjectiveAnswer,
-                ),
-                modifier = Modifier.weight(1f),
-            )
+                    SurveyAnswerButton(
+                        isLastQuestion = isLastQuestion,
+                        onButtonClicked = onNextQuestionButtonClicked,
+                        isEnabled = checkQuestionTypeAndSubjectiveAnswer(
+                            questionType = surveyQuestion.questionType,
+                            subjectiveAnswer = subjectiveAnswer,
+                        ),
+                        modifier = Modifier.weight(1f),
+                    )
+                }
+            }
         }
     }
 }
@@ -110,5 +137,7 @@ private fun checkQuestionTypeAndSubjectiveAnswer(
     if (questionType == QuestionType.OBJECTIVE) {
         return true
     }
-    return subjectiveAnswer.length >= 10
+    return subjectiveAnswer.length >= MINIMUN_ANSWER_LENGTH
 }
+
+private val MINIMUN_ANSWER_LENGTH = 10
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerScreen.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerScreen.kt
index 2f4f76f34..1caba3a84 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerScreen.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerScreen.kt
@@ -1,5 +1,11 @@
 package com.wap.wapp.feature.survey.answer
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -41,13 +47,11 @@ internal fun SurveyAnswerScreen(
 
         viewModel.surveyAnswerEvent.collectLatest {
             when (it) {
-                is SurveyAnswerViewModel.SurveyAnswerUiEvent.SubmitSuccess -> {
+                is SurveyAnswerViewModel.SurveyAnswerUiEvent.SubmitSuccess ->
                     navigateToSurvey()
-                }
 
-                is SurveyAnswerViewModel.SurveyAnswerUiEvent.Failure -> {
+                is SurveyAnswerViewModel.SurveyAnswerUiEvent.Failure ->
                     snackBarHostState.showSnackbar(it.throwable.toSupportingText())
-                }
             }
         }
     }
@@ -114,7 +118,7 @@ internal fun SurveyAnswerScreen(
                     modifier = Modifier
                         .fillMaxSize()
                         .padding(paddingValues)
-                        .padding(16.dp),
+                        .padding(top = 16.dp, bottom = 20.dp, start = 20.dp, end = 20.dp),
                 )
             }
         }
@@ -136,28 +140,41 @@ private fun SurveyAnswerContent(
     onPreviousQuestionButtonClicked: () -> Unit,
     modifier: Modifier,
 ) {
-    when (surveyAnswerState) {
-        SurveyAnswerState.SURVEY_OVERVIEW -> {
-            SurveyOverview(
-                surveyForm = surveyForm,
-                modifier = modifier.padding(top = 16.dp),
-                eventName = eventName,
-                onStartSurveyButtonClicked = onStartSurveyButtonClicked,
-            )
-        }
+    AnimatedContent(
+        targetState = surveyAnswerState,
+        transitionSpec = {
+            if (targetState.ordinal > initialState.ordinal) {
+                slideInHorizontally(initialOffsetX = { it }) + fadeIn() togetherWith
+                    slideOutHorizontally(targetOffsetX = { -it }) + fadeOut()
+            } else {
+                slideInHorizontally(initialOffsetX = { -it }) + fadeIn() togetherWith
+                    slideOutHorizontally(targetOffsetX = { it }) + fadeOut()
+            }
+        },
+    ) { answerState ->
+        when (answerState) {
+            SurveyAnswerState.SURVEY_OVERVIEW -> {
+                SurveyOverview(
+                    surveyForm = surveyForm,
+                    modifier = modifier.padding(top = 16.dp),
+                    eventName = eventName,
+                    onStartSurveyButtonClicked = onStartSurveyButtonClicked,
+                )
+            }
 
-        SurveyAnswerState.SURVEY_ANSWER -> {
-            SurveyAnswerForm(
-                surveyForm = surveyForm,
-                modifier = modifier,
-                questionNumber = questionNumber,
-                subjectiveAnswer = subjectiveAnswer,
-                objectiveAnswer = objectiveAnswer,
-                onSubjectiveAnswerChanged = onSubjectiveAnswerChanged,
-                onObjectiveAnswerSelected = onObjectiveAnswerSelected,
-                onNextQuestionButtonClicked = onNextQuestionButtonClicked,
-                onPreviousQuestionButtonClicked = onPreviousQuestionButtonClicked,
-            )
+            SurveyAnswerState.SURVEY_ANSWER -> {
+                SurveyAnswerForm(
+                    surveyForm = surveyForm,
+                    modifier = modifier,
+                    questionNumber = questionNumber,
+                    subjectiveAnswer = subjectiveAnswer,
+                    objectiveAnswer = objectiveAnswer,
+                    onSubjectiveAnswerChanged = onSubjectiveAnswerChanged,
+                    onObjectiveAnswerSelected = onObjectiveAnswerSelected,
+                    onNextQuestionButtonClicked = onNextQuestionButtonClicked,
+                    onPreviousQuestionButtonClicked = onPreviousQuestionButtonClicked,
+                )
+            }
         }
     }
 }
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerStateIndicator.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerStateIndicator.kt
index c341a7374..e00d723c3 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerStateIndicator.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyAnswerStateIndicator.kt
@@ -1,13 +1,19 @@
 package com.wap.wapp.feature.survey.answer
 
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.spring
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
@@ -20,6 +26,9 @@ internal fun SurveyAnswerStateIndicator(index: Int, size: Int) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = Modifier
+            .wrapContentSize()
+            .padding(bottom = 40.dp),
     ) {
         SurveyAnswerStateProgressBar(index = index, size = size)
         SurveyAnswerStateText(index = index, size = size)
@@ -44,12 +53,21 @@ private fun SurveyAnswerStateText(index: Int, size: Int) {
 
 @Composable
 private fun SurveyAnswerStateProgressBar(index: Int, size: Int) {
+    val progress by animateFloatAsState(
+        targetValue = index.toFloat() / size.toFloat(),
+        animationSpec = spring(
+            stiffness = Spring.StiffnessMediumLow,
+            dampingRatio = Spring.DampingRatioMediumBouncy,
+        ),
+    )
+
     LinearProgressIndicator(
+        color = WappTheme.colors.yellow34,
+        trackColor = WappTheme.colors.white,
+        progress = progress,
+        strokeCap = StrokeCap.Round,
         modifier = Modifier
             .fillMaxWidth()
             .height(10.dp),
-        color = WappTheme.colors.yellow34,
-        progress = index.toFloat() / size.toFloat(),
-        strokeCap = StrokeCap.Round,
     )
 }
diff --git a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyOverview.kt b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyOverview.kt
index 3fd8a2178..9161194b4 100644
--- a/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyOverview.kt
+++ b/feature/survey/src/main/java/com/wap/wapp/feature/survey/answer/SurveyOverview.kt
@@ -1,15 +1,21 @@
 package com.wap.wapp.feature.survey.answer
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappButton
@@ -59,19 +65,32 @@ internal fun SurveyOverview(
 
 @Composable
 private fun SurveyOverviewText(category: String, content: String) {
-    Text(
-        text = buildAnnotatedString {
-            withStyle(
-                SpanStyle(color = WappTheme.colors.white),
-            ) {
-                append("$category : ")
-            }
-            withStyle(
-                SpanStyle(color = WappTheme.colors.yellow34),
-            ) {
-                append(content)
-            }
-        },
-        style = WappTheme.typography.titleBold,
-    )
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth(),
+    ) {
+        Text(
+            text = category,
+            color = WappTheme.colors.white,
+            style = WappTheme.typography.titleBold,
+        )
+
+        Spacer(modifier = Modifier.weight(1f))
+
+        Box(
+            modifier = Modifier
+                .width(200.dp)
+                .clip(RoundedCornerShape(8.dp))
+                .background(WappTheme.colors.black25),
+        ) {
+            Text(
+                text = content,
+                color = WappTheme.colors.white,
+                style = WappTheme.typography.contentMedium,
+                modifier = Modifier
+                    .align(Alignment.Center)
+                    .padding(vertical = 10.dp),
+            )
+        }
+    }
 }
diff --git a/gradle.properties b/gradle.properties
index 3c5031eb7..cd964a86a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,11 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.enableJetifier=false
+org.gradle.caching=true
+org.gradle.daemon=true
+org.gradle.configureondemand=true
+org.gradle.configuration-cache=true
+org.gradle.parallel=true
+kotlin.incremental=true