diff --git a/app/src/main/res/drawable/bg_input_field.xml b/app/src/main/res/drawable/bg_input_field.xml
new file mode 100644
index 0000000..b0cff79
--- /dev/null
+++ b/app/src/main/res/drawable/bg_input_field.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#F5F5F5" />
+    <corners android:radius="12dp" />
+    <stroke
+        android:width="0dp"
+        android:color="#E0E0E0" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_header_login_bg.xml b/app/src/main/res/drawable/ic_header_login_bg.xml
new file mode 100644
index 0000000..7ab031f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_login_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="412dp"
+    android:height="300dp"
+    android:viewportWidth="412"
+    android:viewportHeight="300">
+  
+    <path
+        android:fillColor="#121212"
+        android:pathData="M0,0 L412,0 L412,220 C412,220 300,300 0,220 L0,0 Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_header_signup_bg.xml b/app/src/main/res/drawable/ic_header_signup_bg.xml
new file mode 100644
index 0000000..721b383
--- /dev/null
+++ b/app/src/main/res/drawable/ic_header_signup_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="412dp"
+    android:height="200dp"
+    android:viewportWidth="412"
+    android:viewportHeight="200">
+  
+    <path
+        android:fillColor="#121212"
+        android:pathData="M0,0 L412,0 L412,150 C300,200 100,200 0,150 L0,0 Z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_criarconta.xml b/app/src/main/res/layout/activity_criarconta.xml
index 9e9e5a1..3380a15 100644
--- a/app/src/main/res/layout/activity_criarconta.xml
+++ b/app/src/main/res/layout/activity_criarconta.xml
@@ -3,271 +3,189 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFFFFF"
-    android:id="@+id/main"
-    android:padding="0dp">
+    android:background="#FFFFFF">
 
-    <!-- Logo/Title Section -->
-    <LinearLayout
-        android:id="@+id/headerSection"
+    <!-- Header Background -->
+    <ImageView
+        android:id="@+id/headerBg"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_header_signup_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <!-- Header Title (as per design image, showing "Sign Up" in header) or Body?
+         The image shows "Sign Up" text in the header area. -->
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center"
+        android:text="Sign Up"
+        android:textColor="#FFFFFF"
+        android:textSize="32sp"
+        android:textStyle="bold"
         android:layout_marginTop="60dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintEnd_toEndOf="parent" />
+        
+    <!-- Back Button (Optional, not in Java but good for UX) -->
 
-        <TextView
-            android:id="@+id/textView4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="VdcScore"
-            android:textSize="48sp"
-            android:textStyle="bold"
-            android:textColor="#212121"
-            android:letterSpacing="0.05" />
 
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="Criar Conta"
-            android:textSize="18sp"
-            android:textColor="#757575"
-            android:fontFamily="sans-serif-light" />
+    <!-- Sign Up Form Container -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        android:layout_marginTop="160dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
 
-    </LinearLayout>
-
-    <!-- Main Card -->
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/cardRegister"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginTop="40dp"
-        android:elevation="2dp"
-        app:cardCornerRadius="16dp"
-        app:cardBackgroundColor="#FFFFFF"
-        app:cardUseCompatPadding="true"
-        app:strokeWidth="1dp"
-        app:strokeColor="#E0E0E0"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/headerSection">
-
-        <ScrollView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fillViewport="true">
+            android:orientation="vertical"
+            android:paddingHorizontal="32dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp"
+            android:background="@drawable/bg_bottom_sheet_curve"> <!-- Implicit white background from activity, but layout structure follows scrolling -->
 
+            <!-- User Name Label -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Nome de Utilizador"
+                android:textColor="#212121"
+                android:textStyle="bold"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="4dp"/>
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editUserName"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/bg_input_field"
+                android:paddingHorizontal="16dp"
+                android:inputType="textPersonName"
+                android:hint="Tony"
+                android:textColor="#424242"
+                android:textColorHint="#BDBDBD"
+                android:textSize="14sp"
+                android:layout_marginBottom="24dp" />
+
+            <!-- Email Label -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Email"
+                android:textColor="#212121"
+                android:textStyle="bold"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="4dp"/>
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editEmail"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/bg_input_field"
+                android:paddingHorizontal="16dp"
+                android:inputType="textEmailAddress"
+                android:hint="email@exemplo.com"
+                android:textColor="#424242"
+                android:textColorHint="#BDBDBD"
+                android:textSize="14sp"
+                android:layout_marginBottom="24dp" />
+
+            <!-- Password Label -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Password"
+                android:textColor="#212121"
+                android:textStyle="bold"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="4dp"/>
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editPassword2"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/bg_input_field"
+                android:paddingHorizontal="16dp"
+                android:inputType="textPassword"
+                android:hint="********"
+                android:textColor="#424242"
+                android:textColorHint="#BDBDBD"
+                android:textSize="14sp"
+                android:layout_marginBottom="24dp" />
+
+            <!-- Confirm Password Label -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Confirmar Password"
+                android:textColor="#212121"
+                android:textStyle="bold"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="4dp"/>
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editConfirmPassword"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/bg_input_field"
+                android:paddingHorizontal="16dp"
+                android:inputType="textPassword"
+                android:hint="********"
+                android:textColor="#424242"
+                android:textColorHint="#BDBDBD"
+                android:textSize="14sp"
+                android:layout_marginBottom="32dp" />
+
+
+            <!-- Sign Up Button -->
+            <Button
+                android:id="@+id/btnCreateAccount"
+                android:layout_width="match_parent"
+                android:layout_height="55dp"
+                android:text="Sign Up"
+                android:textAllCaps="false"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="#FFFFFF"
+                android:backgroundTint="#000000"
+                app:cornerRadius="12dp"
+                android:layout_marginBottom="24dp" />
+
+            <!-- Login Link -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="32dp">
-
-                <!-- Title inside card -->
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Registo"
-                    android:textSize="32sp"
-                    android:textStyle="bold"
-                    android:textColor="#212121"
-                    android:layout_marginBottom="8dp" />
+                android:orientation="horizontal"
+                android:gravity="center">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Cria a tua conta para começar"
-                    android:textSize="15sp"
-                    android:textColor="#757575"
-                    android:layout_marginBottom="32dp" />
+                    android:text="Já tem uma conta? "
+                    android:textColor="#757575" />
 
-                <!-- Nome de Utilizador Input -->
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/txtGoLogin"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="20dp"
-                    android:hint="Nome de Utilizador"
-                    app:boxCornerRadiusTopStart="12dp"
-                    app:boxCornerRadiusTopEnd="12dp"
-                    app:boxCornerRadiusBottomStart="12dp"
-                    app:boxCornerRadiusBottomEnd="12dp"
-                    app:boxStrokeWidth="1dp"
-                    app:boxStrokeColor="#BDBDBD"
-                    app:startIconDrawable="@android:drawable/ic_menu_myplaces"
-                    app:startIconTint="#616161"
-                    app:boxBackgroundMode="outline"
-                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/editUserName"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPersonName"
-                        android:textColor="#212121"
-                        android:textColorHint="#9E9E9E"
-                        android:textSize="16sp"
-                        android:padding="18dp"
-                        android:background="@android:color/transparent" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <!-- Email Input -->
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="20dp"
-                    android:hint="Email"
-                    app:boxCornerRadiusTopStart="12dp"
-                    app:boxCornerRadiusTopEnd="12dp"
-                    app:boxCornerRadiusBottomStart="12dp"
-                    app:boxCornerRadiusBottomEnd="12dp"
-                    app:boxStrokeWidth="1dp"
-                    app:boxStrokeColor="#BDBDBD"
-                    app:startIconDrawable="@android:drawable/ic_dialog_email"
-                    app:startIconTint="#616161"
-                    app:boxBackgroundMode="outline"
-                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/editEmail"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textEmailAddress"
-                        android:textColor="#212121"
-                        android:textColorHint="#9E9E9E"
-                        android:textSize="16sp"
-                        android:padding="18dp"
-                        android:background="@android:color/transparent" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <!-- Password Input -->
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="20dp"
-                    android:hint="Password"
-                    app:boxCornerRadiusTopStart="12dp"
-                    app:boxCornerRadiusTopEnd="12dp"
-                    app:boxCornerRadiusBottomStart="12dp"
-                    app:boxCornerRadiusBottomEnd="12dp"
-                    app:boxStrokeWidth="1dp"
-                    app:boxStrokeColor="#BDBDBD"
-                    app:startIconDrawable="@android:drawable/ic_lock_lock"
-                    app:startIconTint="#616161"
-                    app:endIconMode="password_toggle"
-                    app:endIconTint="#616161"
-                    app:boxBackgroundMode="outline"
-                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/editPassword2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword"
-                        android:textColor="#212121"
-                        android:textColorHint="#9E9E9E"
-                        android:textSize="16sp"
-                        android:padding="18dp"
-                        android:background="@android:color/transparent" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <!-- Confirm Password Input -->
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="12dp"
-                    android:hint="Confirmar Password"
-                    app:boxCornerRadiusTopStart="12dp"
-                    app:boxCornerRadiusTopEnd="12dp"
-                    app:boxCornerRadiusBottomStart="12dp"
-                    app:boxCornerRadiusBottomEnd="12dp"
-                    app:boxStrokeWidth="1dp"
-                    app:boxStrokeColor="#BDBDBD"
-                    app:startIconDrawable="@android:drawable/ic_lock_lock"
-                    app:startIconTint="#616161"
-                    app:endIconMode="password_toggle"
-                    app:endIconTint="#616161"
-                    app:boxBackgroundMode="outline"
-                    style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/editConfirmPassword"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword"
-                        android:textColor="#212121"
-                        android:textColorHint="#9E9E9E"
-                        android:textSize="16sp"
-                        android:padding="18dp"
-                        android:background="@android:color/transparent" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <!-- Create Account Button -->
-                <Button
-                    android:id="@+id/btnCreateAccount"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:backgroundTint="#424242"
-                    android:text="Criar Conta"
-                    android:textColor="#FFFFFF"
-                    android:textSize="17sp"
+                    android:text="Sign In"
+                    android:textColor="#000000"
                     android:textStyle="bold"
-                    android:letterSpacing="0.05"
-                    android:elevation="2dp"
-                    android:stateListAnimator="@null"
-                    android:layout_marginTop="12dp" />
-
+                    android:clickable="true"
+                    android:focusable="true"/>
             </LinearLayout>
 
-        </ScrollView>
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <!-- Login Link -->
-    <LinearLayout
-        android:id="@+id/loginSection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:padding="16dp"
-        android:layout_marginTop="24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cardRegister">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Já tens conta? "
-            android:textColor="#757575"
-            android:textSize="15sp" />
-
-        <TextView
-            android:id="@+id/txtGoLogin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Entrar"
-            android:textColor="#212121"
-            android:textStyle="bold"
-            android:textSize="15sp"
-            android:clickable="true"
-            android:focusable="true"
-            android:padding="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless" />
-
-    </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 907bae8..c371b3e 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,68 +5,48 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFFFFF"
-    android:padding="0dp">
+    android:background="#FFFFFF">
 
-    <!-- Logo/Title Section -->
-    <LinearLayout
-        android:id="@+id/headerSection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_marginTop="80dp"
+    <!-- Header Background -->
+    <ImageView
+        android:id="@+id/headerBg"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_header_login_bg"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <!-- Logo -->
+    <ImageView
+        android:id="@+id/logoImage"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginTop="60dp"
+        android:src="@mipmap/ic_launcher"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/textView3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="VdcScore"
-            android:textSize="48sp"
-            android:textStyle="bold"
-            android:textColor="#212121"
-            android:letterSpacing="0.05" />
-
-        <TextView
-            android:id="@+id/textSubtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="Bem-vindo de volta"
-            android:textSize="18sp"
-            android:textColor="#757575"
-            android:fontFamily="sans-serif-light" />
-
-    </LinearLayout>
-
-    <!-- Main Card -->
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/cardLogin"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginTop="40dp"
-        android:elevation="2dp"
-        app:cardCornerRadius="16dp"
-        app:cardBackgroundColor="#FFFFFF"
-        app:cardUseCompatPadding="true"
-        app:strokeWidth="1dp"
-        app:strokeColor="#E0E0E0"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/headerSection">
+        android:elevation="4dp" />
 
-        <LinearLayout
+    <!-- Login Form Container -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        android:layout_marginTop="-40dp"
+        app:layout_constraintTop_toBottomOf="@+id/headerBg"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="32dp">
+            android:paddingHorizontal="32dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp">
 
-            <!-- Title inside card -->
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -74,157 +54,128 @@
                 android:textSize="32sp"
                 android:textStyle="bold"
                 android:textColor="#212121"
-                android:layout_marginBottom="8dp" />
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="40dp" />
 
+            <!-- Email Label -->
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Entre na sua conta para continuar"
-                android:textSize="15sp"
-                android:textColor="#757575"
-                android:layout_marginBottom="32dp" />
+                android:text="Email"
+                android:textColor="#212121"
+                android:textStyle="bold"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="4dp"/>
 
             <!-- Email Input -->
-            <com.google.android.material.textfield.TextInputLayout
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editEmail"
                 android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/bg_input_field"
+                android:paddingHorizontal="16dp"
+                android:inputType="textEmailAddress"
+                android:hint="email@exemplo.com"
+                android:textColor="#424242"
+                android:textColorHint="#BDBDBD"
+                android:textSize="14sp"
+                android:layout_marginBottom="24dp" />
+
+            <!-- Password Label -->
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp"
-                android:hint="Email"
-                app:boxCornerRadiusTopStart="12dp"
-                app:boxCornerRadiusTopEnd="12dp"
-                app:boxCornerRadiusBottomStart="12dp"
-                app:boxCornerRadiusBottomEnd="12dp"
-                app:boxStrokeWidth="1dp"
-                app:boxStrokeColor="#BDBDBD"
-                app:startIconDrawable="@android:drawable/ic_dialog_email"
-                app:startIconTint="#616161"
-                app:boxBackgroundMode="outline"
-                style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/editEmail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"
-                    android:textColor="#212121"
-                    android:textColorHint="#9E9E9E"
-                    android:textSize="16sp"
-                    android:padding="18dp"
-                    android:background="@android:color/transparent" />
-
-            </com.google.android.material.textfield.TextInputLayout>
+                android:text="Password"
+                android:textColor="#212121"
+                android:textStyle="bold"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="4dp"/>
 
             <!-- Password Input -->
-            <com.google.android.material.textfield.TextInputLayout
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editPassword2"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/bg_input_field"
+                android:paddingHorizontal="16dp"
+                android:inputType="textPassword"
+                android:hint="********"
+                android:textColor="#424242"
+                android:textColorHint="#BDBDBD"
+                android:textSize="14sp"
+                android:layout_marginBottom="16dp" />
+
+            <!-- Remember Me & Forgot Password -->
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:hint="Password"
-                app:boxCornerRadiusTopStart="12dp"
-                app:boxCornerRadiusTopEnd="12dp"
-                app:boxCornerRadiusBottomStart="12dp"
-                app:boxCornerRadiusBottomEnd="12dp"
-                app:boxStrokeWidth="1dp"
-                app:boxStrokeColor="#BDBDBD"
-                app:startIconDrawable="@android:drawable/ic_lock_lock"
-                app:startIconTint="#616161"
-                app:endIconMode="password_toggle"
-                app:endIconTint="#616161"
-                app:boxBackgroundMode="outline"
-                style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_marginBottom="32dp">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/editPassword2"
-                    android:layout_width="match_parent"
+                <CheckBox
+                    android:id="@+id/checkRememberMe"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:inputType="textPassword"
-                    android:textColor="#212121"
-                    android:textColorHint="#9E9E9E"
-                    android:textSize="16sp"
-                    android:padding="18dp"
-                    android:background="@android:color/transparent" />
+                    android:text="Lembrar"
+                    android:textColor="#757575"/>
 
-            </com.google.android.material.textfield.TextInputLayout>
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
 
-            <!-- Remember Me Checkbox -->
-            <CheckBox
-                android:id="@+id/checkRememberMe"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
-                android:text="Lembrar-me"
-                android:textColor="#616161"
-                android:textSize="14sp" />
-
-            <!-- Forgot Password Link -->
-            <TextView
-                android:id="@+id/txtForgotPassword"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginBottom="28dp"
-                android:text="Esqueceu a palavra-passe?"
-                android:textColor="#616161"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="8dp"
-                android:background="?attr/selectableItemBackgroundBorderless" />
+                <TextView
+                    android:id="@+id/txtForgotPassword"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Esqueceu a senha?"
+                    android:textColor="#757575"
+                    android:textStyle="bold"
+                    android:textSize="12sp"
+                    android:clickable="true"
+                    android:focusable="true"/>
+            </LinearLayout>
 
             <!-- Login Button -->
             <Button
                 android:id="@+id/btnLogin"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:backgroundTint="#424242"
-                android:text="Entrar"
-                android:textColor="#FFFFFF"
-                android:textSize="17sp"
+                android:layout_height="55dp"
+                android:text="Login"
+                android:textAllCaps="false"
+                android:textSize="16sp"
                 android:textStyle="bold"
-                android:letterSpacing="0.05"
-                android:elevation="2dp"
-                android:stateListAnimator="@null"
-                android:layout_marginTop="4dp" />
+                android:textColor="#FFFFFF"
+                android:backgroundTint="#000000"
+                app:cornerRadius="12dp"
+                android:layout_marginBottom="24dp" />
+
+            <!-- Sign Up Link -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Não tem uma conta? "
+                    android:textColor="#757575" />
+
+                <TextView
+                    android:id="@+id/txtRegister"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Criar Conta"
+                    android:textColor="#000000"
+                    android:textStyle="bold"
+                    android:clickable="true"
+                    android:focusable="true"/>
+            </LinearLayout>
 
         </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <!-- Register Link -->
-    <LinearLayout
-        android:id="@+id/registerSection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:padding="16dp"
-        android:layout_marginTop="24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cardLogin">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Não tens conta? "
-            android:textColor="#757575"
-            android:textSize="15sp" />
-
-        <TextView
-            android:id="@+id/txtRegister"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Criar conta"
-            android:textColor="#212121"
-            android:textStyle="bold"
-            android:textSize="15sp"
-            android:clickable="true"
-            android:focusable="true"
-            android:padding="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:drawablePadding="4dp" />
-
-    </LinearLayout>
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>