diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c338..93fa3ad 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="deploymentTargetDropDown">
     <value>
-      <entry key="app">
+      <entry key="Unnamed">
         <State />
       </entry>
     </value>
diff --git a/app/src/main/java/com/mobile/komyusagip/CreatePost.kt b/app/src/main/java/com/mobile/komyusagip/CreatePost.kt
index ab27f9e..2cee2c5 100644
--- a/app/src/main/java/com/mobile/komyusagip/CreatePost.kt
+++ b/app/src/main/java/com/mobile/komyusagip/CreatePost.kt
@@ -1,5 +1,7 @@
 package com.mobile.komyusagip
 
+import android.app.DatePickerDialog
+import android.app.TimePickerDialog
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
@@ -8,6 +10,8 @@ import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.textfield.TextInputEditText
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
+import java.util.Calendar
+import java.util.Locale
 
 class CreatePost : AppCompatActivity() {
     private val auth = FirebaseAuth.getInstance()
@@ -22,6 +26,48 @@ class CreatePost : AppCompatActivity() {
             val intent = Intent(this, Home::class.java)
             startActivity(intent)
         }
+        val timeTextField = findViewById<EditText>(R.id.timeTextField)
+        val timePickerButton = findViewById<Button>(R.id.timePickerButton)
+
+        val timePickerDialog = TimePickerDialog(
+            this,
+            { _, hourOfDay, minute ->
+                val selectedTime = formatTime(hourOfDay, minute)
+                timeTextField.setText(selectedTime)
+            },
+            12, // Initial hour (you can set your own default)
+            0,  // Initial minute (you can set your own default)
+            false // Set to false for 12-hour format
+        )
+
+        timePickerButton.setOnClickListener {
+            timePickerDialog.show()
+        }
+
+        timePickerButton.setOnClickListener {
+            timePickerDialog.show()
+        }
+        val dateTextField = findViewById<EditText>(R.id.dateTextField)
+        val datePickerButton = findViewById<Button>(R.id.datePickerButton)
+        val calendar = Calendar.getInstance()
+        val initialYear = calendar.get(Calendar.YEAR)
+        val initialMonth = calendar.get(Calendar.MONTH)
+        val initialDay = calendar.get(Calendar.DAY_OF_MONTH)
+
+        val datePickerDialog = DatePickerDialog(
+            this,
+            { _, year, month, day ->
+                val selectedDate = formatDate(year, month + 1, day)
+                dateTextField.setText(selectedDate)
+            },
+            initialYear,
+            initialMonth,
+            initialDay
+        )
+
+        datePickerButton.setOnClickListener {
+            datePickerDialog.show()
+        }
 
         val dropdownTypeOfCrime = findViewById<Spinner>(R.id.spinnerTypeOfCrime)
         val spinnerSelectedValueTextView = findViewById<TextView>(R.id.selectedSpinnerTypeOfCrime)
@@ -52,7 +98,31 @@ class CreatePost : AppCompatActivity() {
             validateAndSubmit()
         }
     }
+    private fun formatTime(hour: Int, minute: Int): String {
+        val isAM = hour < 12
+        val amPm = if (isAM) "AM" else "PM"
+        val hourFormatted = if (hour % 12 == 0) 12 else hour % 12
+        return String.format(Locale.getDefault(), "%02d:%02d %s", hourFormatted, minute, amPm)
+    }
+
+    private fun formatDate(year: Int, month: Int, day: Int): String {
+        return String.format(Locale.getDefault(), "%02d-%02d-%04d", month, day, year)
+    }
+    private fun showTimePickerDialog(initialHour: Int, initialMinute: Int) {
+        val timePicker = TimePickerDialog(
+            this,
+            TimePickerDialog.OnTimeSetListener { view: TimePicker?, hourOfDay: Int, minute: Int ->
+                // Do something with the selected time
+                val selectedTime = "$hourOfDay:$minute"
+                // You can update the UI or perform any actions with the selected time
+            },
+            initialHour,
+            initialMinute,
+            false // Set to true if you want 24-hour format
+        )
 
+        timePicker.show()
+    }
     private fun validateAndSubmit() {
         val addDescription = findViewById<TextInputEditText>(R.id.addDesciption)
         val spinnerSelectedValueTextView = findViewById<TextView>(R.id.selectedSpinnerTypeOfCrime)
@@ -60,11 +130,20 @@ class CreatePost : AppCompatActivity() {
         val description = addDescription.text?.toString()?.trim()
         val typeOfCrime = spinnerSelectedValueTextView.text.toString()
 
-        if (description.isNullOrEmpty()) {
+        if (typeOfCrime.isNullOrEmpty() && description.isNullOrEmpty()) {
+            spinnerSelectedValueTextView.error = "Please select the type of crime"
+            addDescription.error = "Add description"
+            return
+        } else if (typeOfCrime.isNullOrEmpty()) {
+            spinnerSelectedValueTextView.error = "Please select the type of crime"
+            return
+        } else if (description.isNullOrEmpty()) {
             addDescription.error = "Add description"
             return
         }
 
+
+
         // Get current user ID
         val userId = auth.currentUser?.uid
         userId?.let { uid ->
diff --git a/app/src/main/java/com/mobile/komyusagip/EmergencyContacts.kt b/app/src/main/java/com/mobile/komyusagip/EmergencyContacts.kt
index 942b09f..d7de37e 100644
--- a/app/src/main/java/com/mobile/komyusagip/EmergencyContacts.kt
+++ b/app/src/main/java/com/mobile/komyusagip/EmergencyContacts.kt
@@ -1,12 +1,12 @@
 package com.mobile.komyusagip
-import android.content.Intent
+
 import android.os.Bundle
-import android.widget.Button
 import android.widget.ImageButton
 import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 
-class EmergencyContacts : AppCompatActivity()  {
+class EmergencyContacts : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.page_emergency_contacts)
@@ -16,7 +16,6 @@ class EmergencyContacts : AppCompatActivity()  {
             finish()
         }
 
-
         // Reference the LinearLayout where you want to add the contact containers
         val contactContainerLayout = findViewById<LinearLayout>(R.id.contactCont)
 
@@ -31,18 +30,51 @@ class EmergencyContacts : AppCompatActivity()  {
             R.layout.contact_components,
             R.layout.contact_components,
             R.layout.contact_components,
-            R.layout.contact_components,
-            R.layout.contact_components,
-            R.layout.contact_components,
             R.layout.contact_components
+            // Add more layout IDs as needed
         )
 
-        for (contactContainerId in contactContainerIds) {
+        val contactNames = arrayOf(
+            "John Doe",
+            "Jane Doe",
+            "Bob Smith",
+            "Alice Johnson",
+            "David Lee",
+            "Ella Martinez",
+            "Michael Cruz",
+            "Sophia Reyes",
+            "William Garcia",
+            "Olivia Rodriguez"
+            // Add more contact names as needed
+        )
+
+        val contactNumbers = arrayOf(
+            "+639123456789",
+            "+639987654321",
+            "+639555123456",
+            "+639876543210",
+            "+639111223344",
+            "+639876543210",
+            "+639222334455",
+            "+639333445566",
+            "+639444556677",
+            "+639555667788"
+            // Add more valid Philippine phone numbers as needed
+        )
+
+        for (i in contactContainerIds.indices) {
             val inflater = layoutInflater
-            val contactContainer = inflater.inflate(contactContainerId, null)
+            val contactContainer = inflater.inflate(contactContainerIds[i], null)
 
             // You can customize the contact container programmatically if needed
 
+            // Set contact details
+            val contactName = contactContainer.findViewById<TextView>(R.id.contactName)
+            contactName.text = contactNames[i]
+
+            val contactNumber = contactContainer.findViewById<TextView>(R.id.contactNumber)
+            contactNumber.text = contactNumbers[i]
+
             // Add the contact container to the LinearLayout
             contactContainerLayout.addView(contactContainer)
         }
diff --git a/app/src/main/java/com/mobile/komyusagip/EmergencyHotline.kt b/app/src/main/java/com/mobile/komyusagip/EmergencyHotline.kt
index c8d7a2d..def08c2 100644
--- a/app/src/main/java/com/mobile/komyusagip/EmergencyHotline.kt
+++ b/app/src/main/java/com/mobile/komyusagip/EmergencyHotline.kt
@@ -1,12 +1,15 @@
 package com.mobile.komyusagip
+
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
-import android.widget.Button
+import android.view.View
 import android.widget.ImageButton
 import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 
-class EmergencyHotline : AppCompatActivity()  {
+class EmergencyHotline : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.page_emergency_hotlines)
@@ -15,10 +18,11 @@ class EmergencyHotline : AppCompatActivity()  {
         backToHome.setOnClickListener {
             finish()
         }
-        // Reference the LinearLayout where you want to add the contact containers
+
+        // Reference the LinearLayout where you want to add the hotline containers
         val hotlineContainerLayout = findViewById<LinearLayout>(R.id.hotlineCont)
 
-        // Assuming 'contact_container.xml' is the layout file for your contact container
+        // Assuming 'hotline_components.xml' is the layout file for your hotline container
         val hotlineContainerIds = arrayOf(
             R.layout.hotline_components,
             R.layout.hotline_components,
@@ -29,20 +33,66 @@ class EmergencyHotline : AppCompatActivity()  {
             R.layout.hotline_components,
             R.layout.hotline_components,
             R.layout.hotline_components,
-            R.layout.hotline_components,
-            R.layout.hotline_components,
-            R.layout.hotline_components,
             R.layout.hotline_components
+            // Add more layout IDs as needed
+        )
+
+        val hotlineNames = arrayOf(
+            "Philippine Coast Guard",
+            "Philippine National Police",
+            "Bureau of Fire Protection",
+            "National Disaster Risk Reduction and Management Council",
+            "Red Cross Philippines",
+            "Philippine General Hospital",
+            "National Poison Management and Control Center",
+            "National Center for Mental Health",
+            "Department of Health Hotline",
+            "Emergency Medical Services"
+            // Add more hotline names as needed
         )
 
-        for (contactContainerId in hotlineContainerIds) {
+        val hotlineNumbers = arrayOf(
+            "(02) 527-8481",
+            "117",
+            "(02) 729-5166",
+            "(02) 8911-1406",
+            "(02) 790-2383",
+            "(02) 554-8400",
+            "(02) 8403-5673",
+            "(02) 7989-8727",
+            "(02) 894-COVID",
+            "0917-899-8956"
+            // Add more valid Philippine phone numbers as needed
+        )
+
+        for (i in hotlineContainerIds.indices) {
             val inflater = layoutInflater
-            val contactContainer = inflater.inflate(contactContainerId, null)
+            val hotlineContainer = inflater.inflate(hotlineContainerIds[i], null)
+
+            // You can customize the hotline container programmatically if needed
+
+            // Set hotline details
+            val hotlineName = hotlineContainer.findViewById<TextView>(R.id.contactName)
+            hotlineName.text = hotlineNames[i]
+
+            val hotlineNumber = hotlineContainer.findViewById<TextView>(R.id.contactNumber)
+            hotlineNumber.text = hotlineNumbers[i]
 
-            // You can customize the contact container programmatically if needed
+            val callButton = hotlineContainer.findViewById<View>(R.id.loginAuth)
+            callButton.setOnClickListener {
+                dialPhoneNumber(hotlineNumbers[i])
+            }
 
-            // Add the contact container to the LinearLayout
-            hotlineContainerLayout.addView(contactContainer)
+            // Add the hotline container to the LinearLayout
+            hotlineContainerLayout.addView(hotlineContainer)
+        }
+
+    }
+    private fun dialPhoneNumber(phoneNumber: String) {
+        val dialIntent = Intent(Intent.ACTION_DIAL)
+        dialIntent.data = Uri.parse("tel:$phoneNumber")
+        if (dialIntent.resolveActivity(packageManager) != null) {
+            startActivity(dialIntent)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mobile/komyusagip/HomeFragment.kt b/app/src/main/java/com/mobile/komyusagip/HomeFragment.kt
index cd47c2e..7bde748 100644
--- a/app/src/main/java/com/mobile/komyusagip/HomeFragment.kt
+++ b/app/src/main/java/com/mobile/komyusagip/HomeFragment.kt
@@ -2,19 +2,30 @@ package com.mobile.komyusagip
 
 import CrimeReport
 import CrimeReportAdapter
+import android.content.ContentValues.TAG
+
 import android.os.Bundle
+import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.firestore.FirebaseFirestore
+import com.squareup.picasso.Picasso
 
 class HomeFragment : Fragment() {
 
     private lateinit var recyclerView: RecyclerView
     private lateinit var adapter: CrimeReportAdapter
 
+    private val auth = FirebaseAuth.getInstance()
+    private val db = FirebaseFirestore.getInstance()
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -67,33 +78,120 @@ class HomeFragment : Fragment() {
         recyclerView.adapter = adapter
     }
 
+
     private fun loadMostRecentCrimeReports() {
-        // Implement logic to load most recent crime reports
-        val mostRecentCrimeReports = listOf(
-            CrimeReport("Theft", "Description of theft incident"),
-            CrimeReport("Assault", "Description of assault incident")
-            // Add more crime reports as needed
-        )
-        adapter.setData(mostRecentCrimeReports)
+        // Get the current user's ID
+        val userId = auth.currentUser?.uid
+
+        // Check if the user is authenticated
+        userId?.let { uid ->
+            // Reference to the user's "post" subcollection
+            val userPostRef = db.collection("user").document(uid).collection("post")
+
+            // Query Firestore to fetch crime reports in the user's area
+            userPostRef
+                .get()
+                .addOnSuccessListener { documents ->
+                    val crimeReports = mutableListOf<CrimeReport>()
+
+                    for (document in documents) {
+                        val typeOfCrime = document.getString("typeOfCrime")
+                        val description = document.getString("description")
+
+                        typeOfCrime?.let { crimeType ->
+                            description?.let { desc ->
+                                val crimeReport = CrimeReport(crimeType, desc)
+                                crimeReports.add(crimeReport)
+                            }
+                        }
+                    }
+
+                    // Set data to the adapter after populating the crimeReports list
+                    adapter.setData(crimeReports)
+                }
+                .addOnFailureListener { exception ->
+                    // Handle any errors
+                    Log.e(TAG, "Error fetching crime reports: $exception")
+                }
+        }
     }
 
     private fun loadInYourAreaCrimeReports() {
-        // Implement logic to load crime reports in user's area
-        val inYourAreaCrimeReports = listOf(
-            CrimeReport("Vandalism", "Description of vandalism incident"),
-            CrimeReport("Burglary", "Description of burglary incident")
-            // Add more crime reports as needed
-        )
-        adapter.setData(inYourAreaCrimeReports)
+        // Get the current user's ID
+        val userId = auth.currentUser?.uid
+
+        // Check if the user is authenticated
+        userId?.let { uid ->
+            // Reference to the user's "post" subcollection
+            val userPostRef = db.collection("user").document(uid).collection("post")
+
+            // Query Firestore to fetch crime reports in the user's area
+            userPostRef.get().addOnSuccessListener { documents ->
+                val crimeReports = mutableListOf<CrimeReport>()
+
+                // Fetch user profile data
+                val profileRef = db.collection("user").document(uid).collection("profiles")
+                profileRef.get().addOnSuccessListener { profileQuerySnapshot ->
+                    if (!profileQuerySnapshot.isEmpty) {
+                        val profileDocument = profileQuerySnapshot.documents[0]
+                        // Fetch data from the profile document
+                        val imageUrl = profileDocument.getString("imageUrl")
+                        val username = profileDocument.getString("username")
+
+                        // Process each crime report document
+                        for (document in documents) {
+                            val typeOfCrime = document.getString("typeOfCrime")
+                            val description = document.getString("description")
+
+                            typeOfCrime?.let { crimeType ->
+                                description?.let { desc ->
+                                    val crimeReport = CrimeReport(crimeType, desc)
+                                    crimeReports.add(crimeReport)
+                                }
+                            }
+                        }
+
+                        // Update profile UI
+                        updateProfileUI(requireView(), username, imageUrl)
+
+                        // Set data to the adapter after populating the crimeReports list
+                        adapter.setData(crimeReports)
+                    }
+                }.addOnFailureListener { exception ->
+                    // Handle any errors
+                    Log.e(TAG, "Error fetching profile data: $exception")
+                }
+            }.addOnFailureListener { exception ->
+                // Handle any errors
+                Log.e(TAG, "Error fetching crime reports: $exception")
+            }
+        }
+    }
+
+    private fun updateProfileUI(view: View, username: String?, imageUrl: String?) {
+        // Update profile picture
+        val profilePicture = view.findViewById<ImageView>(R.id.ProfilePicture)
+        val profileUsername = view.findViewById<TextView>(R.id.ProfileUsername)
+
+        imageUrl?.let {
+            Picasso.get().load(it).into(profilePicture)
+        }
+        // Update username
+        val userWithAtSymbol = "@$username"
+        profileUsername?.text = userWithAtSymbol
     }
 
+
+
+
+
     private fun loadCommunityWatchCrimeReports() {
-        // Implement logic to load crime reports for community watch
-        val communityWatchCrimeReports = listOf(
-            CrimeReport("Drug Trafficking", "Description of drug trafficking incident"),
-            CrimeReport("Hit and Run", "Description of hit and run incident")
-            // Add more crime reports as needed
-        )
-        adapter.setData(communityWatchCrimeReports)
+            // Implement logic to load crime reports for community watch
+            val communityWatchCrimeReports = listOf(
+                CrimeReport("Drug Trafficking", "Description of drug trafficking incident"),
+                CrimeReport("Hit and Run", "Description of hit and run incident")
+                // Add more crime reports as needed
+            )
+            adapter.setData(communityWatchCrimeReports)
+        }
     }
-}
diff --git a/app/src/main/java/com/mobile/komyusagip/ReportsFragment.kt b/app/src/main/java/com/mobile/komyusagip/ReportsFragment.kt
index 970f141..f640551 100644
--- a/app/src/main/java/com/mobile/komyusagip/ReportsFragment.kt
+++ b/app/src/main/java/com/mobile/komyusagip/ReportsFragment.kt
@@ -19,8 +19,8 @@ class ReportsFragment : Fragment() {
         val view = inflater.inflate(R.layout.fragment_reports, container, false)
 
         // Sample data for location and type of crime
-        val locations = arrayOf("Location 1", "Location 2", "Location 3")
-        val crimeTypes = arrayOf("Type 1", "Type 2", "Type 3")
+        val locations = arrayOf("Select Locations:","Zone 1", "Zone 2", "Zone 3", "Zone 4", "Zone 5", "Zone 6")
+        val crimeTypes = arrayOf("Select Crime:","Bribery","Abuse","Murder", "Rape", "Holdup", "Snatch")
 
         // ArrayAdapter for populating the Spinners
         val locationAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, locations)
diff --git a/app/src/main/java/com/mobile/komyusagip/home feed/CrimeReportAdapter.kt b/app/src/main/java/com/mobile/komyusagip/home feed/CrimeReportAdapter.kt
index d1574d4..b42e5a3 100644
--- a/app/src/main/java/com/mobile/komyusagip/home feed/CrimeReportAdapter.kt	
+++ b/app/src/main/java/com/mobile/komyusagip/home feed/CrimeReportAdapter.kt	
@@ -1,6 +1,7 @@
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageButton
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.mobile.komyusagip.R
@@ -11,6 +12,29 @@ class CrimeReportAdapter(private var crimeReports: List<CrimeReport>) :
     inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val crimeTypeTextView: TextView = itemView.findViewById(R.id.crimeTypeTextView)
         val descriptionTextView: TextView = itemView.findViewById(R.id.descriptionTextView)
+        val likeButton: ImageButton = itemView.findViewById(R.id.likeButton)
+        var isLiked: Boolean = false
+
+        init {
+            // Set click listener for the like button in the constructor
+            likeButton.setOnClickListener {
+                // Toggle the like state
+                isLiked = !isLiked
+
+                // Update the UI based on the new like state
+                updateLikeButtonState()
+            }
+        }
+
+        fun updateLikeButtonState() {
+            if (isLiked) {
+                // Liked state
+                likeButton.setImageResource(R.drawable.liked_button)
+            } else {
+                // Not liked state
+                likeButton.setImageResource(R.drawable.like_button)
+            }
+        }
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -23,6 +47,9 @@ class CrimeReportAdapter(private var crimeReports: List<CrimeReport>) :
         val crimeReport = crimeReports[position]
         holder.crimeTypeTextView.text = crimeReport.crimeType
         holder.descriptionTextView.text = crimeReport.description
+
+        // Set initial like button state
+        holder.updateLikeButtonState()
     }
 
     override fun getItemCount(): Int {
@@ -34,4 +61,4 @@ class CrimeReportAdapter(private var crimeReports: List<CrimeReport>) :
         crimeReports = newCrimeReports
         notifyDataSetChanged()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dd.png b/app/src/main/res/drawable/dd.png
new file mode 100644
index 0000000..178cb52
Binary files /dev/null and b/app/src/main/res/drawable/dd.png differ
diff --git a/app/src/main/res/layout/activity_createpost.xml b/app/src/main/res/layout/activity_createpost.xml
index 7b7eb1f..817b21a 100644
--- a/app/src/main/res/layout/activity_createpost.xml
+++ b/app/src/main/res/layout/activity_createpost.xml
@@ -10,7 +10,7 @@
     <View
         android:id="@+id/view"
         android:layout_width="380dp"
-        android:layout_height="630dp"
+        android:layout_height="603dp"
         android:layout_marginTop="176dp"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
@@ -114,7 +114,6 @@
         android:track="@drawable/switch_track_background"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
     <TextView
         android:id="@+id/TypeOfCrime"
         android:layout_width="wrap_content"
@@ -132,14 +131,53 @@
         android:id="@+id/DateOfIncident"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:text="@string/date_of_incident"
         android:textSize="14sp"
         android:textColor="@color/black"
         app:layout_constraintEnd_toEndOf="@+id/view"
         app:layout_constraintHorizontal_bias="0.053"
         app:layout_constraintStart_toStartOf="@+id/view"
-        app:layout_constraintTop_toBottomOf="@+id/spinnerTypeOfCrime" />
+        app:layout_constraintTop_toBottomOf="@+id/selectedSpinnerTypeOfCrime" />
+    <LinearLayout
+        android:id="@+id/dateLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginHorizontal="30dp"
+        app:layout_constraintTop_toBottomOf="@+id/DateOfIncident"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.491"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <EditText
+            android:id="@+id/dateTextField"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_weight="1"
+            android:hint="Selected Date"
+            android:textAlignment="center"
+            android:inputType="datetime"
+            android:textColor="@color/black"
+            android:textColorHint="#777B7E"
+            android:textSize="16sp"
+            android:background="@drawable/border_for_date_and_time"
+            android:padding="8dp"
+            android:focusable="false"
+            android:clickable="true"
+            app:layout_constraintStart_toStartOf="@+id/view"/>
+
+        <Button
+            android:id="@+id/datePickerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:text="Select Date"
+            android:textAlignment="center"
+            android:background="@drawable/border_for_date_and_time"
+            android:textColor="@color/black"
+            android:padding="8dp"
+            android:layout_marginStart="8dp"/>
+    </LinearLayout>
 
     <TextView
         android:id="@+id/TimeOfIncident"
@@ -152,7 +190,7 @@
         app:layout_constraintEnd_toEndOf="@+id/view"
         app:layout_constraintHorizontal_bias="0.053"
         app:layout_constraintStart_toStartOf="@+id/view"
-        app:layout_constraintTop_toBottomOf="@+id/datePicker" />
+        app:layout_constraintTop_toBottomOf="@+id/dateLayout" />
 
 
     <TextView
@@ -166,19 +204,47 @@
         app:layout_constraintEnd_toEndOf="@+id/view"
         app:layout_constraintHorizontal_bias="0.049"
         app:layout_constraintStart_toStartOf="@+id/view"
-        app:layout_constraintTop_toBottomOf="@+id/timePicker" />
+        app:layout_constraintTop_toBottomOf="@+id/timeLayout" />
 
-    <TimePicker
-        android:id="@+id/timePicker"
-        android:layout_width="353dp"
-        android:layout_height="63dp"
-        android:layout_marginTop="8dp"
-        android:background="@drawable/border_for_date_and_time"
-        android:timePickerMode="spinner"
-        app:layout_constraintEnd_toEndOf="@+id/view"
-        app:layout_constraintStart_toStartOf="@+id/view"
-        app:layout_constraintTop_toBottomOf="@+id/TimeOfIncident" />
+    <LinearLayout
+        android:id="@+id/timeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginHorizontal="30dp"
+        app:layout_constraintTop_toBottomOf="@+id/TimeOfIncident"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.491"
+        app:layout_constraintStart_toStartOf="parent">
 
+        <EditText
+            android:id="@+id/timeTextField"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_weight="1"
+            android:hint="Selected Time"
+            android:textAlignment="center"
+            android:inputType="none"
+            android:textColorHint="#777B7E"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            android:background="@drawable/border_for_date_and_time"
+            android:padding="8dp"
+            android:focusable="false"
+            android:clickable="true"
+            app:layout_constraintStart_toStartOf="@+id/view"/>
+
+        <Button
+            android:id="@+id/timePickerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:text="Select Time"
+            android:textAlignment="center"
+            android:background="#000000"
+            android:textColor="@color/black"
+            android:padding="8dp"
+            android:layout_marginStart="8dp"/>
+    </LinearLayout>
     <Spinner
         android:id="@+id/spinnerTypeOfCrime"
         android:layout_width="354dp"
@@ -191,7 +257,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.491"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/TypeOfCrime" />
+        app:layout_constraintTop_toBottomOf="@+id/TypeOfCrime"
+        android:dropDownVerticalOffset="39dp"/>
 
     <TextView
         android:id="@+id/selectedSpinnerTypeOfCrime"
@@ -208,18 +275,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/TypeOfCrime" />
 
-    <DatePicker
-        android:id="@+id/datePicker"
-        android:layout_width="353dp"
-        android:layout_height="67dp"
-        android:layout_marginTop="8dp"
-        android:background="@drawable/border_for_date_and_time"
-        android:datePickerMode="spinner"
-        android:textColor="@color/black"
-        app:layout_constraintEnd_toEndOf="@+id/view"
-        app:layout_constraintStart_toStartOf="@+id/view"
-        app:layout_constraintTop_toBottomOf="@+id/DateOfIncident" />
-
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/addDesciption"
         android:layout_width="354dp"
diff --git a/app/src/main/res/layout/custom_timepicker_numberpicker.xml b/app/src/main/res/layout/custom_timepicker_numberpicker.xml
new file mode 100644
index 0000000..3165246
--- /dev/null
+++ b/app/src/main/res/layout/custom_timepicker_numberpicker.xml
@@ -0,0 +1,6 @@
+<NumberPicker
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/numberpicker"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textColor="@color/black" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/main/res/layout/fragment_reports.xml
index c8ef0f8..95cf2e7 100644
--- a/app/src/main/res/layout/fragment_reports.xml
+++ b/app/src/main/res/layout/fragment_reports.xml
@@ -106,22 +106,26 @@
                 android:id="@+id/locationSpinner"
                 style="@style/RoundedSpinner"
                 android:layout_width="0dp"
-                android:background="#EFA8A6"
-                android:layout_height="wrap_content"
+                android:background="@android:color/holo_red_light"
                 android:layout_weight="1"
+                android:layout_height="25dp"
                 android:layout_marginEnd="8dp"
-                android:layout_marginStart="20dp"/>
+                android:layout_marginStart="8dp"
+                android:dropDownVerticalOffset="32dp"/>
 
             <!-- Spinner for Selecting Type of Crime -->
             <Spinner
                 android:id="@+id/crimeTypeSpinner"
                 style="@style/RoundedSpinner"
                 android:layout_width="0dp"
-                android:background="#EFA8A6"
-                android:layout_height="wrap_content"
+                android:background="@android:color/holo_red_light"
+                android:layout_height="25dp"
                 android:layout_weight="1"
                 android:layout_marginStart="8dp"
-                android:layout_marginEnd="20dp"/>
+                android:layout_marginEnd="8dp"
+                android:dropDownVerticalOffset="32dp">
+
+            </Spinner>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_crime_report.xml b/app/src/main/res/layout/item_crime_report.xml
index fbbc3b0..7b10382 100644
--- a/app/src/main/res/layout/item_crime_report.xml
+++ b/app/src/main/res/layout/item_crime_report.xml
@@ -13,6 +13,38 @@
         android:layout_marginBottom="5dp"
         android:layout_marginTop="10dp">
 
+        <!-- Username and Profile -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="start"
+            android:layout_marginBottom="5dp">
+            <LinearLayout
+                android:layout_width="19dp"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="start">
+
+                <de.hdodenhof.circleimageview.CircleImageView
+                    android:id="@+id/ProfilePicture"
+                    android:layout_width="wrap_content"
+                    android:layout_height="19dp"
+                    android:clickable="true"
+                    android:background="@color/transparent"
+                    android:src="@drawable/profile_picture" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/ProfileUsername"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/profileUsername"
+                android:textColor="@android:color/black"
+                android:textSize="13sp"
+                android:layout_marginStart="10dp"/>
+        </LinearLayout>
+
         <TextView
             android:id="@+id/crimeTypeTextView"
             android:layout_width="wrap_content"
@@ -41,14 +73,14 @@
                 android:id="@+id/likeText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Like"
+                android:text="@string/like"
                 android:textColor="@android:color/black"
                 android:textSize="13sp"/>
 
             <ImageButton
                 android:id="@+id/likeButton"
                 android:layout_width="wrap_content"
-                android:layout_height="20dp"
+                android:layout_height="19dp"
                 android:clickable="true"
                 android:background="@color/transparent"
                 android:src="@drawable/like_button_selector"
@@ -58,7 +90,7 @@
                 android:id="@+id/commentText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Comment"
+                android:text="@string/comment"
                 android:textColor="@android:color/black"
                 android:textSize="13sp"
                 android:layout_marginStart="20dp"/>
@@ -66,11 +98,10 @@
             <ImageButton
                 android:id="@+id/commentButton"
                 android:layout_width="wrap_content"
-                android:layout_height="20dp"
+                android:layout_height="19dp"
                 android:background="@color/transparent"
                 android:src="@drawable/comment_button"
                 android:layout_marginStart="5dp"/>
-
         </LinearLayout>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2c61ff9..ed454ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,4 +83,9 @@
     <string name="communityWatch">"Community Watch"</string>
     <string name="coordinates">try</string>
 
+    <string name="like">"Like"</string>
+    <string name="comment">"Comment"</string>
+    <string name="incident_details">The incident occurred at %1$s on %2$s at %3$s.</string>
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index cda47fb..e39aa7b 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -6,5 +6,16 @@
     </style>
     <style name="RoundedSpinner" parent="Widget.AppCompat.Spinner">
         <item name="android:background">@drawable/rounded_spinner_background</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Other style attributes -->
+
+        <!-- Define the custom style for TimePicker text color -->
+        <item name="android:timePickerStyle">@style/CustomTimePickerStyle</item>
+    </style>
+
+    <style name="CustomTimePickerStyle" parent="@android:style/Widget.Material.Light.TimePicker">
+        <item name="android:textColor">@color/black</item> <!-- Set your desired text color -->
     </style>
 </resources>
\ No newline at end of file