diff --git a/public/Forwarder/chat.html b/public/Forwarder/chat.html
index 3c95e00..cbed003 100644
--- a/public/Forwarder/chat.html
+++ b/public/Forwarder/chat.html
@@ -963,7 +963,7 @@
 															<option value="unmatch">Unmatch </option>
 															<option value="others">Others</option>
 														</select>
-                                                        <div class="tab-pane active" id="issue1">
+                                                        <div class="tab-pane active" id="issue1" style="display: none;">
                                                             <form role="form" action="#">
                                                                 <div class="form-group">
                                                                     <label class="control-label">Order No.</label>
@@ -996,10 +996,112 @@
                                                                         <span class="fileinput-exists"></span>
                                                                         <input type="file" name="...">   
                                                                     </div>
+                                                                    <div class="modal-footer">
+                                                                        <button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
+                                                                        <button type="button" class="btn green" data-dismiss="modal">Send</button>
+                                                                    </div>
                                                                 </div>
-                                                                <div class="margiv-top-10">
-                                                                    <a href="javascript:;" class="btn green"> Save Changes </a>
-                                                                    <a href="javascript:;" class="btn default"> Cancel </a>
+                                                            </form>
+                                                        </div> 
+                                                        <div class="tab-pane active" id="issue2" style="display: none;">
+                                                            <form role="form" action="#">
+                                                                <div class="form-group">
+                                                                    <label class="control-label">Order No.</label>
+                                                                    <select class="form-control select2">
+                                                                        <optgroup label="Order No">
+                                                                            <option>Please choose your order</option>
+                                                                            <option value="000">00012</option>
+                                                                            <option value="001">00114</option>
+                                                                            <option value="002">00216</option>
+                                                                            <option value="004">00418</option>
+                                                                            <option value="006">00624</option>
+                                                                            <option value="183">18332</option>
+                                                                            <option value="187">18742</option>
+                                                                            <option value="197">19745</option>
+                                                                            <option value="256">25654</option>
+                                                                            <option value="287">28782</option>
+                                                                            <option value="348">34829</option>
+                                                                            <option value="368">36894</option>
+                                                                            <option value="380">38090</option>
+                                                                            <option value="426">42679</option>
+                                                                            <option value="448">44895</option>
+                                                                            <option value="468">46894</option>
+                                                                            <option value="489">48939</option>
+                                                                            <option value="578">57839</option>
+                                                                        </optgroup>
+                                                                    </select>
+                                                                    <br/>
+                                                                    <div class="portlet-body">
+                                                                        <table class="table table-bordered table-hover">
+                                                                        <thead>
+                                                                            <tr>
+                                                                                <th width="5">No</th>
+                                                                                <th width="10">Total Ctn (nominal)</th>
+                                                                                <th width="10">Measurement (nominal)</th>
+                                                                                <th width="10">Weight (nominal)</th>
+                                                                                <th width="5">Total Ctn (actual)</th>
+                                                                                <th width="10">Measurement (actual)</th>
+                                                                                <th width="10">Weight (actual)</th>
+                                                                                <th width="10">Upload your Photo Here</th>
+                                                                            </tr>
+                                                                        </thead>
+                                                                        <tbody>
+                                                                            <tr>
+                                                                                    <td>1</td>
+                                                                                    <td>4</td>
+                                                                                    <td>40x40x40</td>
+                                                                                    <td>10kg</td>
+                                                                                    <td><a href="javascript:void(0)" id="totalctn" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                                                    <td><a href="javascript:void(0)" id="measurement" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                                                    <td><a href="javascript:void(0)" id="weight" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
+                                                                                    <td>
+                                                                                        <div>
+                                                                                            <span class="fileinput-new"></span>
+                                                                                            <span class="fileinput-exists"></span>
+                                                                                            <input type="file" name="...">   
+                                                                                        </div>    
+                                                                                    </td>
+                                                                                </tr>
+                                                                            <tr>
+                                                                                    <td>2</td>
+                                                                                    <td>4</td>
+                                                                                    <td>40x40x40</td>
+                                                                                    <td>10kg</td>
+                                                                                    <td><a href="javascript:void(0)" id="totalctn2" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                                                    <td><a href="javascript:void(0)" id="measurement2" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                                                    <td><a href="javascript:void(0)" id="weight2" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
+                                                                                    <td>
+                                                                                        <div>
+                                                                                            <span class="fileinput-new"></span>
+                                                                                            <span class="fileinput-exists"></span>
+                                                                                            <input type="file" name="...">     
+                                                                                        </div>
+                                                                                    </td>
+                                                                                </tr>
+                                                                                <tr>
+                                                                                    <td>3</td>
+                                                                                    <td>4</td>
+                                                                                    <td>40x40x40</td>
+                                                                                    <td>10kg</td>
+                                                                                    <td><a href="javascript:void(0)" id="totalctn3" data-type="text" data-pk="1" data-original-title="Total Ctn"> 4 </a></td>
+                                                                                    <td><a href="javascript:void(0)" id="measurement3" data-type="text" data-pk="1" data-original-title="Measurement"> 40 x 40 x 40 </a></td>
+                                                                                    <td><a href="javascript:void(0)" id="weight3" data-type="text" data-pk="1" data-original-title="Weight"> 9.8kg </a></td>
+                                                                                    <td>
+                                                                                        <div>
+                                                                                            <span class="fileinput-new"></span>
+                                                                                            <span class="fileinput-exists"></span>
+                                                                                            <input type="file" name="...">   
+                                                                                        </div> 
+                                                                                    </td>
+                                                                                </tr>
+                                                                        </tbody>
+                                                                        </table>
+                                                                        <div class="modal-footer">
+                                                                            <button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
+                                                                            <button type="button" class="btn green" data-dismiss="modal">Send</button>
+                                                                        </div>
+                                            
+                                            </div>
                                                                 </div>
                                                             </form>
                                                         </div> 
@@ -1008,10 +1110,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="modal-footer">
-										<button type="button" class="btn dark btn-outline" data-dismiss="modal">Cancel</button>
-										<button type="button" class="btn green" data-dismiss="modal">Move</button>
-									</div>
+									
 								</div>
 							</div>
 						</div>  
@@ -1033,8 +1132,8 @@
 														<label>Folder</label>
 														<select id="folder" class="form-control"  onchange="show_hide(this);">
 															<option>Select / Create New Folder</option>
-															<option value="doc">Documents</option>
-															<option value="img">Images</option>
+															<option value="issue1">Documents</option>
+															<option value="issue2">Images</option>
 															<option value="sound">Sounds</option>
 															<option value="oth">Others</option>
 															<option value="create">Create New</option>
@@ -1571,10 +1670,17 @@
 					document.getElementById("folder_name").style.display = "none";
 				}
 			}
-            
+
             $( "#folder" ).change(function() {
-              alert( $(this).val());
-                
+                var select_value = $(this).val();
+                if(select_value == "damage"){
+                    $("#issue1").show();
+                    $("#issue2").hide();
+                }else if(select_value == "unmatch"){
+                    $("#issue2").show();
+                    $("#issue1").hide(); 
+                }
+            
             });
 			
         </script>