diff --git a/server/routes/athletes.js b/server/routes/athletes.js
index d7f09a3..92fe0b0 100644
--- a/server/routes/athletes.js
+++ b/server/routes/athletes.js
@@ -34,9 +34,10 @@ router.put('/api/athletes/:id',
 
             res.send(athlete);
         });
-    });
+    }
+);
 
-router.delete('/api/athlete/:id',
+router.delete('/api/athletes/:id',
     requireAuth,
     celebrate(guid),
     async (req, res) => {
diff --git a/server/schemas/joi.js b/server/schemas/joi.js
index f3951f5..6a4dbd4 100644
--- a/server/schemas/joi.js
+++ b/server/schemas/joi.js
@@ -32,8 +32,8 @@ const athleteUpdateSchema = {
         id: Joi.string().required(),
         socketID: Joi.string().required(),
         name: Joi.string().required(),
-        __v: Joi.number().integer(),
-        _trainer: Joi.string().allow('').default(''),
+        __v: Joi.number().integer().required(),
+        _trainer: Joi.string().optional(),
     }
 };
 
diff --git a/web/src/store/modules/athletes.ts b/web/src/store/modules/athletes.ts
index c59b520..01b837b 100644
--- a/web/src/store/modules/athletes.ts
+++ b/web/src/store/modules/athletes.ts
@@ -1,8 +1,6 @@
 import {Action, Module, Mutation, VuexModule} from 'vuex-module-decorators'
 import axios, {AxiosResponse} from "axios";
 
-import {UserInterface} from "@/store/modules/user";
-
 export interface AthleteInterface {
     _id: string,
     id: string,
@@ -14,7 +12,6 @@ export interface AthleteInterface {
 @Module
 export default class Athletes extends VuexModule {
     private athlete = <AthleteInterface>{};
-    private trainer = <UserInterface>{};
     private athletes = [<AthleteInterface>{}];
     private err = <Error>{};
 
@@ -22,22 +19,10 @@ export default class Athletes extends VuexModule {
         return this.athlete;
     }
 
-    get athlete_trainer() {
-        return this.trainer;
-    }
-
-    get athlete_currents() {
-        return this.athletes;
-    }
-
     get athlete_err() {
         return this.err;
     }
 
-    @Mutation api_trainer(trainer: UserInterface) {
-        this.trainer = trainer;
-    }
-
     @Mutation
     private api_athlete(athlete: AthleteInterface) {
         this.athlete = athlete;
@@ -51,7 +36,6 @@ export default class Athletes extends VuexModule {
     @Mutation
     private athletes_logout() {
         this.athlete = <AthleteInterface>{};
-        this.trainer = <UserInterface>{};
         this.athletes = [<AthleteInterface>{}];
     }
 
@@ -61,11 +45,14 @@ export default class Athletes extends VuexModule {
     }
 
     @Mutation
-    private athlete_addTrainer(trainer: UserInterface) {
-        this.trainer = trainer;
-        this.athlete._trainer = this.trainer._id;
+    private athlete_addTrainer(trainerId: string) {
+        this.athlete._trainer = trainerId;
     }
 
+    @Mutation
+    private athlete_deleteTrainer() {
+        delete this.athlete['_trainer'];
+    }
 
     @Action
     private athlete_getAll() {
diff --git a/web/src/store/modules/user.ts b/web/src/store/modules/user.ts
index 4908b57..d4be553 100644
--- a/web/src/store/modules/user.ts
+++ b/web/src/store/modules/user.ts
@@ -116,7 +116,6 @@ export default class User extends VuexModule {
         });
     }
 
-
     @Action
     private user_update() {
         return new Promise((resolve, reject) => {
diff --git a/web/src/views/Athlete.vue b/web/src/views/Athlete.vue
index 7a1e59d..456652e 100644
--- a/web/src/views/Athlete.vue
+++ b/web/src/views/Athlete.vue
@@ -30,12 +30,16 @@
       <form @submit="athlete_update">
         <div class="tile is-child box">
           <p class="title">Personal Details</p>
-          <div class="field">
+          <div v-if="useristrainer" class="field">
             <label class="label">Name</label>
             <div class="control">
               <input v-model="athlete.name" class="input" type="text">
             </div>
           </div>
+          <div v-else class="field">
+            <label class="label">Name</label>
+            <p>{{ athlete.name }}</p>
+          </div>
           <div class="field">
             <label class="label">Client Status</label>
             <p v-if="athlete.socketID">Online</p>
@@ -58,7 +62,7 @@
               </li>
             </ul>
           </div>
-          <div class="field">
+          <div v-if="useristrainer" class="field">
             <p class="control">
               <button class="button is-primary is-rounded" type="submit">
                 Update
@@ -119,6 +123,7 @@ import {UserInterface} from "@/store/modules/user";
 export default class Athlete extends Vue {
   private athlete = <AthleteInterface>{};
   private trainer = <UserInterface>{};
+  private useristrainer = false;
   private trainerLogin = '';
   private msgError = '';
   private msgSuccess = '';
@@ -129,16 +134,16 @@ export default class Athlete extends Vue {
 
     if (this.athlete._trainer && (this.athlete._trainer != this.$store.getters.user_current._id)) {
       this.$store.dispatch('user_getOne', this.athlete._trainer)
-          .then((res: any) => this.trainer === res.data)
+          .then((res: any) => this.trainer = res.data)
           .catch((err: any) => this.msgError = err.response.data.errors.message || err.message ||
               'Something went wrong!');
     } else if (this.athlete._trainer === this.$store.getters.user_current._id) {
       this.trainer = this.$store.getters.user_current;
+      this.useristrainer = true;
     }
 
     if (this.trainer) {
       this.trainerLogin = new Date(this.trainer.lastLogin).toLocaleString();
-      this.$store.commit('api_trainer', this.trainer);
     }
   }
 
@@ -148,16 +153,16 @@ export default class Athlete extends Vue {
       return;
     }
 
+    this.$store.commit('athlete_addTrainer', this.$store.getters.user_current._id);
     this.athlete_update();
   }
 
   private athlete_update() {
-    this.$store.commit('athlete_addTrainer', this.$store.getters.user_current);
-
     this.$store.dispatch('athlete_update')
         .then((res: any) => {
           this.msgSuccess = 'Athlete updated';
           this.athlete = res.data;
+          this.$router.go(0);
         })
         .catch(() => this.msgError = this.$store.getters.athlete_err.response.data.errors.message ||
             'Something went wrong!');
diff --git a/web/src/views/Athletes.vue b/web/src/views/Athletes.vue
index ff1f727..963a00e 100644
--- a/web/src/views/Athletes.vue
+++ b/web/src/views/Athletes.vue
@@ -157,10 +157,13 @@ export default class Athletes extends Vue {
     this.$store.commit('api_athlete', athlete);
   }
 
-  private athlete_delete(athlete: AthleteInterface, index: number) {
-    athlete._trainer = undefined;
-    this.$store.dispatch('athlete_update', athlete)
-        .then(() => this.myAthletes.splice(index, 1));
+  private athlete_delete(index: number) {
+    this.$store.commit('athlete_deleteTrainer');
+    this.$store.dispatch('athlete_update')
+        .then(() => {
+          this.myAthletes.splice(index, 1);
+          this.$router.go(0);
+        });
   }
 
 }
diff --git a/web/src/views/Profile.vue b/web/src/views/Profile.vue
index 68ce931..b20c1ec 100644
--- a/web/src/views/Profile.vue
+++ b/web/src/views/Profile.vue
@@ -1,5 +1,11 @@
 <template>
   <h1 class="title is-2">/profile</h1>
+  <div v-if="msgError" class="notification is-danger has-text-centered mt-5">
+    <b>{{ msgError }}</b>
+  </div>
+  <div v-else-if="msgSuccess" class="notification is-success has-text-centered mt-5">
+    <b>{{ msgSuccess }}</b>
+  </div>
   <form @submit.prevent="user_update">
     <div class="tile is-ancestor">
       <div class="tile is-4 is-vertical is-parent">
@@ -26,24 +32,30 @@
           </div>
         </div>
       </div>
-      <div class="tile is-parent">
+
+      <div class="tile is-vertical is-parent">
         <div class="tile is-child box">
           <p class="title">Change Password</p>
           <div class="field">
             <p class="control has-icons-left">
-              <input v-model="user.password" class="input" placeholder="Current Password" type="password">
+              <input v-model="user.newPassword" class="input" placeholder="New Password" type="password">
               <span class="icon is-small is-left"><i class="fas fa-lock"></i></span>
             </p>
           </div>
           <div class="field">
             <p class="control has-icons-left">
-              <input v-model="user.newPassword" class="input" placeholder="New Password" type="password">
+              <input v-model="user.repeatNewPassword" class="input" placeholder="Confirm Password" type="password">
               <span class="icon is-small is-left"><i class="fas fa-lock"></i></span>
             </p>
           </div>
+        </div>
+
+        <div class="tile is-child box">
+          <p class="title">Save Details</p>
+          <p class="subtitle">Enter your password to save!</p>
           <div class="field">
             <p class="control has-icons-left">
-              <input v-model="user.repeatNewPassword" class="input" placeholder="Confirm Password" type="password">
+              <input v-model="user.password" class="input" placeholder="Current Password" type="password">
               <span class="icon is-small is-left"><i class="fas fa-lock"></i></span>
             </p>
           </div>
@@ -54,21 +66,6 @@
               </button>
             </p>
           </div>
-          <div v-if="msgError" class="notification is-danger has-text-centered mt-5">
-            <b>{{ msgError }}</b>
-          </div>
-          <div v-else-if="msgSuccess" class="notification is-success has-text-centered mt-5">
-            <b>{{ msgSuccess }}</b>
-          </div>
-          <div v-else class="notification is-primary is-light mt-5">
-            <p>According to the traditional advice—which is still good—a strong password:</p>
-            <ul>
-              <li>Has 12 Characters, Minimum</li>
-              <li>Includes Numbers, Symbols, Capital Letters, and Lower-Case Letters</li>
-              <li>Isn’t a Dictionary Word or Combination of Dictionary Words</li>
-              <li>Doesn't Rely on Obvious Substitutions</li>
-            </ul>
-          </div>
         </div>
       </div>
     </div>
@@ -97,7 +94,10 @@ export default class Profile extends Vue {
     }
 
     this.$store.dispatch('user_update')
-        .then(() => this.msgSuccess = 'User updated!')
+        .then(() => {
+          this.msgError = '';
+          this.msgSuccess = 'User updated!';
+        })
         .catch(() => this.msgError = this.$store.getters.user_err.response.data.errors.message ||
             'Something went wrong!');
   }