diff --git a/1.jpg b/1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0cf3442ec9d004cd15cb7213a3e0fec8a65964d4
Binary files /dev/null and b/1.jpg differ
diff --git a/frontend/92m3xrt.png b/frontend/92m3xrt.png
deleted file mode 100644
index b0b9dd265590ca55c4fecbc048f18cf27d1af7fa..0000000000000000000000000000000000000000
Binary files a/frontend/92m3xrt.png and /dev/null differ
diff --git a/frontend/computer-vision1-e1575654264450.png b/frontend/computer-vision1-e1575654264450.png
deleted file mode 100644
index 8dc5174efae1c640e53014f2dadcd87b414075c5..0000000000000000000000000000000000000000
Binary files a/frontend/computer-vision1-e1575654264450.png and /dev/null differ
diff --git a/frontend/config.js b/frontend/config.js
index f6674e721317bb520fdf300723c23b203c016686..09484b55da26def4988f1d9de566b203871029ec 100644
--- a/frontend/config.js
+++ b/frontend/config.js
@@ -1,5 +1,5 @@
 // Environment Variables
-var host = "http://192.168.1.5"
+var host = "http://192.168.18.6"
 var backendPort = "8081"
 var frontendPort = "80"
 // For development
diff --git a/frontend/mixins/outputs/pascalMethods.js b/frontend/mixins/outputs/pascalMethods.js
index fe679a034efc80752c12cd76a18f6b5a40a2ad93..80b4655ffbace1909782cbd9770f2bc7485c51e7 100644
--- a/frontend/mixins/outputs/pascalMethods.js
+++ b/frontend/mixins/outputs/pascalMethods.js
@@ -11,28 +11,31 @@ export default {
   mixins: [imageAndLabelMethods],
   methods: {
     async getObjectsAttr (allLabels) {
-      var objectsAttr = {}
+      console.log('labels: ', allLabels)
+      // var objectsAttr = {}
       for (var labelIdx in allLabels) {
         var label = allLabels[labelIdx]
         if (this.pascalJSON[label["image_id"]]) {
           var labelResponse = await this.getLabelContentByID(label["label_content_id"])
-          // If exists, push to the bounding box
-          if (objectsAttr[label["label_content_id"]]) {
-            objectsAttr[label["label_content_id"]].boundingBox.push(this.getBoundingBoxAttr(label))
-            this.pascalJSON[label["image_id"]].object.pop()
-            this.pascalJSON[label["image_id"]].object.push(objectsAttr[label["label_content_id"]])
-          } else {
-            // Else, Construct new Obj
-            var objectAttr = {
-              name: labelResponse["content_name"],
-              pose: "Unspecified",
-              truncated: 0,
-              difficult: 0,
-              boundingBox: [this.getBoundingBoxAttr(label)]
-            }
-            objectsAttr[label["label_content_id"]] = objectAttr
-            this.pascalJSON[label["image_id"]].object.push(objectsAttr[label["label_content_id"]])
+          var objectAttr = {
+            name: labelResponse["content_name"],
+            pose: "Unspecified",
+            truncated: 0,
+            difficult: 0,
+            boundingBox: this.getBoundingBoxAttr(label)
           }
+          this.pascalJSON[label["image_id"]].object.push(objectAttr)
+          // // If exists, push to the bounding box
+          // if (objectsAttr[label["label_content_id"]]) {
+          //   objectsAttr[label["label_content_id"]].boundingBox.push(this.getBoundingBoxAttr(label))
+          //   this.pascalJSON[label["image_id"]].object.pop()
+          //   this.pascalJSON[label["image_id"]].object.push(objectsAttr[label["label_content_id"]])
+          // } else {
+          //   // Else, Construct new Obj
+            
+          //   objectsAttr[label["label_content_id"]] = objectAttr
+            
+          // }
         }
       }
     },
diff --git a/frontend/pages/main/output-view/index.vue b/frontend/pages/main/output-view/index.vue
index 0b9728c221674c8c8db97e9a26711a7bdfe06b1b..58a447fba9ceb22735ec4a44e1caebc0dbdcda9a 100644
--- a/frontend/pages/main/output-view/index.vue
+++ b/frontend/pages/main/output-view/index.vue
@@ -12,7 +12,7 @@
       <div class="row">
         <div class="col">
           <button class="btn-action btn-white" @click="downloadOutput()">
-            {{ name }}.{{ type }}
+            {{ name }}
             <i class="ml-3 mt-1 fas fa-download" />
           </button>
         </div>
@@ -95,15 +95,6 @@ export default {
       }
       return COCOJSON
     },
-    async getCategoriesAndAnnotationsArrPerImage () {
-      var allLabelsPerImage = await this.getLabelByImageID(this.id)
-      var categoriesArr = await this.getCategoriesArr(allLabelsPerImage)
-      var annotationsArr = await this.getAnnotationsArr(allLabelsPerImage)
-      return {
-        categories: categoriesArr,
-        annotations: annotationsArr
-      }
-    },
     async getPascalXMLPerImage () {
       this.pascalJSON = {}
       var newPascalJSON = {"annotation": []}
@@ -112,12 +103,22 @@ export default {
         var label = await this.getLabelByImageID(this.id)
         await this.setImagesAttr(allImages)
         await this.getObjectsAttr(label)
+        console.log('pascal: ', this.pascalJSON)
         for (var key in this.pascalJSON) {
           newPascalJSON["annotation"].push(this.pascalJSON[key])
         }
         return newPascalJSON
       }
     },
+    async getCategoriesAndAnnotationsArrPerImage () {
+      var allLabelsPerImage = await this.getLabelByImageID(this.id)
+      var categoriesArr = await this.getCategoriesArr(allLabelsPerImage)
+      var annotationsArr = await this.getAnnotationsArr(allLabelsPerImage)
+      return {
+        categories: categoriesArr,
+        annotations: annotationsArr
+      }
+    },
     async setImagesAttr (allImages) {
       for (var imageIdx in allImages) {
         var image = allImages[imageIdx]
@@ -145,8 +146,6 @@ export default {
       }
       else {
         this.json = await this.getPascalXMLPerImage()
-        
-        
         filename += '.xml'
         element.setAttribute('href', 'data:text/json;charset=utf-8,' + encodeURIComponent(this.convertToXML(this.json)))
       }
@@ -171,11 +170,8 @@ export default {
       // var xml = this.convertToXML(this.json)
       var mydiv = document.getElementById("xml")
       if (mydiv) {
-        
         mydiv.innerHTML += xml
-        
       }
-      
     }
   }
 }
diff --git a/frontend/pages/main/pascal.vue b/frontend/pages/main/pascal.vue
index 7468a821bcff2f33b7d34524ca31dc0132c98738..e5190986912531765329998a2a485b7a668653ad 100644
--- a/frontend/pages/main/pascal.vue
+++ b/frontend/pages/main/pascal.vue
@@ -76,7 +76,7 @@ export default {
         var allLabels = await this.getAllLabel()
         await this.setImagesAttr(allImages)
         await this.getObjectsAttr(allLabels)
-
+        console.log('pascal: ', this.pascalJSON)
         for (var key in this.pascalJSON) {
           newPascalJSON["annotation"].push(this.pascalJSON[key])
         }
diff --git a/frontend/pages/viewer/index-edit.vue b/frontend/pages/viewer/index-edit.vue
index 5b7a6d003115f534c45451f4914ebda1a4f813b3..0708791d008ee8c7868141802c633cce05f917d7 100644
--- a/frontend/pages/viewer/index-edit.vue
+++ b/frontend/pages/viewer/index-edit.vue
@@ -179,7 +179,7 @@ export default {
     },
     async drawAllBox () {
       var allLabels = await this.getAllLabels()
-      
+      console.log('labeleeees: ', allLabels)
       if (allLabels) {
         var labeledCount = Object.keys(allLabels).length
         var imageAttributes = {
@@ -204,6 +204,7 @@ export default {
           this.labelCount++
           this.boxes[this.labelCount] = newBox
           this.boxesCount++
+          console.log('prev: ', this.boxes)
           // 
           this.changeBoxContent(newBox.content, this.labelCount)
           // this.makeCurrentBoxActive(this.labelCount)
@@ -328,7 +329,6 @@ export default {
         const imagePosition = this.getImagePositionRelativeToScreen(imageAttributes)
         if(this.boxesCount > countBox) {
           for (let delKey in this.deletedBoxes) {
-            
             if (delKey == Object.keys(this.deletedBoxKey)[delKey - 1 - move] ) {
               try {
                 await this.deleteLabelsInImage(Object.values(this.deletedBoxKey)[delKey - 1 - move])
@@ -344,7 +344,6 @@ export default {
             }
           }  
         } 
-
         for (let key in this.boxes) {
           if (key == Object.keys(this.previouslyCreatedBox)[key - 1 - move] ) {
             // edit
@@ -372,7 +371,6 @@ export default {
             delete this.previouslyCreatedBox[Object.keys(this.previouslyCreatedBox)[key - 1 - move]]
             move++
             labelPutPayload.pop()
-            
           } else {
             tempArray.push(this.boxes[key])
           }
@@ -387,7 +385,6 @@ export default {
             try {
               content_id = await this.createLabelContent(tempArray[idxBox].content)
               singleBackendObj = {
-                // TODO: change temporary image_id of 1 to real image_id
                 image_id: parseInt(this.image.id),
                 label_x_center: realImageAttr.xCenter,
                 label_y_center: realImageAttr.yCenter,
@@ -396,6 +393,7 @@ export default {
                 label_content_id: content_id
               }
               labelPayload.push(singleBackendObj)
+              console.log('Label Payload: ', labelPayload)
             } catch (error) {
               this.showFailedAlert("Error!", error)
               return