diff --git a/app/src/main/java/com/example/myapp_1/GetStart1Activity.java b/app/src/main/java/com/example/myapp_1/GetStart1Activity.java
index fb298e9..206e881 100644
--- a/app/src/main/java/com/example/myapp_1/GetStart1Activity.java
+++ b/app/src/main/java/com/example/myapp_1/GetStart1Activity.java
@@ -26,7 +26,7 @@ public class GetStart1Activity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
 
-                Intent newScreen = new Intent(getApplicationContext(), GetStart2Activity.class);
+                Intent newScreen = new Intent(getApplicationContext(), LoginActivity.class);
                 startActivity(newScreen);
             }
         });
diff --git a/app/src/main/java/com/example/myapp_1/HomeActivity.java b/app/src/main/java/com/example/myapp_1/HomeActivity.java
index 161bd49..cfe3625 100644
--- a/app/src/main/java/com/example/myapp_1/HomeActivity.java
+++ b/app/src/main/java/com/example/myapp_1/HomeActivity.java
@@ -3,7 +3,6 @@ package com.example.myapp_1;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -21,7 +20,7 @@ public class HomeActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
 
-        BottomNavigationView bottomNavigationView = findViewById(R.id.bottomview);
+        BottomNavigationView bottomNavigationView = findViewById(R.id.homeBottomView);
         bottomNavigationView.setOnNavigationItemSelectedListener(
                 new BottomNavigationView.OnNavigationItemSelectedListener() {
                     @Override
@@ -43,6 +42,7 @@ public class HomeActivity extends AppCompatActivity {
                         return true;
                     }
                 });
+
     }
 }
 
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 01d25ae..18a3b5b 100644
--- a/app/src/main/java/com/example/myapp_1/LoginActivity.java
+++ b/app/src/main/java/com/example/myapp_1/LoginActivity.java
@@ -30,17 +30,17 @@ public class LoginActivity extends AppCompatActivity {
 
         username = findViewById(R.id.editTextText);
         password = findViewById(R.id.editTextTextPassword);
-        forgetpassword = findViewById(R.id.forgetpass);
+//        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);
-            }
-        });
+//        forgetpassword.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                Intent newScreen = new Intent(getApplicationContext(), PasswordResetActivity.class);
+//                startActivity(newScreen);
+//            }
+//        });
         signup.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index ce73015..52cab26 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -7,7 +7,7 @@
 
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottomview"
+        android:id="@+id/homeBottomView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/material_dynamic_primary60"
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar2"
+        android:id="@+id/homeToolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/material_dynamic_primary60"
@@ -44,7 +44,7 @@
         app:titleCentered="true" />
 
     <TextView
-        android:id="@+id/textView3"
+        android:id="@+id/userGreeting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
@@ -65,11 +65,11 @@
         android:layout_marginLeft="20dp"
         android:text="Predict your tram arrival time at any station!"
         android:textSize="18dp"
-        app:layout_constraintBottom_toTopOf="@+id/bottomview"
+        app:layout_constraintBottom_toTopOf="@+id/homeBottomView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView3"
+        app:layout_constraintTop_toBottomOf="@+id/userGreeting"
         app:layout_constraintVertical_bias="0.296" />
 
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index be0d2a2..3d7a92a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,107 +5,85 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="222dp"
-        android:layout_height="194dp"
-        android:layout_marginTop="52dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/train_image_3" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <EditText
-        android:id="@+id/editTextText"
-        android:layout_width="372dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="44dp"
-        android:drawableStart="@drawable/baseline_person"
-        android:drawablePadding="16dp"
-        android:ems="10"
-        android:hint="Username"
-        android:inputType="text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.487"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView" />
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_gravity="center"
+            android:layout_width="222dp"
+            android:layout_height="194dp"
+            android:layout_marginTop="52dp"
+            app:srcCompat="@drawable/train_image_3" />
 
-    <EditText
-        android:id="@+id/editTextTextPassword"
-        android:layout_width="372dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="28dp"
-        android:drawableStart="@drawable/baseline_lock"
-        android:drawablePadding="16dp"
-        android:ems="10"
-        android:hint="Password"
-        android:inputType="textPassword"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.487"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextText" />
+        <EditText
+            android:id="@+id/editTextText"
+            android:layout_gravity="center"
+            android:layout_width="372dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="44dp"
+            android:drawableStart="@drawable/baseline_person"
+            android:drawablePadding="16dp"
+            android:ems="10"
+            android:hint="Username"
+            android:inputType="text" />
 
-    <TextView
-        android:id="@+id/forgetpass"
-        android:layout_width="140dp"
-        android:layout_height="31dp"
-        android:layout_marginTop="24dp"
-        android:gravity="center"
-        android:text="Forog Password?"
-        android:textColor="#000000"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" />
+        <EditText
+            android:id="@+id/editTextTextPassword"
+            android:layout_width="372dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="28dp"
+            android:drawableStart="@drawable/baseline_lock"
+            android:layout_gravity="center"
+            android:drawablePadding="16dp"
+            android:ems="10"
+            android:hint="Password"
+            android:inputType="textPassword" />
 
-    <Button
-        android:id="@+id/button"
-        style="@android:style/Widget.Material.Button.Inset"
-        android:layout_width="372dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="24dp"
-        android:background="#2155F3"
-        android:text="Login"
-        android:textColorHint="#2155F3"
-        app:iconTint="#2155F3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.41"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/forgetpass"
-        app:rippleColor="#2155F3" />
+        <Button
+            android:id="@+id/button"
+            style="@android:style/Widget.Material.Button.Inset"
+            android:layout_width="311dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
+            android:background="#2155F3"
+            android:text="Login"
+            android:textColorHint="#2155F3"
+            app:iconTint="#2155F3"
+            app:rippleColor="#2155F3" />
 
-    <Button
-        android:id="@+id/button2"
-        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-        android:layout_width="372dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="20dp"
-        android:background="#2155F3"
-        android:backgroundTint="#2155F3"
-        android:text="SignUp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.407"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button"
-        app:layout_constraintVertical_bias="0.0" />
+        <LinearLayout
+            android:layout_width="309dp"
+            android:layout_height="125dp"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
 
-    <Button
-        android:id="@+id/button3"
-        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-        android:layout_width="372dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="20dp"
-        android:background="#2155F3"
-        android:backgroundTint="#2155F3"
-        android:text="Guest Login"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.41"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button"
-        app:layout_constraintVertical_bias="0.278" />
+
+            <Button
+                android:id="@+id/button3"
+                style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                android:layout_width="150dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:background="#2155F3"
+                android:backgroundTint="#2155F3"
+                android:text="Guest Login" />
+
+            <Button
+                android:id="@+id/button2"
+                style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                android:layout_width="150dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:background="#2155F3"
+                android:backgroundTint="#2155F3"
+                android:text="SignUp" />
+        </LinearLayout>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
index 20bca53..06bad89 100644
--- a/app/src/main/res/layout/activity_notification.xml
+++ b/app/src/main/res/layout/activity_notification.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottomview2"
+        android:id="@+id/notifBottomView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/material_dynamic_primary60"
@@ -34,7 +34,7 @@
     <ListView
         android:layout_width="409dp"
         android:layout_height="471dp"
-        app:layout_constraintBottom_toTopOf="@+id/bottomview2"
+        app:layout_constraintBottom_toTopOf="@+id/notifBottomView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_predict.xml b/app/src/main/res/layout/activity_predict.xml
index 84c23e1..cfa9c96 100644
--- a/app/src/main/res/layout/activity_predict.xml
+++ b/app/src/main/res/layout/activity_predict.xml
@@ -85,7 +85,7 @@
         app:layout_constraintTop_toBottomOf="@+id/editTextText2" />
 
     <TextView
-        android:id="@+id/textView3"
+        android:id="@+id/userGreeting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Arrival Time:"
@@ -115,10 +115,10 @@
         android:layout_marginTop="4dp"
         android:contentDescription="arrival_carton_icon"
         android:src="@drawable/arrival_carton_icon"
-        app:layout_constraintEnd_toEndOf="@+id/textView3"
+        app:layout_constraintEnd_toEndOf="@+id/userGreeting"
         app:layout_constraintHorizontal_bias="0.176"
         app:layout_constraintStart_toEndOf="@+id/arrval_bus_icon"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+        app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
 
     <TextView
         android:id="@+id/predicted_time"
@@ -129,10 +129,10 @@
         android:layout_marginEnd="4dp"
         android:text="@string/predicted_time_string"
         android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="@+id/textView3"
+        app:layout_constraintEnd_toEndOf="@+id/userGreeting"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/arrival_carton_icon"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+        app:layout_constraintTop_toBottomOf="@+id/userGreeting" />
 
     <TextView
         android:id="@+id/textView4"
@@ -142,7 +142,7 @@
         android:text="Station"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.602"
-        app:layout_constraintStart_toEndOf="@+id/textView3"
+        app:layout_constraintStart_toEndOf="@+id/userGreeting"
         app:layout_constraintTop_toBottomOf="@+id/button4" />
 
     <ProgressBar