diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 72ba9d4..cf5be69 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -7,6 +7,14 @@
       </SelectionState>
       <SelectionState runConfigName="login_activity">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2026-01-07T08:41:59.573594Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/230408/.android/avd/Medium_Phone.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0b80081..81ada05 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -50,6 +50,8 @@ dependencies {
     implementation(libs.credentials)
     implementation(libs.credentials.play.services.auth)
     implementation(libs.googleid)
+    implementation("com.google.android.gms:play-services-maps:18.2.0")
+    implementation("com.google.android.gms:play-services-location:21.0.1")
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e1b167..d750f77 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -11,12 +15,19 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.PAP_FindU">
+        
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="YOUR_API_KEY_HERE" />
         <activity
             android:name=".CriarConta"
             android:exported="false" />
         <activity
             android:name=".Recuperar_Passe"
             android:exported="false" />
+        <activity
+            android:name=".ChatActivity"
+            android:exported="false" />
         <activity
             android:name=".login_activity"
             android:exported="true">
@@ -26,6 +37,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".AddZoneActivity"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java b/app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
index aea5fe8..2e6ba39 100644
--- a/app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
+++ b/app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
@@ -8,17 +8,63 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
+import com.example.pap_findu.R;
 import com.example.pap_findu.databinding.FragmentMapBinding;
 
 public class MapFragment extends Fragment {
 
     private FragmentMapBinding binding;
+    private com.google.android.gms.maps.GoogleMap mMap;
 
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         binding = FragmentMapBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
 
+        // Initialize Map
+        com.google.android.gms.maps.SupportMapFragment mapFragment = (com.google.android.gms.maps.SupportMapFragment) getChildFragmentManager()
+                .findFragmentById(R.id.map);
+        if (mapFragment != null) {
+            mapFragment.getMapAsync(googleMap -> {
+                mMap = googleMap;
+                // Check permissions and enable My Location
+                if (androidx.core.content.ContextCompat.checkSelfPermission(requireContext(),
+                        android.Manifest.permission.ACCESS_FINE_LOCATION) == android.content.pm.PackageManager.PERMISSION_GRANTED) {
+                    mMap.setMyLocationEnabled(true);
+
+                    // Move camera to finding User or Default
+                    com.google.android.gms.location.LocationServices.getFusedLocationProviderClient(requireActivity())
+                            .getLastLocation()
+                            .addOnSuccessListener(location -> {
+                                if (location != null) {
+                                    com.google.android.gms.maps.model.LatLng current = new com.google.android.gms.maps.model.LatLng(
+                                            location.getLatitude(), location.getLongitude());
+                                    mMap.moveCamera(com.google.android.gms.maps.CameraUpdateFactory
+                                            .newLatLngZoom(current, 15f));
+                                } else {
+                                    // Default to Escola Profissional de Vila do Conde
+                                    com.google.android.gms.maps.model.LatLng school = new com.google.android.gms.maps.model.LatLng(
+                                            41.3536, -8.7424);
+                                    mMap.moveCamera(
+                                            com.google.android.gms.maps.CameraUpdateFactory.newLatLngZoom(school, 15f));
+                                }
+                            });
+                } else {
+                    // Request permissions (Simplified for brevity, usually should use
+                    // RequestPermissionLauncher)
+                    requestPermissions(new String[] { android.Manifest.permission.ACCESS_FINE_LOCATION }, 100);
+                }
+
+                mMap.setOnMapLongClickListener(latLng -> {
+                    android.content.Intent intent = new android.content.Intent(getContext(),
+                            com.example.pap_findu.AddZoneActivity.class);
+                    intent.putExtra("lat", latLng.latitude);
+                    intent.putExtra("lng", latLng.longitude);
+                    startActivity(intent);
+                });
+            });
+        }
+
         // Implement SOS Button logic
         binding.sosButton.setOnClickListener(v -> {
             android.content.Intent intent = new android.content.Intent(android.content.Intent.ACTION_DIAL);
@@ -43,7 +89,9 @@ public class MapFragment extends Fragment {
         });
 
         binding.messagesFab.setOnClickListener(v -> {
-            android.widget.Toast.makeText(getContext(), "Abrir Chat", android.widget.Toast.LENGTH_SHORT).show();
+            android.content.Intent intent = new android.content.Intent(getContext(),
+                    com.example.pap_findu.ChatActivity.class);
+            startActivity(intent);
         });
 
         return root;
diff --git a/app/src/main/java/com/example/pap_findu/ui/profile/ProfileFragment.java b/app/src/main/java/com/example/pap_findu/ui/profile/ProfileFragment.java
index d35f051..dd49df7 100644
--- a/app/src/main/java/com/example/pap_findu/ui/profile/ProfileFragment.java
+++ b/app/src/main/java/com/example/pap_findu/ui/profile/ProfileFragment.java
@@ -20,6 +20,19 @@ public class ProfileFragment extends Fragment {
             ViewGroup container, Bundle savedInstanceState) {
         binding = FragmentProfileBinding.inflate(inflater, container, false);
         View root = binding.getRoot();
+
+        binding.btnLogout.setOnClickListener(v -> {
+            // Sign out of Firebase
+            com.google.firebase.auth.FirebaseAuth.getInstance().signOut();
+
+            // Navigate back to Login Activity
+            android.content.Intent intent = new android.content.Intent(getActivity(),
+                    com.example.pap_findu.login_activity.class);
+            intent.setFlags(
+                    android.content.Intent.FLAG_ACTIVITY_NEW_TASK | android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            startActivity(intent);
+        });
+
         return root;
     }
 
diff --git a/app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java b/app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java
index 419e1cc..d370a01 100644
--- a/app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java
+++ b/app/src/main/java/com/example/pap_findu/ui/zones/ZonesFragment.java
@@ -16,9 +16,17 @@ public class ZonesFragment extends Fragment {
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+            Bundle savedInstanceState) {
         binding = FragmentZonesBinding.inflate(inflater, container, false);
-        return binding.getRoot();
+        View root = binding.getRoot();
+
+        binding.addZoneButton.setOnClickListener(v -> {
+            android.content.Intent intent = new android.content.Intent(getContext(),
+                    com.example.pap_findu.AddZoneActivity.class);
+            startActivity(intent);
+        });
+
+        return root;
     }
 
     @Override
diff --git a/app/src/main/res/color/bottom_nav_selector.xml b/app/src/main/res/color/bottom_nav_selector.xml
index e878464..1130154 100644
--- a/app/src/main/res/color/bottom_nav_selector.xml
+++ b/app/src/main/res/color/bottom_nav_selector.xml
@@ -10,3 +10,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_alert_icon_info.xml b/app/src/main/res/drawable/bg_alert_icon_info.xml
index 8802694..8becc8c 100644
--- a/app/src/main/res/drawable/bg_alert_icon_info.xml
+++ b/app/src/main/res/drawable/bg_alert_icon_info.xml
@@ -11,3 +11,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_alert_icon_warning.xml b/app/src/main/res/drawable/bg_alert_icon_warning.xml
index 220177a..f27fdc8 100644
--- a/app/src/main/res/drawable/bg_alert_icon_warning.xml
+++ b/app/src/main/res/drawable/bg_alert_icon_warning.xml
@@ -11,3 +11,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_avatar_placeholder.xml b/app/src/main/res/drawable/bg_avatar_placeholder.xml
index 8d1343b..5b67d39 100644
--- a/app/src/main/res/drawable/bg_avatar_placeholder.xml
+++ b/app/src/main/res/drawable/bg_avatar_placeholder.xml
@@ -10,3 +10,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_badge.xml b/app/src/main/res/drawable/bg_badge.xml
index e11c62f..afa0fb3 100644
--- a/app/src/main/res/drawable/bg_badge.xml
+++ b/app/src/main/res/drawable/bg_badge.xml
@@ -10,3 +10,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_bottom_nav.xml b/app/src/main/res/drawable/bg_bottom_nav.xml
index 6d08638..0e19a78 100644
--- a/app/src/main/res/drawable/bg_bottom_nav.xml
+++ b/app/src/main/res/drawable/bg_bottom_nav.xml
@@ -20,3 +20,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_chip_muted.xml b/app/src/main/res/drawable/bg_chip_muted.xml
index 35fa013..7e1c843 100644
--- a/app/src/main/res/drawable/bg_chip_muted.xml
+++ b/app/src/main/res/drawable/bg_chip_muted.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_chip_success.xml b/app/src/main/res/drawable/bg_chip_success.xml
index bc0046d..16be6bc 100644
--- a/app/src/main/res/drawable/bg_chip_success.xml
+++ b/app/src/main/res/drawable/bg_chip_success.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_chip_warning.xml b/app/src/main/res/drawable/bg_chip_warning.xml
index 7e84c61..9a7129b 100644
--- a/app/src/main/res/drawable/bg_chip_warning.xml
+++ b/app/src/main/res/drawable/bg_chip_warning.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_filter_chip_active.xml b/app/src/main/res/drawable/bg_filter_chip_active.xml
index a68e464..e7b3962 100644
--- a/app/src/main/res/drawable/bg_filter_chip_active.xml
+++ b/app/src/main/res/drawable/bg_filter_chip_active.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_filter_chip_neutral.xml b/app/src/main/res/drawable/bg_filter_chip_neutral.xml
index bf3c86a..2a1f281 100644
--- a/app/src/main/res/drawable/bg_filter_chip_neutral.xml
+++ b/app/src/main/res/drawable/bg_filter_chip_neutral.xml
@@ -19,3 +19,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_header_top.xml b/app/src/main/res/drawable/bg_header_top.xml
index decc955..e262d01 100644
--- a/app/src/main/res/drawable/bg_header_top.xml
+++ b/app/src/main/res/drawable/bg_header_top.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_map_card.xml b/app/src/main/res/drawable/bg_map_card.xml
index 2aa5b73..2994ca0 100644
--- a/app/src/main/res/drawable/bg_map_card.xml
+++ b/app/src/main/res/drawable/bg_map_card.xml
@@ -23,3 +23,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_map_surface.xml b/app/src/main/res/drawable/bg_map_surface.xml
index 5be1d7b..f7e6a97 100644
--- a/app/src/main/res/drawable/bg_map_surface.xml
+++ b/app/src/main/res/drawable/bg_map_surface.xml
@@ -11,3 +11,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_marker_avatar.xml b/app/src/main/res/drawable/bg_marker_avatar.xml
index 26b6e6a..1e5c251 100644
--- a/app/src/main/res/drawable/bg_marker_avatar.xml
+++ b/app/src/main/res/drawable/bg_marker_avatar.xml
@@ -15,3 +15,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_marker_label.xml b/app/src/main/res/drawable/bg_marker_label.xml
index bd292d2..d21ca7b 100644
--- a/app/src/main/res/drawable/bg_marker_label.xml
+++ b/app/src/main/res/drawable/bg_marker_label.xml
@@ -19,3 +19,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_marker_user.xml b/app/src/main/res/drawable/bg_marker_user.xml
index 94b1ebc..dbb69a7 100644
--- a/app/src/main/res/drawable/bg_marker_user.xml
+++ b/app/src/main/res/drawable/bg_marker_user.xml
@@ -14,3 +14,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_safe_banner_icon.xml b/app/src/main/res/drawable/bg_safe_banner_icon.xml
index 6fe6fba..9895cea 100644
--- a/app/src/main/res/drawable/bg_safe_banner_icon.xml
+++ b/app/src/main/res/drawable/bg_safe_banner_icon.xml
@@ -11,3 +11,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_safe_zone_circle.xml b/app/src/main/res/drawable/bg_safe_zone_circle.xml
index df5c4b8..a6c9c7e 100644
--- a/app/src/main/res/drawable/bg_safe_zone_circle.xml
+++ b/app/src/main/res/drawable/bg_safe_zone_circle.xml
@@ -13,3 +13,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_status_online.xml b/app/src/main/res/drawable/bg_status_online.xml
index 55fb4ce..4ed4c3f 100644
--- a/app/src/main/res/drawable/bg_status_online.xml
+++ b/app/src/main/res/drawable/bg_status_online.xml
@@ -11,3 +11,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_zone_icon_primary.xml b/app/src/main/res/drawable/bg_zone_icon_primary.xml
index cb5def5..d2aaf93 100644
--- a/app/src/main/res/drawable/bg_zone_icon_primary.xml
+++ b/app/src/main/res/drawable/bg_zone_icon_primary.xml
@@ -11,3 +11,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_zone_icon_secondary.xml b/app/src/main/res/drawable/bg_zone_icon_secondary.xml
index 3ae184b..8dd6c2c 100644
--- a/app/src/main/res/drawable/bg_zone_icon_secondary.xml
+++ b/app/src/main/res/drawable/bg_zone_icon_secondary.xml
@@ -11,3 +11,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/bg_zoom_button.xml b/app/src/main/res/drawable/bg_zoom_button.xml
index 1708b73..3d6b399 100644
--- a/app/src/main/res/drawable/bg_zoom_button.xml
+++ b/app/src/main/res/drawable/bg_zoom_button.xml
@@ -23,3 +23,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_alert_warning.xml b/app/src/main/res/drawable/ic_alert_warning.xml
index 5e9b322..44cb552 100644
--- a/app/src/main/res/drawable/ic_alert_warning.xml
+++ b/app/src/main/res/drawable/ic_alert_warning.xml
@@ -15,3 +15,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_battery.xml b/app/src/main/res/drawable/ic_battery.xml
index 31e931b..707195a 100644
--- a/app/src/main/res/drawable/ic_battery.xml
+++ b/app/src/main/res/drawable/ic_battery.xml
@@ -18,3 +18,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_chat_bubble.xml b/app/src/main/res/drawable/ic_chat_bubble.xml
index ee34d5b..052f483 100644
--- a/app/src/main/res/drawable/ic_chat_bubble.xml
+++ b/app/src/main/res/drawable/ic_chat_bubble.xml
@@ -15,3 +15,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index a521585..8cd493c 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_location_pin.xml b/app/src/main/res/drawable/ic_location_pin.xml
index 8c2f2df..eb2d302 100644
--- a/app/src/main/res/drawable/ic_location_pin.xml
+++ b/app/src/main/res/drawable/ic_location_pin.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_nav_alerts.xml b/app/src/main/res/drawable/ic_nav_alerts.xml
index 83a170f..8860a55 100644
--- a/app/src/main/res/drawable/ic_nav_alerts.xml
+++ b/app/src/main/res/drawable/ic_nav_alerts.xml
@@ -15,3 +15,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_nav_home.xml b/app/src/main/res/drawable/ic_nav_home.xml
index 6268111..1d74f48 100644
--- a/app/src/main/res/drawable/ic_nav_home.xml
+++ b/app/src/main/res/drawable/ic_nav_home.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_nav_zones.xml b/app/src/main/res/drawable/ic_nav_zones.xml
index 5dbc103..ba31300 100644
--- a/app/src/main/res/drawable/ic_nav_zones.xml
+++ b/app/src/main/res/drawable/ic_nav_zones.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_navigation_plane.xml b/app/src/main/res/drawable/ic_navigation_plane.xml
index 21c2cd9..6976b58 100644
--- a/app/src/main/res/drawable/ic_navigation_plane.xml
+++ b/app/src/main/res/drawable/ic_navigation_plane.xml
@@ -15,3 +15,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml
index fb71116..95a3a45 100644
--- a/app/src/main/res/drawable/ic_profile.xml
+++ b/app/src/main/res/drawable/ic_profile.xml
@@ -16,3 +16,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_signal_gps.xml b/app/src/main/res/drawable/ic_signal_gps.xml
index 8774a84..c85271b 100644
--- a/app/src/main/res/drawable/ic_signal_gps.xml
+++ b/app/src/main/res/drawable/ic_signal_gps.xml
@@ -18,3 +18,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_zoom_minus.xml b/app/src/main/res/drawable/ic_zoom_minus.xml
index 89a5ade..e81a546 100644
--- a/app/src/main/res/drawable/ic_zoom_minus.xml
+++ b/app/src/main/res/drawable/ic_zoom_minus.xml
@@ -15,3 +15,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/drawable/ic_zoom_plus.xml b/app/src/main/res/drawable/ic_zoom_plus.xml
index 51698d5..786e484 100644
--- a/app/src/main/res/drawable/ic_zoom_plus.xml
+++ b/app/src/main/res/drawable/ic_zoom_plus.xml
@@ -15,3 +15,5 @@
 
 
 
+
+
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index 397a8b5..3bf1fe5 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -1,19 +1,334 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#F6F7FB"
+    android:paddingBottom="96dp"
     tools:context=".ui.history.HistoryFragment">
 
-    <TextView
-        android:id="@+id/text_history"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Histórico"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:orientation="vertical"
+        android:paddingBottom="24dp">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="190dp">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="190dp"
+                android:background="@drawable/bg_header_top" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Histórico de Atividade"
+                    android:textColor="#FFFFFF"
+                    android:textSize="26sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="Linha do tempo completa de eventos"
+                    android:textColor="#E1EAFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </FrameLayout>
+
+        <!-- Date Header -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="Hoje, 12 Dezembro"
+            android:textColor="#6B7280"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <!-- Timeline Item 1 -->
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            app:cardBackgroundColor="#FFFFFF"
+            app:cardCornerRadius="20dp"
+            app:strokeColor="#E1E5EF"
+            app:strokeWidth="1dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <FrameLayout
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="@drawable/bg_zone_icon_primary">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:text="🏠"
+                        android:textSize="20sp" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Chegou a Casa"
+                        android:textColor="#0F172A"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Localização segura confirmada"
+                        android:textColor="#6B7280"
+                        android:textSize="13sp" />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="13:30"
+                    android:textColor="#9CA3AF"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <!-- Timeline Item 2 -->
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            app:cardBackgroundColor="#FFFFFF"
+            app:cardCornerRadius="20dp"
+            app:strokeColor="#E1E5EF"
+            app:strokeWidth="1dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <FrameLayout
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="@drawable/bg_alert_icon_warning">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:text="⚠️"
+                        android:textSize="20sp" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Saiu da Area Escolar"
+                        android:textColor="#0F172A"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Saída antes do horário previsto"
+                        android:textColor="#B45309"
+                        android:textSize="13sp" />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="12:35"
+                    android:textColor="#B45309"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <!-- Timeline Item 3 -->
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            app:cardBackgroundColor="#FFFFFF"
+            app:cardCornerRadius="20dp"
+            app:strokeColor="#E1E5EF"
+            app:strokeWidth="1dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <FrameLayout
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="@drawable/bg_zone_icon_secondary">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:text="🏫"
+                        android:textSize="20sp" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Chegou à Escola"
+                        android:textColor="#0F172A"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Dentro do horário esperado"
+                        android:textColor="#6B7280"
+                        android:textSize="13sp" />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="08:45"
+                    android:textColor="#9CA3AF"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <!-- Date Header 2 -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="Ontem, 11 Dezembro"
+            android:textColor="#6B7280"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <!-- Timeline Item 4 -->
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            app:cardBackgroundColor="#FFFFFF"
+            app:cardCornerRadius="20dp"
+            app:strokeColor="#E1E5EF"
+            app:strokeWidth="1dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="16dp">
+
+                <FrameLayout
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="@drawable/bg_zone_icon_primary">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:text="🏠"
+                        android:textSize="20sp" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Chegou a Casa"
+                        android:textColor="#0F172A"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Localização segura confirmada"
+                        android:textColor="#6B7280"
+                        android:textSize="13sp" />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="18:15"
+                    android:textColor="#9CA3AF"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 5db3370..269fa45 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -245,14 +245,11 @@
                     android:clipToPadding="false"
                     android:padding="24dp">
 
-                    <ImageView
-                        android:id="@+id/mapTexture"
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:alpha="0.35"
-                        android:contentDescription="@string/header_title"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/zonas"
+                    <androidx.fragment.app.FragmentContainerView
+                        android:id="@+id/map"
+                        android:name="com.google.android.gms.maps.SupportMapFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index e766f02..082826c 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -1,19 +1,279 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#F6F7FB"
+    android:paddingBottom="96dp"
     tools:context=".ui.profile.ProfileFragment">
 
-    <TextView
-        android:id="@+id/text_profile"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Perfil"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:orientation="vertical"
+        android:paddingBottom="24dp">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="220dp">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="220dp"
+                android:background="@drawable/bg_header_top" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:background="#FFFFFF"
+                    android:padding="2dp"
+                    app:shapeAppearanceOverlay="@style/ShapeAppearance.MaterialComponents.MediumComponent"
+                    app:strokeColor="#FFFFFF"
+                    app:strokeWidth="2dp"
+                    android:src="@drawable/logo" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:text="Maria Silva"
+                    android:textColor="#FFFFFF"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:text="maria.silva@email.com"
+                    android:textColor="#E1EAFF"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </FrameLayout>
+
+        <!-- Account Settings Section -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="Definições de Conta"
+            android:textColor="#6B7280"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            app:cardBackgroundColor="#FFFFFF"
+            app:cardCornerRadius="20dp"
+            app:cardElevation="2dp"
+            app:strokeColor="#E1E5EF"
+            app:strokeWidth="1dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <!-- Item 1 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@android:drawable/ic_menu_edit"
+                        app:tint="#4B5563" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_weight="1"
+                        android:text="Editar Perfil"
+                        android:textColor="#1F2937"
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:src="@android:drawable/ic_media_play"
+                        app:tint="#9CA3AF"
+                        android:rotation="0" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#F3F4F6" />
+
+                <!-- Item 2 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@android:drawable/ic_lock_idle_lock"
+                        app:tint="#4B5563" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_weight="1"
+                        android:text="Segurança e Senha"
+                        android:textColor="#1F2937"
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:src="@android:drawable/ic_media_play"
+                        app:tint="#9CA3AF"
+                        android:rotation="0" />
+                </LinearLayout>
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <!-- App Settings Section -->
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="24dp"
+            android:text="Aplicação"
+            android:textColor="#6B7280"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="20dp"
+            app:cardBackgroundColor="#FFFFFF"
+            app:cardCornerRadius="20dp"
+            app:cardElevation="2dp"
+            app:strokeColor="#E1E5EF"
+            app:strokeWidth="1dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <!-- Item 1 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@android:drawable/ic_popup_sync"
+                        app:tint="#4B5563" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_weight="1"
+                        android:text="Notificações"
+                        android:textColor="#1F2937"
+                        android:textSize="16sp" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#F3F4F6" />
+
+                <!-- Item 2 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:padding="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@android:drawable/ic_dialog_info"
+                        app:tint="#4B5563" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:layout_weight="1"
+                        android:text="Sobre a App"
+                        android:textColor="#1F2937"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="v1.0.2"
+                        android:textColor="#9CA3AF" />
+                </LinearLayout>
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnLogout"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="24dp"
+            android:text="Terminar Sessão"
+            android:textColor="#EF4444"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:text="FindU Inc. © 2024"
+            android:textColor="#D1D5DB"
+            android:textSize="12sp" />
+
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_zones.xml b/app/src/main/res/layout/fragment_zones.xml
index 4d0e193..9d9c464 100644
--- a/app/src/main/res/layout/fragment_zones.xml
+++ b/app/src/main/res/layout/fragment_zones.xml
@@ -82,7 +82,7 @@
             android:layout_marginEnd="24dp"
             android:backgroundTint="#1F6AEF"
             app:cornerRadius="16dp"
-            app:icon="@android:drawable/ic_input_add"
+            app:icon="@drawable/ic_add"
             app:iconTint="#FFFFFF"
             android:text="@string/zones_add_button"
             android:textAllCaps="false"
@@ -114,8 +114,8 @@
                     android:padding="20dp">
 
                     <LinearLayout
-                        android.layout_width="match_parent"
-                        android.layout_height="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b21948b..45b85a0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,9 +26,9 @@
     <string name="zones_summary_title">2 zonas monitorizadas</string>
     <string name="zones_summary_desc">Todas as entradas e saídas são notificadas em tempo real.</string>
     <string name="zones_add_button">Adicionar nova zona</string>
-    <string name="zones_school_name">Escola Secundária</string>
-    <string name="zones_school_desc">Chegada prevista 08:45</string>
-    <string name="zones_status_safe">Ativa</string>
+    <string name="zones_school_name">Escola Profissional de Vila do Conde</string>
+    <string name="zones_school_desc">Av. Júlio Graça, Vila do Conde</string>
+    <string name="zones_status_safe">Seguro</string>
     <string name="zones_chip_entry">Entrada confirmada</string>
     <string name="zones_last_update">Atualizado há 2 min</string>
     <string name="zones_home_name">Casa</string>