diff --git a/app/src/main/java/com/example/myapp_1/LoginActivity.java b/app/src/main/java/com/example/myapp_1/LoginActivity.java
index 18a3b5b..08e72e1 100644
--- a/app/src/main/java/com/example/myapp_1/LoginActivity.java
+++ b/app/src/main/java/com/example/myapp_1/LoginActivity.java
@@ -1,11 +1,11 @@
 package com.example.myapp_1;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -13,10 +13,10 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.example.myapp_1.DB.DBOperations;
 
 public class LoginActivity extends AppCompatActivity {
+    SharedPreferences currentUserThings = getSharedPreferences("UserData", MODE_PRIVATE);
 
     EditText username;
     EditText password;
-    TextView forgetpassword;
     Button login;
     Button signup;
 
@@ -30,17 +30,12 @@ public class LoginActivity extends AppCompatActivity {
 
         username = findViewById(R.id.editTextText);
         password = findViewById(R.id.editTextTextPassword);
-//        forgetpassword = findViewById(R.id.forgetpass);
-        login = findViewById(R.id.button);
-        signup = findViewById(R.id.button2);
-        guestLogin= findViewById(R.id.button3);
-//        forgetpassword.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                Intent newScreen = new Intent(getApplicationContext(), PasswordResetActivity.class);
-//                startActivity(newScreen);
-//            }
-//        });
+
+        login = findViewById(R.id.loginButton);
+        signup = findViewById(R.id.signupButton);
+        guestLogin= findViewById(R.id.guestButton);
+
+        SharedPreferences.Editor editor = currentUserThings.edit();
         signup.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -54,6 +49,7 @@ public class LoginActivity extends AppCompatActivity {
 
             @Override
             public void onClick(View v) {
+                editor.putString("username", "Guest");
                 Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class);
                 startActivity(newScreen);
             }
@@ -72,6 +68,7 @@ public class LoginActivity extends AppCompatActivity {
                         // Login successful
                         // Proceed to the next screen or perform other actions
                         Toast.makeText(LoginActivity.this,"Welcome", Toast.LENGTH_LONG).show();
+                        editor.putString("username", "Guest");
                         Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class);
                         startActivity(newScreen);
 
diff --git a/app/src/main/java/com/example/myapp_1/PasswordResetActivity.java b/app/src/main/java/com/example/myapp_1/PasswordResetActivity.java
index 9d8b08a..277e654 100644
--- a/app/src/main/java/com/example/myapp_1/PasswordResetActivity.java
+++ b/app/src/main/java/com/example/myapp_1/PasswordResetActivity.java
@@ -20,7 +20,7 @@ public class PasswordResetActivity extends AppCompatActivity {
         setContentView(R.layout.activity_password_reset);
 
         email = findViewById(R.id.editTextTextEmailAddress);
-        reset = findViewById(R.id.button3);
+        reset = findViewById(R.id.guestButton);
 
 
         reset.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3d7a92a..472596b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -43,7 +43,7 @@
             android:inputType="textPassword" />
 
         <Button
-            android:id="@+id/button"
+            android:id="@+id/loginButton"
             style="@android:style/Widget.Material.Button.Inset"
             android:layout_width="311dp"
             android:layout_height="60dp"
@@ -63,7 +63,7 @@
 
 
             <Button
-                android:id="@+id/button3"
+                android:id="@+id/guestButton"
                 style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
                 android:layout_width="150dp"
                 android:layout_height="60dp"
@@ -74,7 +74,7 @@
                 android:text="Guest Login" />
 
             <Button
-                android:id="@+id/button2"
+                android:id="@+id/signupButton"
                 style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
                 android:layout_width="150dp"
                 android:layout_height="60dp"
diff --git a/app/src/main/res/layout/activity_password_reset.xml b/app/src/main/res/layout/activity_password_reset.xml
index 598d5f7..0d80eca 100644
--- a/app/src/main/res/layout/activity_password_reset.xml
+++ b/app/src/main/res/layout/activity_password_reset.xml
@@ -52,7 +52,7 @@
         app:layout_constraintTop_toBottomOf="@+id/editTextTextMultiLine" />
 
     <Button
-        android:id="@+id/button3"
+        android:id="@+id/guestButton"
         android:layout_width="184dp"
         android:layout_height="50dp"
         android:layout_marginTop="32dp"