diff --git a/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt b/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
index d965076..9d1491e 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
@@ -126,7 +126,7 @@ fun ChangePasswordScreen() {
                 modifier = Modifier
                     .width(345.dp)
                     .height(48.dp),
-                text = "LET'S RIDE".uppercase(),
+                text = "Let's Ride",
                 backgroundImage = R.mipmap.rider_pro_signup_red_bg
             ) {
                 if (validate()) {
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/TextInputField.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/TextInputField.kt
index f4b64be..22f0fcf 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/composables/TextInputField.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/composables/TextInputField.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.style.TextIndent
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aiosman.riderpro.R
@@ -92,7 +93,7 @@ fun TextInputField(
                     ),
                     visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
                     singleLine = true,
-                    enabled = enabled
+                    enabled = enabled,
                 )
                 if (password) {
                     Image(
@@ -110,7 +111,7 @@ fun TextInputField(
 
             if (text.isEmpty()) {
                 hint?.let {
-                    Text(it, color = Color(0xffdadada), fontWeight = FontWeight.W600)
+                    Text(it, modifier = Modifier.padding(start = 5.dp), color = Color(0xffdadada), fontWeight = FontWeight.W600)
                 }
             }
         }
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt b/app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt
index 0fca9c5..e4dc0da 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt
@@ -197,7 +197,7 @@ fun EmailSignupScreen() {
                 hint = stringResource(R.string.text_hint_email),
                 error = emailError
             )
-            Spacer(modifier = Modifier.padding(8.dp))
+            Spacer(modifier = Modifier.padding(4.dp))
             TextInputField(
                 modifier = Modifier
                     .fillMaxWidth(),
@@ -209,7 +209,7 @@ fun EmailSignupScreen() {
                 hint = stringResource(R.string.text_hint_password),
                 error = passwordError
             )
-            Spacer(modifier = Modifier.padding(8.dp))
+            Spacer(modifier = Modifier.padding(4.dp))
             TextInputField(
                 modifier = Modifier
                     .fillMaxWidth(),
@@ -221,7 +221,7 @@ fun EmailSignupScreen() {
                 hint = stringResource(R.string.text_hint_confirm_password),
                 error = confirmPasswordError
             )
-            Spacer(modifier = Modifier.height(16.dp))
+            Spacer(modifier = Modifier.height(8.dp))
             Column(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalAlignment = Alignment.Start,
@@ -253,7 +253,7 @@ fun EmailSignupScreen() {
                 }
             }
 
-            Spacer(modifier = Modifier.height(64.dp))
+            Spacer(modifier = Modifier.height(32.dp))
             Box(
                 modifier = Modifier.fillMaxWidth(),
                 contentAlignment = Alignment.Center
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt b/app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt
index 819c91d..c2cd911 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt
@@ -27,6 +27,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aiosman.riderpro.AppState
@@ -258,7 +260,10 @@ fun UserAuthScreen() {
                 Text(
                     stringResource(R.string.remember_me),
                     modifier = Modifier.padding(start = 8.dp),
-                    fontSize = 12.sp
+                    fontSize = 12.sp,
+                    style = TextStyle(
+                        fontWeight = FontWeight.W500
+                    )
                 )
                 Spacer(modifier = Modifier.weight(1f))
                 Text(
@@ -266,7 +271,10 @@ fun UserAuthScreen() {
                     fontSize = 12.sp,
                     modifier = Modifier.noRippleClickable {
                         navController.navigate(NavigationRoute.ResetPassword.route)
-                    }
+                    },
+                    style = TextStyle(
+                        fontWeight = FontWeight.W500
+                    )
                 )
 
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fab824a..13b2913 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="post_comment_hint">Say something...</string>
     <string name="follow_upper">FOLLOW</string>
     <string name="login_upper">Log in</string>
-    <string name="lets_ride_upper">LET\'S RIDE</string>
+    <string name="lets_ride_upper">Let\'s Ride</string>
     <string name="or_login_with">or login with</string>
     <string name="remember_me">Remember me.</string>
     <string name="forgot_password">Forgot password?</string>