diff --git a/src/assets/img/default_profile_pic.png b/src/assets/img/default_profile_pic.png
new file mode 100644
index 0000000..2b8b658
Binary files /dev/null and b/src/assets/img/default_profile_pic.png differ
diff --git a/src/components/appbar/AppBar.vue b/src/components/appbar/AppBar.vue
index 7aa9ae2..5145305 100644
--- a/src/components/appbar/AppBar.vue
+++ b/src/components/appbar/AppBar.vue
@@ -7,7 +7,7 @@
       </v-toolbar-title>
       <v-spacer/>
 
-      <v-btn to="/login" class="bg-blue-darken-1 mx-5">
+      <v-btn variant="elevated" elevation="1" to="/login" color="paletteBlue mx-5">
         <strong>GET STARTED</strong>
       </v-btn>
     </v-app-bar>
diff --git a/src/components/signup/Signup.vue b/src/components/signup/Signup.vue
index 453d32f..3c7f763 100644
--- a/src/components/signup/Signup.vue
+++ b/src/components/signup/Signup.vue
@@ -1,5 +1,5 @@
 <template>
-  <h2 class="text-center text-decoration-underline">Sign Up for an Account</h2>
+  <h2 class="text-center text-decoration-underline">Sign up for an account</h2>
   <v-row align="center" justify="center" class="text-center" no-gutters>
     <v-col cols="12" sm="6">
       <v-form v-model="formValid" fast-fail @submit.prevent="handleSignup">
@@ -24,11 +24,11 @@
               v-model="user.confirmPassword" :rules="confirmPasswordRule"
               :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'" required />
           </v-col>
-          <v-row no-gutters>
-            <v-col cols="12">
-              <v-checkbox color="success" label="I agree to site terms and conditions" />
+        </v-row>
+        <v-row no-gutters class="text-center" justify="center">
+            <v-col cols="12" class="text-center">
+              <v-checkbox class="text-center" color="success" label="I agree to site terms and conditions" />
             </v-col>
-          </v-row>
         </v-row>
         <v-btn type="submit" color="blue" elevation="6" class="mt-5" tile>Sign up</v-btn>
       </v-form>
diff --git a/src/pages/dashboard/Dashboard.scss b/src/pages/dashboard/Dashboard.scss
index 1f8983f..880ba4f 100644
--- a/src/pages/dashboard/Dashboard.scss
+++ b/src/pages/dashboard/Dashboard.scss
@@ -1,6 +1,5 @@
 .profileImage {
-  border: 1px solid #000;
-  width: 80%;
+  width: 200px;
 }
 
 .stat-card {
diff --git a/src/pages/dashboard/Dashboard.vue b/src/pages/dashboard/Dashboard.vue
index 6e22d94..25b9f34 100644
--- a/src/pages/dashboard/Dashboard.vue
+++ b/src/pages/dashboard/Dashboard.vue
@@ -203,7 +203,7 @@
                 </template>
               </v-text-field>
             </v-col>
-            <v-col cols="12" md="6" class="mt-5">
+            <v-col cols="12" md="6">
               <pie-chart
                   :series="Object.values(this.exercisesOccurences)"
                   :labels="exercisesLabels"
@@ -312,14 +312,14 @@
       </v-card>
     </v-col>
     <v-col cols="12" md="6">
-      <v-card variant="text" elevation="10">
+      <v-card variant="text" elevation="10" class="fill-height">
         <v-card-title class="text-center">
           <h2><i>Stats</i></h2>
         </v-card-title>
-        <v-card-text class="mt-14">
-          <v-row justify="center">
-            <v-col v-for="(stat, index) in stats" :key="index">
-              <v-card variant="elevated" elevation="10" width="150" height="130" class="stat-card" :color="stat.color">
+        <v-card-text class="mt-14 text-center">
+          <v-row class="text-center" align="center" justify="center" dense>
+            <v-col v-for="(stat, index) in stats" :key="index" class="d-flex flex-column justify-center align-center">
+              <v-card variant="elevated" elevation="10" width="150" height="130" class="stat-card text-center" :color="stat.color">
                 <v-card-title class="stat-title">{{ stat.title }}</v-card-title>
                 <v-divider color="black"/>
                 <v-card-text class="stat-value">{{ stat.value }}</v-card-text>
@@ -365,7 +365,7 @@ export default {
         bio: '',
         profilePic: '',
       },
-      profilePicPath: null,
+      profilePicPath: require('@/assets/img/default_profile_pic.png'),
       improvement: {
         timeStamp: null,
         bodyWeight: null,
@@ -375,7 +375,7 @@ export default {
         quadriceps: null
       },
       stats: [
-        {title: 'Workouts', value: 10, color: 'cyan'},
+        {title: 'Workouts', value: 5, color: 'cyan'},
         {title: 'Messages', value: 6, color: 'orange'},
         {title: 'Notifications', value: 2, color: 'green'},
       ],
@@ -423,7 +423,10 @@ export default {
           res => {
             if (res != null) {
               this.user = res
-              this.profilePicPath = process.env.VUE_APP_BASE_URL + this.user.profilePic
+              if(this.user.profilePic) {
+                console.log(this.user.profilePic)
+                this.profilePicPath = process.env.VUE_APP_BASE_URL + this.user.profilePic
+              }
             }
           })
     },
diff --git a/src/pages/home/HomePage.scss b/src/pages/home/HomePage.scss
index a8c7a87..d79cf8c 100644
--- a/src/pages/home/HomePage.scss
+++ b/src/pages/home/HomePage.scss
@@ -2,12 +2,18 @@
   padding-top: 70pt;
   align-items: center;
   justify-content: center;
+  @media screen and (max-width: 767px) {
+    padding-top: 40pt;
+  }
 }
 
 .title {
   font-size: 80px;
   font-style: italic;
   text-align: center;
+  @media screen and (max-width: 767px) {
+    font-size: 60px;
+  }
 }
 
 .last-char {
@@ -15,9 +21,12 @@
 }
 
 .subtitle {
-  font-size: 40px;
+  font-size: 45px;
   font-style: italic;
   text-align: center;
+  @media screen and (max-width: 767px) {
+    font-size: 30px;
+  }
 }
 
 .image-container {
@@ -29,6 +38,9 @@
 .background-image {
   max-width: 35%;
   animation: slideX 1s ease-in-out forwards;
+  @media screen and (max-width: 767px) {
+    max-width: 60%;
+  }
 }
 
 .up {
diff --git a/src/pages/home/HomePage.vue b/src/pages/home/HomePage.vue
index e0b6fa1..c65af3c 100644
--- a/src/pages/home/HomePage.vue
+++ b/src/pages/home/HomePage.vue
@@ -25,7 +25,10 @@
         <v-col cols="12" md="5" class="text-center">
           <div class="image-container mt-10">
             <v-scroll-x-transition>
-              <img src="@/assets/img/home_backgrounds/standing_man_weights.jpg" class="background-image" alt="athletx home page image">
+              <img src="@/assets/img/home_backgrounds/standing_man_weights.jpg"
+                   class="background-image"
+                   alt="athletx home page image"
+                  >
             </v-scroll-x-transition>
           </div>
         </v-col>
@@ -46,7 +49,7 @@
                       max-width="80px"
                       class="d-block ml-auto mr-auto mt-5"
                   ></v-img>
-                  <v-card-title><h4>{{ feature.title }}</h4></v-card-title>
+                  <v-card-title class="text-wrap"><h4>{{ feature.title }}</h4></v-card-title>
                   <v-card-text>
                     {{ feature.text }}
                   </v-card-text>
diff --git a/src/pages/profile/Profile.scss b/src/pages/profile/Profile.scss
index 0dcc70b..1b7998d 100644
--- a/src/pages/profile/Profile.scss
+++ b/src/pages/profile/Profile.scss
@@ -1,4 +1,3 @@
 .profileImage {
-    border: 1px solid #000;
-    width: 80%;
+    width: 150px;
   }
\ No newline at end of file
diff --git a/src/pages/profile/Profile.vue b/src/pages/profile/Profile.vue
index d193e08..13a8c49 100644
--- a/src/pages/profile/Profile.vue
+++ b/src/pages/profile/Profile.vue
@@ -1,6 +1,6 @@
 <template>
   <v-row class="mt-2">
-    <v-col md="1" />
+    <v-col md="1"/>
     <v-col cols="12" md="5" class="text-center">
       <v-card variant="outlined" elevation="10">
         <v-card-title>
@@ -10,14 +10,14 @@
           <v-container>
             <v-row justify="center">
               <v-col cols="12" md="5">
-                <v-img :src="profilePicPath" alt="profile image" class="profileImage" />
+                <v-img :src="profilePicPath" alt="profile image" class="profileImage mx-auto"/>
               </v-col>
-              <v-col cols="12" md="5" class="mt-8">
-                <v-file-input v-if="editingProfile" label="Change profile picture" accept="image/*" v-model="files" variant="outlined"
-                  @change="handlePictureChange">
+              <v-col cols="12" md="5" class="mt-8" v-if="editingProfile">
+                <v-file-input label="Change profile picture" accept="image/*" v-model="files" variant="outlined"
+                              @change="handlePictureChange">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/user.png')" />
+                      <v-img :src="require('@/assets/img/icons/user.png')"/>
                     </v-icon>
                   </template>
                 </v-file-input>
@@ -28,7 +28,7 @@
                 <v-text-field label="Name" v-model="user.name" :readonly="!editingProfile" variant="outlined" color="blue-darken-1">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/name.png')" />
+                      <v-img :src="require('@/assets/img/icons/name.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -37,7 +37,7 @@
                 <v-text-field label="Surname" v-model="user.surname" :readonly="!editingProfile" variant="outlined" color="blue-darken-1">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/name.png')" />
+                      <v-img :src="require('@/assets/img/icons/name.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -48,7 +48,7 @@
                 <v-text-field label="City" v-model="user.city" :readonly="!editingProfile" variant="outlined" color="blue-darken-1">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/city.png')" />
+                      <v-img :src="require('@/assets/img/icons/city.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -57,7 +57,7 @@
                 <v-text-field label="Country" v-model="user.country" :readonly="!editingProfile" variant="outlined" color="blue-darken-1">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/country.png')" />
+                      <v-img :src="require('@/assets/img/icons/country.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -66,20 +66,20 @@
             <v-row justify="center">
               <v-col cols="12" md="5" class="mr-2">
                 <v-text-field color="blue-darken-1" variant="outlined" :readonly="!editingProfile" type="number" :min="0" :max="100" label="Age"
-                  v-model="user.age">
+                              v-model="user.age">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/age.png')" />
+                      <v-img :src="require('@/assets/img/icons/age.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
               </v-col>
               <v-col cols="12" md="5">
                 <v-text-field type="number" :min="0" :max="250" :readonly="!editingProfile" color="blue-darken-1" variant="outlined"
-                  label="Height (Cm)" v-model="user.height">
+                              label="Height (Cm)" v-model="user.height">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/height.png')" />
+                      <v-img :src="require('@/assets/img/icons/height.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -90,7 +90,7 @@
                 <v-textarea variant="outlined" color="blue-darken-1" :readonly="!editingProfile" label="About Me" v-model="user.bio">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/bio.png')" />
+                      <v-img :src="require('@/assets/img/icons/bio.png')"/>
                     </v-icon>
                   </template>
                 </v-textarea>
@@ -98,7 +98,7 @@
             </v-row>
             <v-row class="text-center my-3" no-gutters justify="center">
               <v-btn v-if="editingProfile" size="small" color="paletteBlue" variant="elevated" elevation="6" class="mr-1"
-                @click="updateProfile">
+                     @click="updateProfile">
                 Save
               </v-btn>
               <v-btn v-if="!editingProfile" size="small" color="paletteBlue" variant="elevated" elevation="6" @click="editingProfile=!editingProfile" to="/profile">
@@ -112,14 +112,14 @@
         </v-form>
       </v-card>
     </v-col>
-    <v-col md="1" />
+    <v-col md="1"/>
     <v-col cols="12" md="4">
       <v-card variant="outlined" elevation="10">
         <v-card-title class="text-center">
           <h2><i>Improvements</i></h2>
         </v-card-title>
         <v-img :src="require('@/assets/img/icons/improvement.png')" max-width="120px"
-          class="d-block ml-auto mr-auto mt-2" />
+               class="d-block ml-auto mr-auto mt-2"/>
         <v-card-text>
           <v-form>
             <v-row justify="center" no-gutters>
@@ -127,7 +127,7 @@
                 <v-text-field readonly variant="outlined"> {{ new Date().toLocaleDateString() }}
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/calendar.png')" />
+                      <v-img :src="require('@/assets/img/icons/calendar.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -136,10 +136,10 @@
             <v-row justify="center" no-gutters>
               <v-col cols="12" md="8">
                 <v-text-field type="number" label="Body Weight (Kg)" :readonly="!editingImprovements" :min="0" :max="250" variant="outlined"
-                  v-model="improvement.bodyWeight">
+                              v-model="improvement.bodyWeight">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/weight.png')" />
+                      <v-img :src="require('@/assets/img/icons/weight.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -148,10 +148,10 @@
             <v-row justify="center" no-gutters>
               <v-col cols="12" md="8">
                 <v-text-field type="number" label="Body Fat (%)" :readonly="!editingImprovements" variant="outlined" :max="100" :min="0"
-                  v-model="improvement.bodyFat">
+                              v-model="improvement.bodyFat">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/body-fat.png')" />
+                      <v-img :src="require('@/assets/img/icons/body-fat.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -160,30 +160,30 @@
             <v-row justify="center" no-gutters>
               <v-col cols="12" md="4">
                 <v-text-field type="number" label="Biceps (cm)" variant="outlined" :readonly="!editingImprovements" v-model="improvement.biceps" :min="0"
-                  :max="50">
+                              :max="50">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/biceps.png')" />
+                      <v-img :src="require('@/assets/img/icons/biceps.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
               </v-col>
               <v-col cols="12" md="4">
                 <v-text-field type="number" label="Chest (cm)" variant="outlined" :readonly="!editingImprovements" v-model="improvement.chest" :min="0"
-                  :max="100">
+                              :max="100">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/chest.png')" />
+                      <v-img :src="require('@/assets/img/icons/chest.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
               </v-col>
               <v-col cols="12" md="4">
                 <v-text-field type="number" label="Quadriceps (cm)" variant="outlined" :readonly="!editingImprovements" v-model="improvement.quadriceps"
-                  :min="0" :max="100">
+                              :min="0" :max="100">
                   <template v-slot:prepend-inner>
                     <v-icon size="large">
-                      <v-img :src="require('@/assets/img/icons/quadriceps.png')" />
+                      <v-img :src="require('@/assets/img/icons/quadriceps.png')"/>
                     </v-icon>
                   </template>
                 </v-text-field>
@@ -191,7 +191,7 @@
             </v-row>
             <v-row class="text-center mb-2" justify="center">
               <v-btn v-if="editingImprovements" size="small" color="paletteBlue" variant="elevated" elevation="6" class="mr-1"
-                @click="addNewImprovement">
+                     @click="addNewImprovement">
                 Save
               </v-btn>
               <v-btn v-if="!editingImprovements" size="small" color="paletteBlue" variant="elevated" elevation="6" @click="editingImprovements=!editingImprovements" to="/profile">
@@ -230,7 +230,7 @@ export default {
       },
       files: null,
       inputProfilePic: null,
-      profilePicPath: null,
+      profilePicPath: require('@/assets/img/default_profile_pic.png'),
       improvement: {
         timeStamp: null,
         bodyWeight: null,
@@ -248,21 +248,23 @@ export default {
   methods: {
     async fetchUserInfo() {
       await UserService.getUserInfo(this.userId).then(
-        res => {
-          if (res != null) {
-            this.user = res
-            this.profilePicPath = process.env.VUE_APP_BASE_URL + this.user.profilePic
+          res => {
+            if (res != null) {
+              this.user = res
+              if (this.user.profilePic) {
+                this.profilePicPath = process.env.VUE_APP_BASE_URL + this.user.profilePic
+              }
+            }
           }
-        }
       )
     },
     async fetchUserImprovement() {
       await UserService.getUserImprovement(this.userId).then(
-        res => {
-          if (res != null) {
-            this.improvement = res
+          res => {
+            if (res != null) {
+              this.improvement = res
+            }
           }
-        }
       )
     },
     async updateProfile() {
diff --git a/src/services/auth-header.js b/src/services/auth-header.js
index 3689051..e42660b 100644
--- a/src/services/auth-header.js
+++ b/src/services/auth-header.js
@@ -7,4 +7,4 @@ function authHeader(){
     }
 }
 
-export default authHeader
\ No newline at end of file
+export default authHeader;
\ No newline at end of file
diff --git a/src/services/auth.service.js b/src/services/auth.service.js
index c8b2735..085d9c2 100644
--- a/src/services/auth.service.js
+++ b/src/services/auth.service.js
@@ -1,6 +1,8 @@
 import axiosInstance from '@/utils/axios';
-class AuthService{
-    async login(user){
+
+class AuthService {
+
+    async login(user) {
         const response = await axiosInstance.post("/auth/login", user);
         const usr = response.data.user;
         if (usr) {
@@ -9,13 +11,13 @@ class AuthService{
         return usr;
     }
 
-    async logout(){
+    async logout() {
         const user = localStorage.getItem("user")
         await axiosInstance.post("/auth/logout", user);
         localStorage.removeItem('user');
     }
 
-    signup(user){
+    signup(user) {
         return axiosInstance.post("/auth/signup", user)
     }
 }
diff --git a/src/services/goal.service.js b/src/services/goal.service.js
index bab9029..aacbf2c 100644
--- a/src/services/goal.service.js
+++ b/src/services/goal.service.js
@@ -7,12 +7,10 @@ class GoalService{
         return response.data
     }
     async createNewGoal(userId, goal){
-        const response = await axiosInstance.post("/" + userId + "/goals", goal, {headers: authHeader()})
-        return response
+        return await axiosInstance.post("/" + userId + "/goals", goal, {headers: authHeader()})
     }
     async setGoalAsAchieved(userId, goalId){
-        const response = await axiosInstance.patch("/" + userId + "/goals/" + goalId, {headers: authHeader()})
-        return response
+        return await axiosInstance.patch("/" + userId + "/goals/" + goalId, {headers: authHeader()})
     }
 }
 
diff --git a/src/services/user.service.js b/src/services/user.service.js
index 4088010..331fe6d 100644
--- a/src/services/user.service.js
+++ b/src/services/user.service.js
@@ -1,13 +1,15 @@
 import axiosInstance from '@/utils/axios';
 import authHeader from './auth-header';
 
-class UserService{
+class UserService {
+
     getUserInfo(userId){
         return axiosInstance.get("/users/info/"+userId, {headers: authHeader() })
             .then(response => {
                 return response.data
             })
     }
+
     updateUserInfo(userId, userInfo){
         const contentType = {'Content-Type': 'multipart/form-data'}
         return axiosInstance.patch("/users/info/"+userId, userInfo,
diff --git a/src/services/workout.service.js b/src/services/workout.service.js
index 2d9ceb0..1ee8fd9 100644
--- a/src/services/workout.service.js
+++ b/src/services/workout.service.js
@@ -2,6 +2,7 @@ import axiosInstance from "@/utils/axios";
 import authHeader from "@/services/auth-header";
 
 class WorkoutService {
+
   async getWorkouts(userId) {
     const response = await axiosInstance.get("/" + userId + "/workouts", {
       headers: authHeader(),
@@ -40,12 +41,11 @@ class WorkoutService {
   }
 
   async createWorkout(userId, workout) {
-    const response = await axiosInstance.post(
-      "/" + userId + "/workouts",
-      workout,
-      { headers: authHeader() }
+    return await axiosInstance.post(
+        "/" + userId + "/workouts",
+        workout,
+        {headers: authHeader()}
     );
-    return response;
   }
 
   async updateWorkout(userId, workoutId, workout) {