diff --git a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
index e10cd67..5b303e2 100644
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.Toast
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -17,14 +18,11 @@ import com.example.hposregistration.data.Constant
 import com.example.hposregistration.data.user.UserData
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentUserListBinding
-import java.text.SimpleDateFormat
-import java.util.Date
 
 @AndroidEntryPoint
 class UserListFragment : BaseFragment() {
@@ -58,11 +56,6 @@ class UserListFragment : BaseFragment() {
     }
 
     private fun setupViews() {
-        val pInfo = requireActivity().packageManager.getPackageInfo(
-            requireActivity().packageName, 0
-        )
-        val version = pInfo.versionName
-        binding.appVersion.text = version
         binding.btnRegisterUser.setOnClickListener {
             findNavController().navigate(R.id.action_userListFragment_to_registrationFragment)
         }
@@ -171,17 +164,7 @@ class UserListFragment : BaseFragment() {
     private fun fetchFromServer() {
         binding.noList.visibility = View.GONE
         binding.rvOrder.visibility = View.VISIBLE
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-        val currentDate = Date()
-        val today = dateFormat.format(currentDate)
         val query = Firebase.firestore.collection("patientData")
-            .whereGreaterThanOrEqualTo("createdAt", today)
-            .orderBy("createdAt", Query.Direction.DESCENDING)
-        query.get().addOnSuccessListener {
-            if (it.documents.isEmpty() && isOnline) {
-                binding.emptyRegistrations.visibility = View.VISIBLE
-            }
-        }
         val recyclerViewOptions =
             FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                 .build()
@@ -197,7 +180,6 @@ class UserListFragment : BaseFragment() {
                 binding.noList.visibility = View.GONE
                 binding.rvOrder.visibility = View.VISIBLE
             } else {
-                binding.emptyRegistrations.visibility = View.GONE
                 if (userDataList.isEmpty()) {
                     binding.noList.visibility = View.VISIBLE
                     binding.rvOrder.visibility = View.GONE
diff --git a/app/src/main/res/layout/fragment_user_list.xml b/app/src/main/res/layout/fragment_user_list.xml
index 8b08c4f..4c3db74 100644
--- a/app/src/main/res/layout/fragment_user_list.xml
+++ b/app/src/main/res/layout/fragment_user_list.xml
@@ -16,20 +16,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
     </LinearLayout>
-
-    <TextView
-        android:id="@+id/app_version"
-        style="@style/title2"
-        android:layout_width="57dp"
-        android:layout_height="15dp"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:text="1.0.4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.017"
+    <ImageView
+        android:id="@+id/btnsettings"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="10dp"
+        android:src="@drawable/baseline_settings_24"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
+        app:layout_constraintTop_toTopOf="@+id/tv_title" />
     <TextView
         android:id="@+id/tv_title"
         style="@style/title1"
@@ -40,20 +34,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/emptyRegistrations"
-        style="@style/title1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/empty_registrations"
-        android:textColor="@color/black"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <TextView
         android:id="@+id/noList"
         style="@style/title1"