diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
old mode 100755
new mode 100644
index 0380d8d..0a78fa4
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.google.com" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a5fcc46..b416eac 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.example.intellimills"
         minSdkVersion 19
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -32,15 +32,19 @@ android {
 }
 
 dependencies {
-
+    implementation 'com.google.firebase:firebase-core:21.1.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.firebase:firebase-database:20.2.2' // Replace with the latest version
+    implementation 'com.google.firebase:firebase-auth:22.3.0' // Include if you're using Firebase Authentication
+    implementation 'com.firebaseui:firebase-ui-database:8.0.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.firebase:firebase-auth:22.1.1'
-    implementation 'com.google.firebase:firebase-database:20.2.2'
     testImplementation 'junit:junit:4.13.2'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     // Add the Firebase SDK dependencies
      // Import the Firebase BoM
@@ -51,10 +55,12 @@ dependencies {
   // When using the BoM, don't specify versions in Firebase dependencies
   // https://firebase.google.com/docs/android/setup#available-libraries
     implementation platform('com.google.firebase:firebase-bom:32.2.2')
-    implementation 'com.google.firebase:firebase-analytics:21.3.0'
+    implementation 'com.google.firebase:firebase-analytics:21.5.0'
 
     // other dependencies may be listed here
     testImplementation 'junit:junit:4.13.2' // For JUnit 4
     // or
     testImplementation 'junit:junit:4.13.2' // For JUnit 5
-}
\ No newline at end of file
+
+}
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79b7dbe..ce0fe0c 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,9 +8,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Design.Light">
+        <activity
+            android:name=".PermitApprovalActivity"
+            android:exported="false"
+            android:theme="@style/Theme.Design.Light.NoActionBar" />
         <activity
             android:name=".DriverLeaveFormActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/Theme.Design.Light.NoActionBar" />
         <activity
             android:name=".DriverPickFarmActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/example/intellimills/AdminDashboardActivity.java b/app/src/main/java/com/example/intellimills/AdminDashboardActivity.java
index 42a8b93..8c5ed88 100644
--- a/app/src/main/java/com/example/intellimills/AdminDashboardActivity.java
+++ b/app/src/main/java/com/example/intellimills/AdminDashboardActivity.java
@@ -1,8 +1,10 @@
 package com.example.intellimills;
 
 import androidx.appcompat.app.AppCompatActivity;
-
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
 
 public class AdminDashboardActivity extends AppCompatActivity {
 
@@ -10,5 +12,21 @@ public class AdminDashboardActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_admin_dashboard);
+
+        // Get a reference to the btnPermitApproval button
+        Button btnPermitApproval = findViewById(R.id.btnPermitApproval);
+
+        // Set an OnClickListener for the btnPermitApproval button
+        btnPermitApproval.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                // Open the PermitApprovalActivity when the button is clicked
+                Intent permitApprovalIntent = new Intent(AdminDashboardActivity.this, PermitApprovalActivity.class);
+                startActivity(permitApprovalIntent);
+            }
+        });
+
+        // Add similar code for other buttons to open their respective activities
+        // For example, if you have a button for Extraction Approval, add code here to open ExtractionApprovalActivity.
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/intellimills/AdminLogin.java b/app/src/main/java/com/example/intellimills/AdminLogin.java
index 985b662..aa0898d 100755
--- a/app/src/main/java/com/example/intellimills/AdminLogin.java
+++ b/app/src/main/java/com/example/intellimills/AdminLogin.java
@@ -1,6 +1,8 @@
 package com.example.intellimills;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -9,53 +11,65 @@
 import android.widget.Toast;
 import android.content.Intent;
 
-public class AdminLogin extends AppCompatActivity {
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.AuthResult;
 
-    // Define hardcoded admin credentials
-    private static final String ADMIN_USERNAME = "adminintel";
-    private static final String ADMIN_PASSWORD = "001122";
+public class AdminLogin extends AppCompatActivity {
 
     EditText editemail;
     EditText editpasswrd;
+    Button button2;
+
+    // Initialize Firebase Authentication
+    private FirebaseAuth mAuth;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_admin_login);
 
+        // Initialize Firebase Authentication
+        mAuth = FirebaseAuth.getInstance();
+
         editemail = findViewById(R.id.editTextTextEmailAddress2);
         editpasswrd = findViewById(R.id.editTextTextPassword2);
+        button2 = findViewById(R.id.button2login);
 
-        Button button2 = findViewById(R.id.button2login);
-        button2.setOnClickListener(view -> loginUser());
+        button2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                loginUser();
+            }
+        });
     }
 
     private void loginUser() {
         String email = editemail.getText().toString();
         String password = editpasswrd.getText().toString();
 
-        if (TextUtils.isEmpty(email)) {
-            editemail.setError("Email cannot be empty");
-            editemail.requestFocus();
-            Toast.makeText(getApplicationContext(), "Please Enter Your Email", Toast.LENGTH_LONG).show();
-        } else if (TextUtils.isEmpty(password)) {
-            editpasswrd.setError("Password cannot be empty");
-            editpasswrd.requestFocus();
-            Toast.makeText(getApplicationContext(), "Please enter Password.", Toast.LENGTH_LONG).show();
+        if (TextUtils.isEmpty(email) || TextUtils.isEmpty(password)) {
+            Toast.makeText(getApplicationContext(), "Please enter email and password.", Toast.LENGTH_LONG).show();
         } else {
-            // Check if the provided credentials match the hardcoded admin credentials
-            if (email.equals(ADMIN_USERNAME) && password.equals(ADMIN_PASSWORD)) {
-                // Admin login successful
-                Toast.makeText(AdminLogin.this, "Admin login successful", Toast.LENGTH_LONG).show();
-
-                // Start the AdminDashboardActivity
-                Intent adminDashboardIntent = new Intent(AdminLogin.this, AdminDashboardActivity.class);
-                startActivity(adminDashboardIntent);
-                // Optional: Finish the AdminLoginActivity to prevent going back to it
-            } else {
-                // Admin login failed
-                Toast.makeText(AdminLogin.this, "Admin login failed. Incorrect credentials.", Toast.LENGTH_LONG).show();
-            }
+            mAuth.signInWithEmailAndPassword(email, password)
+                    .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                        @Override
+                        public void onComplete(@NonNull Task<AuthResult> task) {
+                            if (task.isSuccessful()) {
+                                // Admin login successful
+                                Toast.makeText(AdminLogin.this, "Admin login successful", Toast.LENGTH_LONG).show();
+
+                                // Start the AdminDashboardActivity
+                                Intent adminDashboardIntent = new Intent(AdminLogin.this, AdminDashboardActivity.class);
+                                startActivity(adminDashboardIntent);
+                                // Optional: Finish the AdminLoginActivity to prevent going back to it
+                            } else {
+                                // Admin login failed
+                                Toast.makeText(AdminLogin.this, "Admin login failed. Incorrect credentials.", Toast.LENGTH_LONG).show();
+                            }
+                        }
+                    });
         }
     }
 }
diff --git a/app/src/main/java/com/example/intellimills/DriverLeaveFormActivity.java b/app/src/main/java/com/example/intellimills/DriverLeaveFormActivity.java
index 3fba309..c2a72e3 100644
--- a/app/src/main/java/com/example/intellimills/DriverLeaveFormActivity.java
+++ b/app/src/main/java/com/example/intellimills/DriverLeaveFormActivity.java
@@ -1,14 +1,89 @@
 package com.example.intellimills;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import android.widget.Toast;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import java.util.HashMap;
+import java.util.Map;
 
 public class DriverLeaveFormActivity extends AppCompatActivity {
 
+    private EditText nameEditText;
+    private EditText idEditText;
+    private EditText reasonEditText;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_driver_leave_form);
+
+        nameEditText = findViewById(R.id.name3);
+        idEditText = findViewById(R.id.Id);
+        reasonEditText = findViewById(R.id.editTextText4);
+
+        Button clearButton = findViewById(R.id.button11);
+        clearButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                // Clear all EditText fields
+                nameEditText.setText("");
+                idEditText.setText("");
+                reasonEditText.setText("");
+            }
+        });
+
+        Button submitButton = findViewById(R.id.button7);
+        submitButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                // Get the user's input
+                String name = nameEditText.getText().toString();
+                String id = idEditText.getText().toString();
+                String reason = reasonEditText.getText().toString();
+
+                // Validate the input and submit to Firebase
+                if (!name.isEmpty() && !id.isEmpty() && !reason.isEmpty()) {
+                    submitLeaveToFirebase(name, id, reason);
+                } else {
+                    Toast.makeText(DriverLeaveFormActivity.this, "Please fill in all fields.", Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
+
+    private void submitLeaveToFirebase(String name, String id, String reason) {
+        // Replace this with your Firebase database reference
+        DatabaseReference leaveRef = FirebaseDatabase.getInstance().getReference("leave_requests");
+
+        // Create a unique key for the leave request
+        String leaveId = leaveRef.push().getKey();
+
+        // Create a map to store the leave data
+        Map<String, Object> leaveData = new HashMap<>();
+        leaveData.put("name", name);
+        leaveData.put("id", id);
+        leaveData.put("reason", reason);
+
+        // Push the data to Firebase
+        leaveRef.child(leaveId).updateChildren(leaveData)
+                .addOnCompleteListener(new OnCompleteListener<Void>() {
+                    @Override
+                    public void onComplete(@NonNull Task<Void> task) {
+                        if (task.isSuccessful()) {
+                            Toast.makeText(DriverLeaveFormActivity.this, "Submission successful.", Toast.LENGTH_SHORT).show();
+                        } else {
+                            Toast.makeText(DriverLeaveFormActivity.this, "Submission failed. Please try again.", Toast.LENGTH_SHORT).show();
+                        }
+                    }
+                });
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/intellimills/PermitApprovalActivity.java b/app/src/main/java/com/example/intellimills/PermitApprovalActivity.java
new file mode 100644
index 0000000..0b09589
--- /dev/null
+++ b/app/src/main/java/com/example/intellimills/PermitApprovalActivity.java
@@ -0,0 +1,79 @@
+package com.example.intellimills;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+
+public class PermitApprovalActivity extends AppCompatActivity {
+
+    private DatabaseReference databaseReference;
+    private static final String TAG = "PermitApprovalActivity";
+
+    private Button updateButton;
+    private TableRow secondRow;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_permit_approval);
+
+        // Replace "your_project_name" with your actual Firebase project name
+        databaseReference = FirebaseDatabase.getInstance().getReference().child("Harvest Applications");
+
+        updateButton = findViewById(R.id.btnUpdate);
+        secondRow = findViewById(R.id.secondRow);  // Assuming you have a TableRow with this ID in your XML layout
+
+        updateButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                fetchDataFromFirebaseForSecondRow();
+            }
+        });
+
+        fetchDataFromFirebaseForSecondRow();
+    }
+
+    private void fetchDataFromFirebaseForSecondRow() {
+        databaseReference.addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
+                // Assuming "Harvest Applications" is a direct child of the root
+                DataSnapshot harvestApplicationsSnapshot = dataSnapshot.child("Harvest Applications");
+
+                // Assuming the second row data is stored under a specific child (e.g., "record1")
+                DataSnapshot secondRowDataSnapshot = harvestApplicationsSnapshot.child("record1");
+
+                // Assuming you have TextViews in the second row with IDs userarea, usercounty, etc.
+                updateTextView(secondRow, R.id.userarea, secondRowDataSnapshot.child("userarea").getValue(String.class));
+                updateTextView(secondRow, R.id.usercounty, secondRowDataSnapshot.child("usercounty").getValue(String.class));
+                // Add similar lines for other fields
+
+                // Update the UI for other fields as needed
+            }
+
+            @Override
+            public void onCancelled(@NonNull DatabaseError databaseError) {
+                Log.w(TAG, "fetchDataFromFirebaseForSecondRow:onCancelled", databaseError.toException());
+            }
+        });
+    }
+
+    private void updateTextView(TableRow row, int textViewId, String value) {
+        TextView textView = row.findViewById(textViewId);
+        if (textView != null) {
+            textView.setText(value);
+        }
+    }
+}
diff --git a/app/src/main/res/drawable/ic_baseline_home_repair_service_24.xml b/app/src/main/res/drawable/ic_baseline_home_repair_service_24.xml
deleted file mode 100755
index e563c7d..0000000
--- a/app/src/main/res/drawable/ic_baseline_home_repair_service_24.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M18,16l-2,0l0,-1l-8,0l0,1l-2,0l0,-1l-4,0l0,5l20,0l0,-5l-4,0z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M20,8h-3V6c0,-1.1 -0.9,-2 -2,-2H9C7.9,4 7,4.9 7,6v2H4c-1.1,0 -2,0.9 -2,2v4h4v-2h2v2h8v-2h2v2h4v-4C22,8.9 21.1,8 20,8zM15,8H9V6h6V8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_mood_24.xml b/app/src/main/res/drawable/ic_baseline_mood_24.xml
deleted file mode 100755
index a26c0dc..0000000
--- a/app/src/main/res/drawable/ic_baseline_mood_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
deleted file mode 100755
index 6a7f274..0000000
--- a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_notifications_24.xml b/app/src/main/res/drawable/ic_baseline_notifications_24.xml
deleted file mode 100755
index 21cb88d..0000000
--- a/app/src/main/res/drawable/ic_baseline_notifications_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_people_24.xml b/app/src/main/res/drawable/ic_baseline_people_24.xml
deleted file mode 100755
index 2989eb6..0000000
--- a/app/src/main/res/drawable/ic_baseline_people_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_person_24.xml b/app/src/main/res/drawable/ic_baseline_person_24.xml
deleted file mode 100755
index bd8dc80..0000000
--- a/app/src/main/res/drawable/ic_baseline_person_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_send_24.xml b/app/src/main/res/drawable/ic_baseline_send_24.xml
deleted file mode 100755
index 5b10648..0000000
--- a/app/src/main/res/drawable/ic_baseline_send_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
deleted file mode 100755
index 4582864..0000000
--- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100755
index 3a4c7da..0000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
deleted file mode 100755
index bce7db4..0000000
--- a/app/src/main/res/drawable/ic_home_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher.jpg b/app/src/main/res/drawable/ic_launcher.jpg
deleted file mode 100755
index 0936c42..0000000
Binary files a/app/src/main/res/drawable/ic_launcher.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_menu_camera.xml b/app/src/main/res/drawable/ic_menu_camera.xml
deleted file mode 100755
index 41688d5..0000000
--- a/app/src/main/res/drawable/ic_menu_camera.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_gallery.xml b/app/src/main/res/drawable/ic_menu_gallery.xml
deleted file mode 100755
index ff8ce52..0000000
--- a/app/src/main/res/drawable/ic_menu_gallery.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_slideshow.xml b/app/src/main/res/drawable/ic_menu_slideshow.xml
deleted file mode 100755
index ae51e49..0000000
--- a/app/src/main/res/drawable/ic_menu_slideshow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml
deleted file mode 100755
index 9676278..0000000
--- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml
deleted file mode 100755
index 3481c02..0000000
--- a/app/src/main/res/drawable/ic_profile.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.11,0 -2,0.9 -2,2zM15,9c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3zM6,17c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1L6,18v-1z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_round_chat_24.xml b/app/src/main/res/drawable/ic_round_chat_24.xml
deleted file mode 100755
index 045f5f0..0000000
--- a/app/src/main/res/drawable/ic_round_chat_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM7,9h10c0.55,0 1,0.45 1,1s-0.45,1 -1,1L7,11c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1zM13,14L7,14c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h6c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM17,8L7,8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h10c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_transactions.xml b/app/src/main/res/drawable/ic_transactions.xml
deleted file mode 100755
index 4cc0c1f..0000000
--- a/app/src/main/res/drawable/ic_transactions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM14,6h-4L10,4h4v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100755
index 21cb88d..0000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/leflet.png b/app/src/main/res/drawable/leflet.png
deleted file mode 100755
index f7fb819..0000000
Binary files a/app/src/main/res/drawable/leflet.png and /dev/null differ
diff --git a/app/src/main/res/drawable/login.jpg b/app/src/main/res/drawable/login.jpg
deleted file mode 100755
index b3bb13d..0000000
Binary files a/app/src/main/res/drawable/login.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/loginback.png b/app/src/main/res/drawable/loginback.png
deleted file mode 100755
index 9f4c91c..0000000
Binary files a/app/src/main/res/drawable/loginback.png and /dev/null differ
diff --git a/app/src/main/res/drawable/morning.png b/app/src/main/res/drawable/morning.png
deleted file mode 100755
index 5739de8..0000000
Binary files a/app/src/main/res/drawable/morning.png and /dev/null differ
diff --git a/app/src/main/res/drawable/next.png b/app/src/main/res/drawable/next.png
deleted file mode 100755
index 5b2d397..0000000
Binary files a/app/src/main/res/drawable/next.png and /dev/null differ
diff --git a/app/src/main/res/drawable/roundbox.xml b/app/src/main/res/drawable/roundbox.xml
deleted file mode 100755
index c3a4ffc..0000000
--- a/app/src/main/res/drawable/roundbox.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#DD2C00" />
-    <corners android:radius="50dp" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/roundbuttongren.xml b/app/src/main/res/drawable/roundbuttongren.xml
old mode 100755
new mode 100644
index 8f8b735..ce16fdf
--- a/app/src/main/res/drawable/roundbuttongren.xml
+++ b/app/src/main/res/drawable/roundbuttongren.xml
@@ -2,4 +2,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/teal_700" />
     <corners android:radius="25dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/roundcolorless.xml b/app/src/main/res/drawable/roundcolorless.xml
deleted file mode 100755
index 8443dca..0000000
--- a/app/src/main/res/drawable/roundcolorless.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <corners android:radius="20dp"/>
-    <solid android:color="#00000000"/>
-    <stroke android:color="@color/black"/>
-    <stroke android:width="3dp"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_corner.xml b/app/src/main/res/drawable/rounded_corner.xml
deleted file mode 100755
index 65270da..0000000
--- a/app/src/main/res/drawable/rounded_corner.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="#dddddd" />
-
-    <stroke
-        android:width="0dip"
-        android:color="@color/black" />
-    <corners android:radius="20dip" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_corner1.xml b/app/src/main/res/drawable/rounded_corner1.xml
deleted file mode 100755
index 49faf16..0000000
--- a/app/src/main/res/drawable/rounded_corner1.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <solid android:color="#f0f0f0" />
-    <stroke
-        android:width="0dip"
-        android:color="#f0f0f0" />
-    <corners android:radius="20dip" />
-    <padding
-        android:bottom="0dip"
-        android:left="0dip"
-        android:right="0dip"
-        android:top="0dip" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/roundedgebutton.xml b/app/src/main/res/drawable/roundedgebutton.xml
deleted file mode 100755
index 424f038..0000000
--- a/app/src/main/res/drawable/roundedgebutton.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <stroke
-        android:color="#25FF30"
-        android:width="3dp"/>
-    <corners
-        android:radius="25dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/services.png b/app/src/main/res/drawable/services.png
deleted file mode 100755
index b9b8290..0000000
Binary files a/app/src/main/res/drawable/services.png and /dev/null differ
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
deleted file mode 100755
index a33798b..0000000
--- a/app/src/main/res/drawable/side_nav_bar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-            android:angle="135"
-            android:centerColor="#009688"
-            android:endColor="#00695C"
-            android:startColor="#4DB6AC"
-            android:type="linear"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sugar.png b/app/src/main/res/drawable/sugar.png
deleted file mode 100755
index 7f2077a..0000000
Binary files a/app/src/main/res/drawable/sugar.png and /dev/null differ
diff --git a/app/src/main/res/drawable/sugarcut.png b/app/src/main/res/drawable/sugarcut.png
deleted file mode 100755
index 5838d2c..0000000
Binary files a/app/src/main/res/drawable/sugarcut.png and /dev/null differ
diff --git a/app/src/main/res/drawable/tabrounded.xml b/app/src/main/res/drawable/tabrounded.xml
deleted file mode 100755
index 64a527f..0000000
--- a/app/src/main/res/drawable/tabrounded.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="100dp"/>
-    <solid android:color="@color/teal_700"/>
-
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/titlen_background.xml b/app/src/main/res/drawable/titlen_background.xml
deleted file mode 100755
index ca3826a..0000000
--- a/app/src/main/res/drawable/titlen_background.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-</vector>
diff --git a/app/src/main/res/layout-v16/activity_login.xml b/app/src/main/res/layout-v16/activity_login.xml
index af1ca80..535b98a 100755
--- a/app/src/main/res/layout-v16/activity_login.xml
+++ b/app/src/main/res/layout-v16/activity_login.xml
@@ -104,7 +104,7 @@
                     android:drawableTint="#000000"
                     android:ems="10"
                     android:hint="Password."
-                    android:inputType="numberPassword"
+                    android:inputType="textPassword"
                     android:paddingLeft="9dp"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Display2"
diff --git a/app/src/main/res/layout/activity_admin_dashboard.xml b/app/src/main/res/layout/activity_admin_dashboard.xml
index 08e20bd..136ea39 100644
--- a/app/src/main/res/layout/activity_admin_dashboard.xml
+++ b/app/src/main/res/layout/activity_admin_dashboard.xml
@@ -4,20 +4,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/leflet"
+    android:background="@drawable/back2"
     tools:context=".AdminDashboardActivity">
 
+    <!-- Header RelativeLayout (You provided this part) -->
+
     <RelativeLayout
         android:id="@+id/home"
         android:layout_width="match_parent"
         android:layout_height="65dp"
-        android:layout_alignBottom="@+id/textView4"
         android:layout_marginBottom="650dp"
         android:background="@drawable/tabrounded"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/navigation_layout"
         app:layout_constraintTop_toTopOf="parent"
         tools:layout_editor_absoluteX="0dp">
 
+        <!-- Profile Icon -->
         <ImageView
             android:id="@+id/profile2"
             android:layout_width="66dp"
@@ -32,6 +34,7 @@
             android:clickable="true"
             tools:ignore="SpeakableTextPresentCheck" />
 
+        <!-- Heading -->
         <TextView
             android:id="@+id/heading"
             android:layout_width="wrap_content"
@@ -48,6 +51,123 @@
             android:textColor="@color/black"
             android:textSize="23sp"
             android:textStyle="bold" />
+    </RelativeLayout>
+
+    <!-- Navigation Layout -->
+    <RelativeLayout
+        android:id="@+id/navigation_layout"
+        android:layout_width="474dp"
+        android:layout_height="723dp"
+        android:layout_marginTop="4dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/home">
+
+        <!-- Button 1: Permit Approval -->
+
+        <!-- Text View 1: Description for Permit Approval -->
+
+        <!-- Button 2: Extraction Approval -->
+
+        <!-- Text View 2: Description for Extraction Approval -->
+
+        <!-- Button 3: Leave Oversight -->
+
+        <!-- Text View 3: Description for Leave Oversight -->
+
+        <!-- Button 4: Reported Issues -->
+
+        <!-- Text View 4: Description for Reported Issues -->
+
+        <TextView
+            android:layout_width="259dp"
+            android:layout_height="132dp"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="23dp"
+            android:text="Approve permit requests from users"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/btnPermitApproval"
+            android:layout_width="188dp"
+            android:layout_height="122dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="2dp"
+            android:text="Permit Approval"
+            android:textSize="20sp" />
+
+        <Button
+            android:id="@+id/btnExtractionApproval"
+            android:layout_width="152dp"
+            android:layout_height="109dp"
+            android:layout_below="@id/btnPermitApproval"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="39dp"
+            android:layout_marginEnd="234dp"
+            android:text="Extraction Approval"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="228dp"
+            android:layout_height="99dp"
+            android:layout_below="@id/btnExtractionApproval"
+            android:layout_alignParentEnd="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="-104dp"
+            android:layout_marginEnd="1dp"
+            android:text="Approve extraction requests from users"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/btnLeaveOversight"
+            android:layout_width="wrap_content"
+            android:layout_height="80dp"
+            android:layout_below="@id/btnExtractionApproval"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="118dp"
+            android:layout_marginTop="164dp"
+            android:layout_marginEnd="95dp"
+            android:text="Leave Oversight"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/btnLeaveOversight"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="10dp"
+            android:text="Manage leave requests from employees"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/btnReportedIssues"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="3dp"
+            android:text="View reported issues from users"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/btnReportedIssues"
+            android:layout_width="206dp"
+            android:layout_height="85dp"
+            android:layout_below="@id/btnLeaveOversight"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="120dp"
+            android:layout_marginTop="87dp"
+            android:layout_marginEnd="85dp"
+            android:text="Reported Issues"
+            android:textSize="20sp" />
 
     </RelativeLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_admin_login.xml b/app/src/main/res/layout/activity_admin_login.xml
index 569c574..cc3973f 100755
--- a/app/src/main/res/layout/activity_admin_login.xml
+++ b/app/src/main/res/layout/activity_admin_login.xml
@@ -88,7 +88,7 @@
           android:drawableTint="#000000"
           android:ems="10"
           android:hint="Password."
-          android:inputType="numberPassword"
+          android:inputType="textPassword"
           android:paddingLeft="9dp"
           android:singleLine="true"
           android:textAppearance="@style/TextAppearance.AppCompat.Display2"
diff --git a/app/src/main/res/layout/activity_driver_leave_form.xml b/app/src/main/res/layout/activity_driver_leave_form.xml
index 7094121..9e0e9cf 100644
--- a/app/src/main/res/layout/activity_driver_leave_form.xml
+++ b/app/src/main/res/layout/activity_driver_leave_form.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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="@drawable/morning"
-tools:context=".Messaging">
+    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="@drawable/morning"
+    tools:context=".Messaging">
 
-<!-- Your existing top layout -->
+    <!-- Your existing top layout -->
 
     <!-- Driver Leave Form -->
+
     <RelativeLayout
         android:id="@+id/toplay"
         android:layout_width="match_parent"
@@ -22,127 +23,88 @@ tools:context=".Messaging">
 
         <TextView
             android:id="@+id/textView20"
-            android:layout_width="300dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentEnd="true"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginStart="63dp"
+            android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
-            android:layout_marginEnd="48dp"
             android:fontFamily="serif"
             android:text="Driver Leave Form"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
             android:textColor="#000000"
-            android:textSize="20sp" />
+            android:textSize="24sp" />
     </RelativeLayout>
 
-    <LinearLayout
-    android:layout_width="390dp"
-    android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
-    android:background="@drawable/rounded_corner"
-    android:orientation="vertical">
-
-        <!-- Add other fields for ID and reason for leave -->
-
-    </LinearLayout>
-
     <EditText
         android:id="@+id/editTextText4"
-        android:layout_width="390dp"
+        android:layout_width="match_parent"
         android:layout_height="154dp"
-        android:layout_centerInParent="true"
-        android:layout_marginTop="20dp"
+        android:layout_below="@+id/Id"
+        android:layout_marginTop="64dp"
         android:background="@drawable/rounded_corner"
         android:ems="10"
         android:inputType="textMultiLine"
         android:text="Reason for Leave"
         android:textColor="#807C7C"
-        android:textColorHint="@android:color/darker_gray" />
+        android:textColorHint="@android:color/darker_gray"
+        android:textSize="24sp" />
 
     <Button
         android:id="@+id/button7"
-        android:layout_width="75dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/editTextText4"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="166dp"
-        android:layout_marginTop="36dp"
-        android:layout_marginEnd="170dp"
-        android:layout_marginBottom="202dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="20dp"
         android:background="@drawable/roundbuttongren"
         android:fontFamily="serif"
         android:text="Submit"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
         android:textColor="#000000"
-        android:textSize="12sp"
+        android:textSize="24sp"
         android:textStyle="bold" />
 
     <EditText
-        android:id="@+id/Name"
-        android:layout_width="331dp"
-        android:layout_height="75dp"
-        android:layout_above="@+id/editTextText4"
+        android:id="@+id/Id"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
         android:layout_below="@+id/toplay"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="48dp"
-        android:layout_marginEnd="43dp"
-        android:layout_marginBottom="91dp"
+        android:layout_marginTop="95dp"
         android:background="@drawable/rounded_corner"
-        android:ems="10"
-        android:fontFamily="sans-serif"
-        android:hint="Name"
+        android:hint="ID"
         android:inputType="textPersonName"
         android:textAppearance="@style/TextAppearance.AppCompat.Display2"
         android:textColor="#000000"
         android:textColorHint="@android:color/darker_gray"
-        android:textSize="16sp" />
+        android:textSize="24sp" />
 
     <EditText
-        android:id="@+id/name2"
-        android:layout_width="327dp"
-        android:layout_height="78dp"
-        android:layout_above="@+id/editTextText4"
+        android:id="@+id/name3"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
         android:layout_below="@+id/toplay"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="38dp"
-        android:layout_marginTop="110dp"
-        android:layout_marginEnd="47dp"
-        android:layout_marginBottom="26dp"
+        android:layout_marginTop="21dp"
         android:background="@drawable/rounded_corner"
-        android:ems="10"
-        android:fontFamily="sans-serif"
-        android:hint="ID"
+        android:hint="Name"
         android:inputType="textPersonName"
         android:textAppearance="@style/TextAppearance.AppCompat.Display2"
         android:textColor="#000000"
         android:textColorHint="@android:color/darker_gray"
-        android:textSize="16sp" />
+        android:textSize="24sp" />
 
     <Button
         android:id="@+id/button11"
         android:layout_width="75dp"
         android:layout_height="wrap_content"
         android:layout_below="@+id/editTextText4"
-        android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginStart="303dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="33dp"
-        android:layout_marginBottom="235dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="28dp"
         android:background="@drawable/roundbuttongren"
         android:fontFamily="serif"
         android:text="Clear"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
         android:textColor="#000000"
-        android:textSize="12sp"
+        android:textSize="24sp"
         android:textStyle="bold" />
 
 </RelativeLayout>
-
diff --git a/app/src/main/res/layout/activity_driver_login.xml b/app/src/main/res/layout/activity_driver_login.xml
index a26c1c5..8c27c59 100755
--- a/app/src/main/res/layout/activity_driver_login.xml
+++ b/app/src/main/res/layout/activity_driver_login.xml
@@ -130,7 +130,7 @@
                 android:drawableTint="#000000"
                 android:ems="10"
                 android:hint="Password."
-                android:inputType="numberPassword"
+                android:inputType="textPassword"
                 android:paddingLeft="9dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Display2"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 6940d8b..2089867 100755
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -106,7 +106,7 @@
                 android:drawableTint="#000000"
                 android:ems="10"
                 android:hint="Password."
-                android:inputType="numberPassword"
+                android:inputType="textPassword"
                 android:paddingLeft="9dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Display2"
diff --git a/app/src/main/res/layout/activity_permit_approval.xml b/app/src/main/res/layout/activity_permit_approval.xml
new file mode 100644
index 0000000..ae56b70
--- /dev/null
+++ b/app/src/main/res/layout/activity_permit_approval.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    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="@drawable/back2"
+    tools:context=".PermitApprovalActivity">
+
+    <!-- Header RelativeLayout -->
+    <RelativeLayout
+        android:id="@+id/home"
+        android:layout_width="match_parent"
+        android:layout_height="65dp"
+        android:background="@drawable/tabrounded"
+        app:layout_constraintBottom_toTopOf="@id/navigation_layout"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="NotSibling"
+        tools:layout_editor_absoluteX="0dp">
+
+        <!-- Profile Icon -->
+        <ImageView
+            android:id="@+id/profile2"
+            android:layout_width="66dp"
+            android:layout_height="match_parent"
+            android:layout_alignRight="@id/heading"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginLeft="348dp"
+            android:layout_marginEnd="3dp"
+            android:layout_marginRight="-314dp"
+            android:background="@drawable/ic_baseline_account_circle_24"
+            android:clickable="true"
+            tools:ignore="SpeakableTextPresentCheck" />
+
+        <!-- Heading -->
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="18dp"
+            android:layout_marginTop="16dp"
+            android:fontFamily="sans-serif"
+            android:paddingLeft="14dp"
+            android:text="Permit Approval"
+            android:textAlignment="center"
+            android:textAppearance="@style/TextAppearance.AppCompat.Display2"
+            android:textColor="@color/black"
+            android:textSize="23sp"
+            android:textStyle="bold" />
+
+
+    </RelativeLayout>
+
+    <!-- Explanation TextView -->
+
+    <!-- TableLayout for the data -->
+
+    <HorizontalScrollView
+        android:id="@+id/horizontalScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="563dp"
+        android:layout_marginTop="200dp"
+        android:layout_marginBottom="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:ignore="MissingConstraints">
+
+        <TableLayout
+            android:id="@+id/recycleview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="16dp">
+
+            <!-- Table row for column headers -->
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="Trailers"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="User ID"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="User Area"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="User County"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="User Email"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="Username"
+                    android:textColor="#ffffff"
+                    android:textSize="20sp"
+                    tools:ignore="TextContrastCheck" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="User Phone"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="User Subcounty"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="User Sugarcane Age"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@android:color/darker_gray"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text="Approval"
+                    android:textColor="#455A64"
+                    android:textSize="20sp" />
+            </TableRow>
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <!-- Blank TextViews for the second row -->
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:padding="8dp"
+                    android:text=""
+                    android:textColor="#ffffff"
+                    android:textSize="20sp" />
+
+            </TableRow>
+
+        </TableLayout>
+
+    </HorizontalScrollView>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="6dp"
+        android:layout_marginBottom="6dp"
+        android:text="Approve or reject permit applications"
+        android:textColor="@color/black"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toTopOf="@+id/horizontalScrollView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/home"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <Button
+        android:id="@+id/btnUpdate"
+        android:layout_width="133dp"
+        android:layout_height="63dp"
+        android:layout_marginStart="331dp"
+        android:layout_marginTop="1dp"
+        android:background="@drawable/tabrounded"
+        android:onClick="onUpdateButtonClicked"
+        android:text="Update Data"
+        android:textAllCaps="false"
+        app:layout_constraintBottom_toTopOf="@+id/horizontalScrollView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/home"
+        app:layout_constraintVertical_bias="0.802" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_services.xml b/app/src/main/res/layout/activity_services.xml
index 8a28c15..d80cbbc 100755
--- a/app/src/main/res/layout/activity_services.xml
+++ b/app/src/main/res/layout/activity_services.xml
@@ -226,16 +226,6 @@
         android:textSize="34sp"
         android:textStyle="normal" />
 
-    <ImageView
-        android:id="@+id/imageView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerInParent="true"
-        android:layout_marginBottom="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/constraintLayout3"
-        app:srcCompat="@drawable/ic_launcher" />
-
     <TextView
         android:id="@+id/textView6"
         android:layout_width="110dp"
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000..6afe17a
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="userIdTextView" type="id" />
+    <item name="usernameTextView" type="id" />
+    <item name="userEmailTextView" type="id" />
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index f1a536f..d050739 100755
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,13 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         mavenCentral()
     }
     dependencies {
 
-        classpath 'com.android.tools.build:gradle:8.1.2'
-        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.google.gms:google-services:4.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,11 +18,14 @@ buildscript {
 allprojects {
     repositories {
         google()
+        maven {
+            url "https://maven.google.com"
+        }
         mavenCentral()
-        jcenter() // Warning: this repository is going to shut down soon
+        mavenCentral() // Warning: this repository is going to shut down soon
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file