diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java
index a7999fb..c3d9de1 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java
@@ -13,8 +13,24 @@ public class Booking {
     public enum Status {
         PENDING, CONFIRMED, CANCELLED
     }
+    private Status status;
+
     int rating; //out of 5
 
+    public Booking(int starth, int startmin, int endh, int endmin, int day, int month, int year,
+                   String serviceprovider, String homeowner){
+        this.starth = starth;
+        this.startmin = startmin;
+        this.endh = endh;
+        this.endmin = endmin;
+        this.day = day;
+        this.month = month;
+        this.year = year;
+        this.serviceprovider = serviceprovider;
+        this.homeowner = homeowner;
+        this.status = Status.PENDING;
+    }
+
 
     public int getStarth() {
         return starth;
@@ -88,6 +104,14 @@ public class Booking {
         this.homeowner = homeowner;
     }
 
+    public void setStatus(Status status){
+        this.status = status;
+    }
+
+    public Status getStatus(){
+        return this.status;
+    }
+
     public int getRating() {
         return rating;
     }
diff --git a/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml b/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml
index fb775e0..7b91c0e 100644
--- a/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml
@@ -11,7 +11,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:background="@drawable/background"
-    tools:context=".Welcome">
+    tools:context=".AdminWelcome">
     <TextView
         android:id="@+id/Welcome"
         android:layout_width="300dp"
diff --git a/OlympusServices/app/src/main/res/layout/activity_users_list.xml b/OlympusServices/app/src/main/res/layout/activity_users_list.xml
index 6b05bc9..ab4c175 100644
--- a/OlympusServices/app/src/main/res/layout/activity_users_list.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_users_list.xml
@@ -11,7 +11,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:background="@drawable/background"
-    tools:context=".Welcome">
+    tools:context=".UsersList">
 
 
     <LinearLayout