diff --git a/src/components/Home.vue b/src/components/Home.vue
index 10d059b..e12574b 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -61,6 +61,8 @@ export default {
     const resp = await fetch(this.url);
     // Store the json values into the
     this.weightData = await resp.json();
+    // Check if there is any data, if there isn't then exit the function
+    if (this.weightData.length === 0) return;
     this.pvOptions = {
       xaxis: {
         type: 'datetime',
diff --git a/src/components/Weight.vue b/src/components/Weight.vue
index 71adbf4..408ae48 100644
--- a/src/components/Weight.vue
+++ b/src/components/Weight.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- opacity-0 pointer-events-none  -->
-  <div
+  <form v-on:submit="createWeight"
     class="grid justify-center md:border-2 rounded border-blue-500 p-4 md:mx-32 gap-4 text-sm md:text-xl"
   >
     <!-- <div
@@ -93,11 +93,11 @@
       />
     </div>
     <div class="button-item span-across">
-      <button @click="createWeight">
+      <button @click.prevent="createWeight">
         Add weight
       </button>
     </div>
-  </div>
+  </form>
 </template>
 
 <script>
@@ -106,12 +106,12 @@ const url = '/.netlify/functions/weight-create';
 export default {
   data: () => ({
     weightDate: '',
-    weightKilograms: 0.0,
-    fatPercent: 0.0,
-    weightBone: 0.0,
-    waterPercent: 0.0,
-    weightMuscle: 0.0,
-    bellyIndex: 0.0,
+    weightKilograms: null,
+    fatPercent: null,
+    weightBone: null,
+    waterPercent: null,
+    weightMuscle: null,
+    bellyIndex: null,
   }),
   methods: {
     createWeight: function() {