diff --git a/Importer/trackorder.html b/Importer/trackorder.html
index d5435ab..8361ec6 100644
--- a/Importer/trackorder.html
+++ b/Importer/trackorder.html
@@ -328,7 +328,8 @@ License: You must have a valid license purchased only from themeforest(the above
                                     <div class="portlet-title">
                                         <div class="caption">
                                             <i class="icon-directions font-green hide"></i>
-                                            <span class="caption-subject bold font-dark uppercase "> Milestone (Order No : 014587) </span>
+                                            <span class="caption-subject bold font-dark uppercase "> Milestone </span> &nbsp; &nbsp;  014587 :
+                                            <span class="editInPlace"> Group 1 </span>
                                             <span class="caption-helper"></span>
                                         </div>
                                         </div>
@@ -503,18 +504,10 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         </div>
                                                         <div class="clearfix"></div>
                                                         <div class="form-group">
-                                                        <label><b>New Arrival Date</b></label>
+                                                        <label><b>Arrival Date</b></label>
                                                         <p>02-02-2017</p>
-                                                        <label><b>Delivery Address</b></label>
-                                                        <p>Blok 3730, Persiaran Apec, 63000 Cyberjaya, Selangor</p>
-                                                        <label><b>Contact Person Name</b></label>
-                                                        <textarea  class="form-control" rows="1"></textarea>
-                                                        <label><b>Contact Person No</b></label>
-                                                        <textarea  class="form-control" rows="1"></textarea>
-                                                        </div>
-                                                        <div class="form-actions" align="right">
-                                                        <button type="edit" class="btn blue">Edit</button>
-                                                        <button type="edit" class="btn blue">Change</button>
+                                                        <label><b>Remark</b></label>
+                                                        <p>Estimated time arrived</p>
                                                         </div>
                                                     </li>
                                                      <li data-date="20/02/2014">
@@ -555,28 +548,24 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         </div>
                                                         <div class="clearfix"></div>
                                                         <div class="form-group">
-                                                        <label>Contact</label>
-                                                        <textarea class="form-control" rows="1" >012 3456789</textarea>
+                                                        <label><b>Name</b></label>
+                                                        <textarea class="form-control" rows="1" >Bob</textarea>
                                                         </div>
                                                         <div class="form-group">
-                                                        <label>Delivery Date</label>
-                                                        <textarea class="form-control" rows="1" >03-07-2017</textarea>
+                                                        <label><b>Address</b></label>
+                                                        <textarea class="form-control" rows="1" >1, Kundang 14, Taman Murni</textarea>
                                                         </div>
                                                         <div class="form-group">
-                                                        <label>Driver Name</label>
-                                                        <textarea class="form-control" rows="1">Bob</textarea>
+                                                        <label><b>State</b></label>
+                                                        <textarea class="form-control" rows="1">Delaware</textarea>
                                                         </div>
                                                         <div class="form-group">
-                                                        <label>Driver Contact</label>
-                                                        <textarea class="form-control" rows="1">012 3456789</textarea>
-                                                        </div>
-                                                        <div class="form-group">
-                                                        <label>Vehicle No</label>
-                                                        <textarea class="form-control" rows="1">WAA 123</textarea> 
+                                                        <label><b>Country</b></label>
+                                                        <textarea class="form-control" rows="1">USA</textarea>
                                                         </div>
                                                          <div class="form-group last">
                                                         <div class="form-actions" align="right">
-                                                        <button type="edit" class="btn blue">Save</button>
+                                                        <button type="edit" class="btn blue">Change Address</button>
                                                         </div>
                                                 </div>
                                                     </li>
@@ -606,12 +595,58 @@ License: You must have a valid license purchased only from themeforest(the above
                                                         </div>
                                                         <br>
                                                         <br>
-                                                       <label><b>Comment</b></label>
-                                                       <textarea class="form-control" rows="1"></textarea>
-                                                       <div class="form-group last">
-                                                       <div class="form-actions" align="right">
-                                                        <button type="edit" class="btn blue">Save</button>
-                                                       </div>
+                                                       <form action="#" class="horizontal-form">
+                                                        <div class="form-body">
+                                                            <div class="row">
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <label class="control-label"><b>Confirmation</b></label>
+                                                                        <br>
+                                                                        <span>Have you received your goods?</span>
+                                                                        <br>
+                                                                        Order No : 014587
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        <label class="control-label"><b>Rating</b></label>
+                                                                        <br>
+                                                                        <span class="icon-star"></span>
+                                                                        <span class="icon-star"></span>
+                                                                        <span class="icon-star"></span>
+                                                                        <span class="icon-star"></span>
+                                                                        <span class="icon-star"></span>
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <!--/row-->
+                                                            <div class="row">
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                            <!--/row-->
+                                                            <div class="row">
+                                                                <!--/span-->
+                                                                <div class="col-md-6">
+                                                                    <div class="form-group">
+                                                                        
+                                                                    </div>
+                                                                </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                                <!--/span-->
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-actions left">
+                                                            <button type="button" class="btn default">Yes</button>
+                                                            <button type="button" class="btn default">No</button>
+                                                        </div>
+                                                    </form>
+
 
                                                         </div>
                                                     </li>
@@ -1324,6 +1359,55 @@ License: You must have a valid license purchased only from themeforest(the above
             document.getElementById("with_content").style.display = "";
         }
         </script>
+
+        <script type="text/javascript">
+            function show_content(){
+                        //alert('hoooo');
+                        document.getElementById("without_content").style.display = "none";
+                        document.getElementById("with_content").style.display = "";
+                        document.getElementById("file_manager").style.display = "";
+                    }
+               window.onload = function() {
+                   var elements = getElementsByClassName('editInPlace', '*', document);
+                   for (var i = 0; i < elements.length; i++) {
+                       elements[i].ondblclick = function() {
+                           this.setAttribute('oldText', this.innerHTML); // not actually required. I use this just in case you want to cancel and set the original text back.
+                           var textBox = document.createElement('INPUT');
+                           textBox.setAttribute('type', 'text');
+                           textBox.value = this.innerHTML;
+                           textBox.onblur = function() {
+                               var newValue = this.value;
+                               this.parentNode.innerHTML = newValue;
+                               //alert("Your new value: \n\n" + newValue);
+                           }
+               
+                           this.innerHTML = '';
+               
+                           this.appendChild(textBox);
+                       }
+                   }(i);
+               }
+               
+               function getElementsByClassName(className, tag, elm) {
+                   var testClass = new RegExp("(^|\\s)" + className + "(\\s|$)");
+                   var tag = tag || "*";
+                   var elm = elm || document;
+                   var elements = (tag == "*" && elm.all) ? elm.all : elm.getElementsByTagName(tag);
+                   var returnElements = [];
+                   var current;
+                   var length = elements.length;
+                   for (var i = 0; i < length; i++) {
+                       current = elements[i];
+                       if (testClass.test(current.className)) {
+                           returnElements.push(current);
+                       }
+                   }
+                   return returnElements;
+               }
+               $('[data-toggle="popover"]').popover({trigger: 'focus'})
+               
+            </script>
+
     </body>
 
 </html>
\ No newline at end of file