diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8a8ea44
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# Don't track .vscode directory
+.vscode
+!.vscode/launch.json
+
diff --git a/server/.gitignore b/server/.gitignore
index 032b3b4..3f1f4a3 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -14,6 +14,7 @@
 
 # MS VSCode
 .vscode
+!.vscode/launch.json
 __debug_bin
 
 # Dependency directories (remove the comment below to include it)
@@ -22,4 +23,4 @@ assets/*
 keys/*
 backups/*
 nodemon.json
-dist/*
\ No newline at end of file
+dist/*
diff --git a/ui/.gitignore b/ui/.gitignore
index efc68ed..47253a4 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -29,3 +29,8 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+
+#Vs code files
+.vscode
+!.vscode/launch.json
+
diff --git a/ui/.vscode/settings.json b/ui/.vscode/settings.json
deleted file mode 100644
index 635d2a8..0000000
--- a/ui/.vscode/settings.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  // ===
-  // Spacing
-  // ===
-
-  "editor.insertSpaces": true,
-  "editor.tabSize": 2,
-  "editor.trimAutoWhitespace": true,
-  "files.trimTrailingWhitespace": true,
-  "files.eol": "\n",
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-
-  // ===
-  // Files
-  // ===
-
-  "files.exclude": {
-    "**/*.log": true,
-    "**/*.log*": true,
-    "**/dist": true,
-    "**/coverage": true
-  },
-  "files.associations": {
-    ".markdownlintrc": "jsonc"
-  },
-
-  // ===
-  // Event Triggers
-  // ===
-
-  "editor.formatOnSave": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.fixAll.stylelint": true,
-    "source.fixAll.markdownlint": true
-  },
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "vue",
-    "vue-html",
-    "html"
-  ],
-  "vetur.format.enable": false,
-  "vetur.completion.scaffoldSnippetSources": {
-    "user": "🗒️",
-    "workspace": "💼",
-    "vetur": ""
-  },
-  "prettier.disableLanguages": [],
-
-  // ===
-  // HTML
-  // ===
-
-  "html.format.enable": false,
-  "vetur.validation.template": false,
-  "emmet.triggerExpansionOnTab": true,
-  "emmet.includeLanguages": {
-    "vue-html": "html"
-  },
-  "vetur.completion.tagCasing": "initial",
-
-  // ===
-  // JS(ON)
-  // ===
-
-  "jest.autoEnable": false,
-  "jest.enableCodeLens": false,
-  "javascript.format.enable": false,
-  "json.format.enable": false,
-  "vetur.validation.script": false,
-
-  // ===
-  // CSS
-  // ===
-
-  "stylelint.enable": true,
-  "css.validate": false,
-  "scss.validate": false,
-  "vetur.validation.style": false,
-
-  // ===
-  // MARKDOWN
-  // ===
-
-  "[markdown]": {
-    "editor.wordWrap": "wordWrapColumn",
-    "editor.wordWrapColumn": 80
-  }
-}
diff --git a/ui/src/router/views/createVehicle.vue b/ui/src/router/views/createVehicle.vue
index 409c1df..2d385e8 100644
--- a/ui/src/router/views/createVehicle.vue
+++ b/ui/src/router/views/createVehicle.vue
@@ -140,7 +140,7 @@ export default {
       <b-field :label="this.$t('registration') + `*`">
         <b-input v-model="vehicleModel.registration" type="text" expanded required></b-input>
       </b-field>
-       <b-field label="VIN">
+      <b-field label="VIN">
         <b-input v-model="vehicleModel.vin" type="text" expanded></b-input>
       </b-field>
       <b-field :label="this.$t('fueltype') + `*`">
@@ -168,13 +168,21 @@ export default {
       <b-field :label="this.$t('yearmanufacture') + `*`">
         <b-input v-model.number="vehicleModel.yearOfManufacture" type="number" expanded number></b-input>
       </b-field>
-      <b-field :label="this.$t('yearmanufacture')">
+      <b-field :label="this.$t('enginesize')">
         <b-input v-model.number="vehicleModel.engineSize" type="number" expanded number></b-input>
       </b-field>
 
       <br />
       <b-field>
-        <b-button tag="input" native-type="submit" :disabled="tryingToCreate" type="is-primary" :value="this.$t('save')" :label="this.$t('createvehicle')" expanded>
+        <b-button
+          tag="input"
+          native-type="submit"
+          :disabled="tryingToCreate"
+          type="is-primary"
+          :value="this.$t('save')"
+          :label="this.$t('createvehicle')"
+          expanded
+        >
           <BaseIcon v-if="tryingToCreate" name="sync" spin />
         </b-button>
         <p v-if="authError">