diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 7b3179b0bf2b4d0f7a0702d1ea93c55c0433e711..d43a34472cff0387ee603c2ac64d21e3488413b0 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -17,13 +17,13 @@ q-layout(view='lHh Lpr lFf')
               | {{ menuItem.label }}
           q-separator(:key='"sep" + index', v-if='menuItem.separator')
     q-img.absolute-top(
-      src='https://i.pinimg.com/564x/a8/1e/01/a81e01701e045f8f70c71dd324c5a87a.jpg',
+      src='https://i.pinimg.com/originals/c6/77/a7/c677a7ca44173bfb724e798729494d19.jpg',
       style='height: 150px'
     )
       .row.absolute-bottom.bg-transparent.justify-center
         q-avatar(size='6.5em', style='margin-top: -95px')
           img(
-            src='https://avataaars.io/?avatarStyle=Circle&topType=Eyepatch&facialHairType=Blank&clotheType=ShirtVNeck&clotheColor=Pink&eyeType=Squint&eyebrowType=AngryNatural&mouthType=Default&skinColor=Light'
+            src='https://avataaars.io/?avatarStyle=Circle&topType=ShortHairShortFlat&accessoriesType=Round&hairColor=Blonde&facialHairType=BeardMedium&facialHairColor=Blonde&clotheType=Overall&clotheColor=Black&eyeType=Happy&eyebrowType=DefaultNatural&mouthType=Smile&skinColor=Light'
           )
         .text-bold.full-width.text-center {{ userDetails.name }}
         div {{ "@" + userDetails.username }}
diff --git a/src/pages/UserInfo.vue b/src/pages/UserInfo.vue
index 1826cd91a8465fc985c78d1f01721f8dd33641f9..a09a232629565290c79465747e56752be21ccce7 100644
--- a/src/pages/UserInfo.vue
+++ b/src/pages/UserInfo.vue
@@ -4,7 +4,7 @@
     q-btn.bg-grey-2.fixed-top-left.q-ma-sm(@click='$router.go(-1)', icon='arrow_back', label='Back')
     q-avatar(size='9em')
       img(
-        src='https://avataaars.io/?avatarStyle=Circle&topType=Eyepatch&facialHairType=Blank&clotheType=ShirtVNeck&clotheColor=Pink&eyeType=Squint&eyebrowType=AngryNatural&mouthType=Default&skinColor=Light'
+        src='https://avataaars.io/?avatarStyle=Circle&topType=ShortHairShortFlat&accessoriesType=Round&hairColor=Blonde&facialHairType=BeardMedium&facialHairColor=Blonde&clotheType=Overall&clotheColor=Black&eyeType=Happy&eyebrowType=DefaultNatural&mouthType=Smile&skinColor=Light'
       )
   q-input.q-py-md(v-model='localDetails.name', label='Full Name', stack-label, :readonly='isEditing')
   q-input.q-pb-md(v-model='localDetails.username', label='Username', stack-label, :readonly='isEditing')
diff --git a/src/static/data-structure.json b/src/static/data-structure.json
index 26359621dd9f831033e965634dd50173a8982782..a3381f9adbffe10f2b2b6fd6a8e2760abb9a828e 100644
--- a/src/static/data-structure.json
+++ b/src/static/data-structure.json
@@ -1,8 +1,8 @@
 {
   "users": {
     "9HsxN1tMHNOfmQV3E16LNfcFTdc2": {
-      "name": "Test Name",
-      "username": "testusername",
+      "name": "John Doe",
+      "username": "thejohnny",
       "email": "test@test.com",
       "phone": null,
       "dob": null,
@@ -10,8 +10,8 @@
       "description": null
     },
     "Oqk3C1ownieYIm8K0KgFqRXhKs53": {
-      "name": "Scientific Pig",
-      "username": "dontlookitup",
+      "name": "Joe Carter",
+      "username": "carterjoe",
       "email": "test3@test.com",
       "phone": null,
       "dob": null,
@@ -19,7 +19,7 @@
       "description": null
     },
     "l7TY1PJocphLufQb3zN1tfRJYsy1": {
-      "name": "how is this working lmao",
+      "name": "Kyle Harper",
       "username": "amogus",
       "email": "test4@test.com",
       "phone": null,
@@ -28,8 +28,8 @@
       "description": null
     },
     "oVHXZPeYRbQPfKTCmH4LWJtmaeH2": {
-      "name": "Eric Sauce",
-      "username": "theSaucer",
+      "name": "Karina Hall",
+      "username": "poggers",
       "email": "test2@test.com",
       "phone": null,
       "dob": null,
@@ -37,32 +37,6 @@
       "description": null
     }
   },
-  "chats": {
-    "9HsxN1tMHNOfmQV3E16LNfcFTdc2": {
-      "oVHXZPeYRbQPfKTCmH4LWJtmaeH2": {
-        "MESSAGEID1": {
-          "text": "Why eric 'sauce'?",
-          "from": "them"
-        },
-        "MESSAGEID2": {
-          "text": "Spaget",
-          "from": "me"
-        }
-      }
-    },
-    "oVHXZPeYRbQPfKTCmH4LWJtmaeH2": {
-      "9HsxN1tMHNOfmQV3E16LNfcFTdc2": {
-        "MESSAGEID1": {
-          "text": "Why eric 'sauce'?",
-          "from": "me"
-        },
-        "MESSAGEID2": {
-          "text": "Spaget",
-          "from": "them"
-        }
-      }
-    }
-  },
   "friends": {
     "9HsxN1tMHNOfmQV3E16LNfcFTdc2": {
       "friendList": {
@@ -75,9 +49,33 @@
     }
   },
   "status": {
-    "9HsxN1tMHNOfmQV3E16LNfcFTdc2": false,
-    "Oqk3C1ownieYIm8K0KgFqRXhKs53": false, 
-    "l7TY1PJocphLufQb3zN1tfRJYsy1": false, 
-    "oVHXZPeYRbQPfKTCmH4LWJtmaeH2": false
+    "9HsxN1tMHNOfmQV3E16LNfcFTdc2": {
+      "online" : false,
+      "position": {
+        "lat": 51.239300,
+        "lng": -0.584890
+      }
+    },
+    "Oqk3C1ownieYIm8K0KgFqRXhKs53": {
+      "online" : false,
+      "position": {
+        "lat": 51.239300,
+        "lng": -0.584890
+      }
+    }, 
+    "l7TY1PJocphLufQb3zN1tfRJYsy1": {
+      "online" : false,
+      "position": {
+        "lat": 51.239300,
+        "lng": -0.584890
+      }
+    },
+    "oVHXZPeYRbQPfKTCmH4LWJtmaeH2": {
+      "online" : false,
+      "position": {
+        "lat": 51.239300,
+        "lng": -0.584890
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/src/store/firebase.js b/src/store/firebase.js
index bfd3029295c40dbbebd444810c58e1065e0b0532..651552c6a545da08aac5084cb44165571604fafd 100644
--- a/src/store/firebase.js
+++ b/src/store/firebase.js
@@ -71,7 +71,9 @@ const mutations = {
 
   // Modify friends' online status as they go offline / online
   updateFriendStatus(state, payload) {
-    state.friends[payload.userId].online = payload.online
+    if(state.friends[payload.userId]) {
+      state.friends[payload.userId].online = payload.online
+    }
   },
 
   // Adds a pending friend request in 'pending' object