diff --git a/.gitignore b/.gitignore
index 41b4a3d..a036818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,5 +106,7 @@ dist
 .idea/workspace.xml
 
 .DS_Store
+
 /dist
+
 mongo_example_swarmlab.js
\ No newline at end of file
diff --git a/.idea/runConfigurations/dev_client.xml b/.idea/runConfigurations/dev_client.xml
deleted file mode 100644
index 128a3db..0000000
--- a/.idea/runConfigurations/dev_client.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="dev client" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/client/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="dev" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/dev_server.xml b/.idea/runConfigurations/dev_server.xml
deleted file mode 100644
index 178dee5..0000000
--- a/.idea/runConfigurations/dev_server.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="dev server" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/server/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="dev" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/run_client.xml b/.idea/runConfigurations/run_client.xml
deleted file mode 100644
index 16fb55f..0000000
--- a/.idea/runConfigurations/run_client.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="run client" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/client/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="run" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/run_server.xml b/.idea/runConfigurations/run_server.xml
deleted file mode 100644
index 80dccb1..0000000
--- a/.idea/runConfigurations/run_server.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="run server" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/server/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="run" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/server/routes/athletes.js b/server/routes/athletes.js
index a390e31..af015cc 100644
--- a/server/routes/athletes.js
+++ b/server/routes/athletes.js
@@ -28,33 +28,19 @@ router.get('/api/athletes/:id/edit',
     async (req, res) => {
         const athlete = await Athlete.findById(req.params.id)
         res.send(athlete)
-    }
-)
-;
+    });
 
 router.put('/api/athletes/:id',
     requireAuth,
     celebrate(athleteUpdateSchema, guid),
     async (req, res) => {
         const {name, _trainer} = req.body
-        const updateAthlete = {name, _trainer}
-
-        if (_trainer === '') {
-            updateAthlete._trainer = undefined
-            await Athlete.findByIdAndUpdate(req.params.id, updateAthlete, {}, (err, athlete) => {
-                if (err)
-                    return res.status(400).json({errors: 'Something went wrong!'});
-
-                return res.send(athlete)
-            })
-        } else if (name || _trainer)
-            await Athlete.findByIdAndUpdate(req.params.id, updateAthlete, {}, (err, athlete) => {
-                if (err)
-                    return res.status(400).json({errors: 'Something went wrong!'});
-
-                res.send(athlete)
-            })
+        await Athlete.findByIdAndUpdate(req.params.id, {name, _trainer}, {}, (err, athlete) => {
+            if (err)
+                return res.status(400).json({errors: 'Something went wrong!'});
 
+            res.send(athlete)
+        })
     });
 
 router.delete('/api/athlete/:id',
@@ -62,8 +48,6 @@ router.delete('/api/athlete/:id',
     celebrate(guid),
     async (req, res) => {
         await Athlete.findByIdAndDelete(req.params.id)
-    }
-)
-;
+    });
 
 module.exports = router;
diff --git a/server/routes/user.js b/server/routes/user.js
index 32eded9..7332f3c 100644
--- a/server/routes/user.js
+++ b/server/routes/user.js
@@ -22,14 +22,12 @@ router.put('/api/user/:id',
                 if (isMatch) {
                     const user = {username, email, newPassword}
                     await User.findByIdAndUpdate(req.params.id, user)
-
                     res.send(req.user);
                 }
             });
         } else if (username || email) {
             const user = {username, email}
             await User.findByIdAndUpdate(req.params.id, user)
-
             res.send(req.user);
         }
 
diff --git a/web/babel.config.js b/web/babel.config.js
index e955840..c94e729 100644
--- a/web/babel.config.js
+++ b/web/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
+    presets: [
+        '@vue/cli-plugin-babel/preset'
+    ]
 }
diff --git a/web/public/index.html b/web/public/index.html
index c46c86c..d35dd76 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta content="width=device-width,initial-scale=1.0" name="viewport">
+    <link href="<%= BASE_URL %>favicon.ico" rel="icon">
     <title><%= htmlWebpackPlugin.options.title %></title>
 </head>
 <style>
diff --git a/web/src/components/Navbar.vue b/web/src/components/Navbar.vue
index ae40d1c..50606a7 100644
--- a/web/src/components/Navbar.vue
+++ b/web/src/components/Navbar.vue
@@ -1,19 +1,17 @@
 <template>
-  <nav class="navbar is-fixed-top is-black" role="navigation" aria-label="main navigation">
+  <nav aria-label="main navigation" class="navbar is-fixed-top is-black" role="navigation">
     <div class="navbar-brand">
       <router-link to="/">
         <a class="navbar-item">
-          <img src="../assets/undraw_server_q2pb.svg" width="60" height="150"/>
+          <img height="150" src="../assets/undraw_server_q2pb.svg" width="60"/>
           <h3 class="is-size-4 has-text-white">Ichnaea</h3>
         </a>
       </router-link>
-      <a
-          role="button"
-          class="navbar-burger burger"
-          aria-label="menu"
-          aria-expanded="false"
-          data-target="navbarBasicExample"
-      >
+      <a aria-expanded="false"
+         aria-label="menu"
+         class="navbar-burger burger"
+         data-target="navbarBasicExample"
+         role="button">
         <span aria-hidden="true"></span>
         <span aria-hidden="true"></span>
         <span aria-hidden="true"></span>
diff --git a/web/src/slims-vuex.d.ts b/web/src/slims-vuex.d.ts
index b68c7fd..2d1e8e7 100644
--- a/web/src/slims-vuex.d.ts
+++ b/web/src/slims-vuex.d.ts
@@ -1,4 +1,4 @@
-import { Store } from '@/store';// path to store file
+import {Store} from '@/store'; // path to store file
 
 declare module '@vue/runtime-core' {
     interface ComponentCustomProperties {
diff --git a/web/src/store/modules/athletes.ts b/web/src/store/modules/athletes.ts
index 26569dc..2ce2721 100644
--- a/web/src/store/modules/athletes.ts
+++ b/web/src/store/modules/athletes.ts
@@ -8,7 +8,7 @@ export interface AthleteInterface {
     id: string,
     socketID: string,
     name: string,
-    _trainer: string
+    _trainer: string | undefined
 }
 
 @Module
@@ -34,15 +34,15 @@ export default class Athletes extends VuexModule {
         return this.err
     }
 
+    @Mutation save_trainer(trainer: UserInterface) {
+        this.trainer = trainer;
+    }
+
     @Mutation
     private save_athlete(athlete: AthleteInterface) {
         this.athlete = athlete;
     }
 
-    @Mutation save_trainer(trainer: UserInterface) {
-        this.trainer = trainer;
-    }
-
     @Mutation
     private api_athletes(athletes: [AthleteInterface]) {
         this.athletes = athletes;
diff --git a/web/src/store/modules/backend.ts b/web/src/store/modules/backend.ts
index 326a170..2210116 100644
--- a/web/src/store/modules/backend.ts
+++ b/web/src/store/modules/backend.ts
@@ -4,7 +4,7 @@ import {Module, Mutation, VuexModule} from 'vuex-module-decorators'
 export default class Backend extends VuexModule {
     private serverStatus = false
 
-    get currentStatus() {
+    get currentServerStatus() {
         return this.serverStatus
     }
 
diff --git a/web/src/views/Athletes.vue b/web/src/views/Athletes.vue
index cabf2db..3d12833 100644
--- a/web/src/views/Athletes.vue
+++ b/web/src/views/Athletes.vue
@@ -28,7 +28,7 @@
         </tr>
         </thead>
         <tr v-for="(athlete, index) in myAthletes" :key="index">
-          <td class="is-family-monospace" v-if="athlete.name">
+          <td v-if="athlete.name" class="is-family-monospace">
             <span v-if="athlete.socketID">Online</span>
             <span v-else>Offline</span>
           </td>
@@ -141,7 +141,6 @@ export default class Athletes extends Vue {
   private msg = ''
 
   mounted() {
-    this.myAthletes = [<AthleteInterface>{}]
     this.$store.dispatch('getAthletes')
         .then((res: any) => {
           this.athletes = res.data;
@@ -159,12 +158,11 @@ export default class Athletes extends Vue {
   }
 
   private removeMyAthlete(athlete: AthleteInterface, index: number) {
-    athlete._trainer = ''
+    athlete._trainer = undefined
     this.$store.dispatch('updateAthlete', athlete)
         .then(() => this.myAthletes.splice(index, 1))
   }
 
-
 }
 </script>
 
diff --git a/web/src/views/DashboardHome.vue b/web/src/views/DashboardHome.vue
index 8ce17c5..6fe56e0 100644
--- a/web/src/views/DashboardHome.vue
+++ b/web/src/views/DashboardHome.vue
@@ -25,16 +25,17 @@
         <div class="tile is-parent is-vertical">
           <article class="tile is-child box">
             <p class="title">System status</p>
-            <p class="subtitle">All systems operational</p>
+            <p v-if="this.$store.getters.currentServerStatus" class="subtitle">All systems operational</p>
+            <p v-else class="subtitle">Something does not seem right</p>
           </article>
           <article class="tile is-child box">
-            <p class="title">...tiles</p>
+            <p class="title">App Info</p>
             <p class="subtitle">Bottom tile</p>
           </article>
         </div>
         <div class="tile is-parent">
           <article class="tile is-child box">
-            <figure class="image is-4by3">
+            <figure class="image">
               <img src="../assets/undraw_finish_line_katerina_limpitsouni_xy20.svg">
             </figure>
           </article>
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index 1befeda..5051389 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -29,7 +29,7 @@
               </p>
             </div>
           </form>
-          <div class="m-4" v-if="msg">
+          <div v-if="msg" class="m-4">
             <div class="notification is-danger has-text-centered">
               <b>{{ msg }}</b>
             </div>