diff --git a/arrangements-shipment_arrangements1.1.html b/arrangements-shipment_arrangements1.1.html
index aea3000..d9c5e93 100644
--- a/arrangements-shipment_arrangements1.1.html
+++ b/arrangements-shipment_arrangements1.1.html
@@ -34,7 +34,7 @@
                                     <div class="form-element-title">
                                         <label style="color: #000">Loading Date</label>
                                     </div>
-                                    <input type="text" class="form-element" placeholder="dd/mm/yyyy" disabled required />
+                                    <input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
                                 </div>
             
                                 <div class="form-row no-padding">
@@ -114,7 +114,7 @@
                                     <div class="form-element-title">
                                         <label style="color: #000">Driver Name</label>
                                     </div>
-                                    <input type="text" class="form-element" placeholder="John" disabled required />
+                                    <input type="text" class="form-element" placeholder="John" required />
                                 </div>
             
                                 <div class="form-row no-padding">
@@ -152,7 +152,7 @@
                                     <div class="form-element-title">
                                         <label style="color: #000">Loading Address</label>
                                     </div>
-                                    <input type="text" class="form-element" placeholder="" disabled required />
+                                    <input type="text" class="form-element" placeholder="" required />
                                 </div>
             
                                 <div class="form-row no-padding">
@@ -207,6 +207,7 @@
                             <div class="form-divider"></div>                            
                             <!-- Loading Venue Details End Here-->
                             <!-- Consolidation Start Here-->
+
                             <div  style="background-color: #FFF">
                                     <h1  class="subheader" style="color: #000">Consolidation</h1>
                             </div>
@@ -229,7 +230,7 @@
                                                 <div class="form-element-title">
                                                     <label style="color: #000">ETA</label>
                                                 </div>
-                                                <input type="text" class="form-element" placeholder="dd/mm/yyyy" disabled />
+                                                <input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
                                             </div>
                                             <div class="form-row no-padding">
                                                 <div class="form-element-title">
@@ -249,13 +250,53 @@
                                                 </div>
                                                 <input type="text" class="form-element" placeholder="a31,058898 China,Guangzhou, China" disabled />
                                             </div>
-            
                                         </div>
+                                        
                                         <div class="form-divider"></div>
                                     </div>
                                 </div>
                             </div>
-    			<!-- Shipment Arrangement Details End Here-->								             									           
+                            <div class="form-row-group with-icons-no-padding">
+                                    <div style="color: #069" class="list-box-non">
+                                        <button href="#" class="collapsible">
+                                            <i class="fa fa-ship"></i>
+                                            <em class="seperate"></em>
+                                            <span class="list-item-title">Order No : Steam/5467/0001</span>
+                                        </button>
+                                        <div class="content">
+                                            <div class="form-divider"></div>
+                                            <div class="form-row-group with-icons-no-padding">
+                                                <div class="form-row no-padding">
+                                                    <div class="form-element-title">
+                                                        <label style="color: #000">ETA</label>
+                                                    </div>
+                                                    <input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
+                                                </div>
+                                                <div class="form-row no-padding">
+                                                    <div class="form-element-title">
+                                                        <label style="color: #000">Shipment Number</label>
+                                                    </div>
+                                                    <input type="text" class="form-element" placeholder="MFG3456" disabled />
+                                                </div>
+                                                <div class="form-row no-padding">
+                                                    <div class="form-element-title">
+                                                        <label style="color: #000">Marking Number</label>
+                                                    </div>
+                                                    <input type="text" class="form-element" placeholder="STEAM/12345/0001/00003" disabled />
+                                                </div>
+                                                <div class="form-row no-padding">
+                                                    <div class="form-element-title">
+                                                        <label style="color: #000">Address</label>
+                                                    </div>
+                                                    <input type="text" class="form-element" placeholder="a31,058898 China,Guangzhou, China" disabled />
+                                                </div>
+                                            </div>
+                                            
+                                            <div class="form-divider"></div>
+                                        </div>
+                                    </div>
+                                </div>
+    			<!-- consolidation End Here-->								             									           
                     <!-- note end content end -->
                         <div class="form-row txt-right"> 
                             <div class="form-divider"></div>
diff --git a/arrangements-shipment_arrangements2.html b/arrangements-shipment_arrangements2.html
index f2bd421..fab18f7 100644
--- a/arrangements-shipment_arrangements2.html
+++ b/arrangements-shipment_arrangements2.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AzureUI - SHIPMENT ARRANGEMENTS2</title>
+    <title>AzureUI - SHIPMENT ARRANGEMENTS1</title>
     <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
     <link rel="stylesheet" type="text/css" href="css/global.style.css">
@@ -46,7 +46,7 @@
                         <a href="custom_declaration.html"><i class="fa fa-suitcase"></i> Custom Declaration</a>
                     </li>
                     <li>
-                        <a href="custom_declaration.html"><i class="fa fa-comments"></i> Messenger</a>
+                        <a href="#"><i class="fa fa-comments"></i> Messenger</a>
                     </li>
                     <li>
                         <a href="javascript:void(0);"><i class="fa fa-shopping-cart"></i> Track Order</a>
@@ -75,320 +75,44 @@
             <!-- Header area end -->
             <!-- Page content start -->
             <main class="fix-top-menu">
-                <form>
-                    <div class="form-divider"></div>
-                    <div class="list-box-non">
-                        <a href="javascript:void(0);" class="list-item" data-popup="formPopup">
-                            <i class="fa fa-plus"></i>
-                            <em class="seperate"></em>
-                            <span class="list-item-title">Add New</span>
-                        </a>
+                    <form>
+                        <div class="form-divider"></div>
+                        <div class="list-box-emp">
+                            <a href="arrangements-shipment_arrangements1.1.html" class="list-item">
+                                <i class="fa fa-plus"></i>
+                                <em class="seperate"></em>
+                                <span class="list-item-title">Add New SAS</span>
+                            </a>
+                        </div>
                         <div class="form-divider"></div>
                         <div class="form-label-divider">
-                            <span class="label-span">List of Shipment Arrangement</span>
-                        </div>
-                        <!-- Content List Spawner Start Here -->
-                        <div class="form-divider"></div>
-
-                        <div class="list-box-emp">
-                            <a href="arrangements-shipment_arrangements_review1.html" class="list-item">
-                                <i class="fa fa-plus"></i>
-                                <em class="seperate"></em>
-                                <span class="list-item-title"> Shipment No : PFG5467</span>
-                            </a>
-                        </div>
-                        <div class="list-box-emp">
-                            <a href="arrangements-shipment_arrangements_review1.html" class="list-item">
-                                <i class="fa fa-plus"></i>
-                                <em class="seperate"></em>
-                                <span class="list-item-title"> Shipment No : KED1726</span>
-                            </a>
-                        </div>
-
-                        <!-- Content List Spawner End Here -->
-                        <div class="form-divider"></div>
-                       
-                        <!-- Content List Spawner End Here -->
-
-                    </div>
-                </form>
-            </main>
+                                <span class="label-span">List of Status</span>
+                            </div>   
+                            <!-- Content List Spawner Start Here -->
+                            <div class="form-divider"></div>
+                            <div class="list-box-emp">
+                                    <a href="arrangements-shipment_arrangements_review1.html" class="list-item">
+                                        <i class="fa fa-plus"></i>
+                                        <em class="seperate"></em>
+                                        <span class="list-item-title"> Shipment No : PFG5467</span>
+                                        <span class="list-item-title-edit">Moving Out</span>
+                                    </a>
+                                </div>
+                                <div class="list-box-emp">
+                                    <a href="arrangements-shipment_arrangements_review1.html" class="list-item">
+                                        <i class="fa fa-plus"></i>
+                                        <em class="seperate"></em>
+                                        <span class="list-item-title"> Shipment No : KED1726</span>
+                                        <span class="list-item-title-edit">Moving Out</span>
+                                    </a>
+                                </div>
+                            <!-- Content List Spawner End Here -->
+                    </form>
+                </main>
             <!-- Page content end -->
         </div>
     </div>
 
-    <!--POPUP HTML CONTENT START -->
-    <div class="popup-overlay" id="formPopup">
-        <!-- if you dont want overlay add class .no-overlay -->
-        <div class="popup-container">
-            <div class="popup-header">
-                <h3 class="popup-title">Shipment Details</h3>
-                <span class="popup-close" data-dismiss="true"><i class="fa fa-times"></i></span>
-            </div>
-            <!-- Shipment Arrangement Details Start Here-->
-            <div class="popup-content">
-                <div class="form-divider"></div>
-                <div class="form-label-divider">
-                    <span class="label-span">Shipment Arrangement Details</span>
-                </div>
-                <div class="form-divider"></div>
-                <div class="form-row-group with-icons-no-padding">
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading Date</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="dd/mm/yyyy" disabled required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Shipment Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="KED 1726" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Departure Port</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Port Klang" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Container No</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="MFG3456" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Type of Container</label>
-                        </div>
-                        <select class="form-element">
-                            <option value="">Please Select Type of Container</option>
-                            <option value="1">Double Doors Container 20ft</option>
-                            <option value="2">Double Doors Container 40ft</option>
-                            <option value="3">Dry Storage Container 10ft</option>
-                            <option value="4">Dry Storage Container 20ft</option>
-                            <option value="5">Dry Storage Container 30ft</option>
-                            <option value="6">Flat Rack Container</option>
-                            <option value="7">Open Top Container</option>
-                            <option value="8">Tunnel Container</option>
-                            <option value="9">Open Side Storage Container</option>                         
-                            <option value="10">Refregerated ISO Container</option>
-                            <option value="11">Insulated or Thermal Container</option>
-                            <option value="12">Tanks </option>
-                            <option value="13">Cargo Storage Roll Container</option>
-                            <option value="14">Half Height Container </option>
-                            <option value="15">Car Container</option>
-                            <option value="16">Intermediate Bulk Shift Container</option>
-                            <option value="17">Drums </option>
-                            <option value="18">Special Purpose Container</option>
-                            <option value="19">Swap Bodies</option>
-                        </select>
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">ETD</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">ETA</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
-                    </div>
-                </div>
-                <!-- Shipment Arrangement Details End Here-->
-                <!-- Loading Vehicle Details Start Here-->
-                <div class="form-divider"></div>
-                <div class="form-label-divider">
-                    <span class="label-span">Loading Vehicle and Driver</span>
-                </div>
-                <div class="form-divider"></div>
-                <div class="form-row-group with-icons-no-padding">
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Driver Name</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="John" disabled required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Driver Contact Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="0123456789" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Trailer Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="KED 5353" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Driver Identification Card Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="1234567891011" required />
-                    </div>
-                </div>
-                <!-- Loading Vehicle Details End Here-->
-                <!-- Loading Venue Details Start Here-->
-                <div class="form-divider"></div>
-
-                <div class="form-label-divider">
-                    <span class="label-span">Loading Venue</span>
-                </div>
-
-                <div class="form-divider"></div>
-
-                <div class="form-row-group with-icons-no-padding">
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading Address</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="" disabled required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading City</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading State</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Contact Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Postcode</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="" disabled required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Country</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Contact Person</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="" required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Remark</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="State If Any" required />
-                    </div>
-                </div>
-                <div class="form-divider"></div>
-                <!-- Loading Venue Details End Here-->
-                <!-- Consolidation Start Here-->
-                <div class="popup-header">
-                    <h3 class="popup-title">Consolidation</h3>
-                </div>
-                <div class="form-divider"></div>
-                <div class="form-label-divider">
-                    <span class="label-span">Order Select</span>
-                </div>
-                <div class="form-divider"></div>
-
-                <div class="form-row-group with-icons-no-padding">
-                    <div style="color: #069" class="list-box-non">
-                        <button href="#" class="collapsible">
-                            <i class="fa fa-ship"></i>
-                            <span class="list-item-title">Order No : Steam/5467/0001</span>
-                        </button>
-                        <div class="content">
-                            <div class="form-divider"></div>
-                            <div class="form-row-group with-icons-no-padding">
-                                <div class="form-row no-padding">
-                                    <div class="form-element-title">
-                                        <label style="color: #000">ETA</label>
-                                    </div>
-                                    <input type="text" class="form-element" placeholder="dd/mm/yyyy" disabled />
-                                </div>
-                                <div class="form-row no-padding">
-                                    <div class="form-element-title">
-                                        <label style="color: #000">Shipment Number</label>
-                                    </div>
-                                    <input type="text" class="form-element" placeholder="MFG3456" disabled />
-                                </div>
-                                <div class="form-row no-padding">
-                                    <div class="form-element-title">
-                                        <label style="color: #000">Marking Number</label>
-                                    </div>
-                                    <input type="text" class="form-element" placeholder="STEAM/12345/0001/00003" disabled />
-                                </div>
-                                <div class="form-row no-padding">
-                                    <div class="form-element-title">
-                                        <label style="color: #000">Address</label>
-                                    </div>
-                                    <input type="text" class="form-element" placeholder="a31,058898 China,Guangzhou, China" disabled />
-                                </div>
-
-                            </div>
-                            <div class="form-divider"></div>
-                        </div>
-                    </div>
-                </div>
-                <!-- Consolidation Test 1 End Here-->
-                <div class="popup-footer">
-                    <div class="form-divider"></div>
-                    <a href="arrangements-shipment_arrangements2.html"><span class="button blue" data-dismiss="false">Submit</span></a>
-                </div>
-                <div class="form-divider"></div>
-            </div>
-        </div>
-    </div>
-    <!--POPUP HTML CONTENT END -->
-	 <script type="text/javascript">
-	/* =========================================
-	[Collapsible for Custom Order Select] Start Here
-	==========================================*/
-
-	var coll = document.getElementsByClassName("collapsible");
-	var i;
-
-	for (i = 0; i < coll.length; i++) {
-    coll[i].addEventListener("click", function() 
-	{
-        this.classList.toggle("active");
-        var content = this.nextElementSibling;
-        if (content.style.display === "block") {
-            content.style.display = "none";
-        } else {
-            content.style.display = "block";
-        }
-    });
-	}
-    </script>
     <script src="js/jquery-3.2.1.min.js"></script>
     <script src="js/global.script.js"></script>
 
diff --git a/arrangements-shipment_arrangements_review-custom.html b/arrangements-shipment_arrangements_review-custom.html
index 1492ff5..fd1a264 100644
--- a/arrangements-shipment_arrangements_review-custom.html
+++ b/arrangements-shipment_arrangements_review-custom.html
@@ -85,7 +85,7 @@
 						<div class="form-divider"></div>
                     <!-- note end content end -->
                         <div class="form-divider"></div>
-                        <div class="form-row txt-center">                           
+                        <div class="form-row txt-right">                           
                             <a href="arrangements-shipment_arrangements2.html"><span  class="button red">Submit</span></a>
                         </div>
 						<div class="form-divider"></div>
diff --git a/arrangements-shipment_arrangements_review1.1.html b/arrangements-shipment_arrangements_review1.1.html
new file mode 100644
index 0000000..3156966
--- /dev/null
+++ b/arrangements-shipment_arrangements_review1.1.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>AzureUI - VIEW SHIPMENT ARRANGEMENT1-</title>
+    <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
+    <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="css/global.style.css">
+</head>
+
+<body>
+
+    <div class="wrapper">
+        <div class="wrapper-inline">
+            <!-- Header area start -->
+            <header style="background-color: #FFF">
+                <a class="go-back-link" href="javascript:history.back();" a><i class="fa fa-arrow-left"></i></a>
+                <h1 id="HT" class="page-title" style="color: #000">Shipment Arrangement</h1>
+            </header>
+            <!-- Header area end -->
+            <!-- Page content start -->
+            <main class="fix-top-menu">
+                <section class="container">
+                    <form>
+                        <div class="form-divider"></div>
+                        <div class="form-label-divider">
+                            <span class="label-span">Shipment Arrangement Status</span>
+                        </div>
+                        <div class="form-divider"></div>
+                <div class="form-row-group with-icons-no-padding">
+                     <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Order Number</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="STEAM/12345/0001/00003" disabled />
+                    </div>		 				 
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Shipment Number</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="KED 1726" disabled />
+                    </div>
+				 
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Container No</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="MFG3456" disabled />
+                    </div>				 
+									 
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Type of Container</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="Dry Storage Container 30ft" disabled />
+                    </div>
+					
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Loading Date</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="13/03/2018" disabled required />
+                    </div>				 				                   
+
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">ETD</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="29/03/2018" disabled />
+                    </div>
+					
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">ETA</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="3/04/2018"/>
+					</div>                 
+					
+					 <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Loading Venue</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="SP, 72450 Kedah, Malaysia." disabled />
+                    </div>
+
+					 <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Status</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="Custom Clearance" disabled required />
+                    </div>												                        									
+                </div>
+    			<!-- Shipment Arrangement Details End Here-->								             									           
+                    <!-- note end content end -->
+                        <div class="form-divider"></div>
+                        <div class="form-row txt-center">                           
+                            <a href="arrangements-shipment_arrangements_review-custom.html"><span  class="button green">Custom Examination</span></a>
+							<a href="arrangements-shipment_arrangements_review2.html"><span  class="button green">Details</span></a>
+                        </div>
+						<div class="form-divider"></div>
+                    </form>
+                </section>
+
+            </main>
+            <!-- Page content end -->
+        </div>
+    </div>
+
+    <script src="js/jquery-3.2.1.min.js"></script>
+    <script src="js/global.script.js"></script>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/arrangements-shipment_arrangements_review1.html b/arrangements-shipment_arrangements_review1.html
index 3156966..c6807e1 100644
--- a/arrangements-shipment_arrangements_review1.html
+++ b/arrangements-shipment_arrangements_review1.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AzureUI - VIEW SHIPMENT ARRANGEMENT1-</title>
+    <title>AzureUI - VIEW SHIPMENT ARRANGEMENT2-DETAILS</title>
     <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
     <link rel="stylesheet" type="text/css" href="css/global.style.css">
@@ -25,45 +25,46 @@
                     <form>
                         <div class="form-divider"></div>
                         <div class="form-label-divider">
-                            <span class="label-span">Shipment Arrangement Status</span>
+                            <span class="label-span">Shipment Arrangement Details</span>
                         </div>
                         <div class="form-divider"></div>
                 <div class="form-row-group with-icons-no-padding">
-                     <div class="form-row no-padding">
+                            <div class="form-row no-padding">
                         <div class="form-element-title">
-                            <label style="color: #000">Order Number</label>
+                            <label style="color: #000">Loading Date</label>
                         </div>
-                        <input type="text" class="form-element" placeholder="STEAM/12345/0001/00003" disabled />
-                    </div>		 				 
-					<div class="form-row no-padding">
+                        <input type="text" class="form-element" placeholder="2018-03-28" disabled required />
+                    </div>
+
+                    <div class="form-row no-padding">
                         <div class="form-element-title">
                             <label style="color: #000">Shipment Number</label>
                         </div>
                         <input type="text" class="form-element" placeholder="KED 1726" disabled />
                     </div>
-				 
+
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Departure Port</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="Port Klang" disabled />
+                    </div>
+
 					<div class="form-row no-padding">
                         <div class="form-element-title">
                             <label style="color: #000">Container No</label>
                         </div>
                         <input type="text" class="form-element" placeholder="MFG3456" disabled />
-                    </div>				 
-									 
+                    </div>					
+					
 					<div class="form-row no-padding">
                         <div class="form-element-title">
                             <label style="color: #000">Type of Container</label>
                         </div>
                         <input type="text" class="form-element" placeholder="Dry Storage Container 30ft" disabled />
                     </div>
-					
+                                        					
 					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading Date</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="13/03/2018" disabled required />
-                    </div>				 				                   
-
-                    <div class="form-row no-padding">
                         <div class="form-element-title">
                             <label style="color: #000">ETD</label>
                         </div>
@@ -75,37 +76,235 @@
                             <label style="color: #000">ETA</label>
                         </div>
                         <input type="text" class="form-element" placeholder="3/04/2018"/>
-					</div>                 
-					
-					 <div class="form-row no-padding">
+					</div>
+                </div>
+    			<!-- Shipment Arrangement Details End Here-->
+				
+				<!-- Loading Vehicle Details Start Here-->
+				<div class="form-divider"></div>
+                <div class="form-label-divider">
+                    <span class="label-span">Vehicle and Driver</span>
+                </div>
+                <div class="form-divider"></div>
+                <div class="form-row-group with-icons-no-padding">									
+                    <div class="form-row no-padding">
                         <div class="form-element-title">
-                            <label style="color: #000">Loading Venue</label>
+                            <label style="color: #000">Driver Name</label>
                         </div>
-                        <input type="text" class="form-element" placeholder="SP, 72450 Kedah, Malaysia." disabled />
+                        <input type="text" class="form-element" placeholder="John" disabled />
                     </div>
 
-					 <div class="form-row no-padding">
+                    <div class="form-row no-padding">
                         <div class="form-element-title">
-                            <label style="color: #000">Status</label>
+                            <label style="color: #000">Driver Contact Number</label>
                         </div>
-                        <input type="text" class="form-element" placeholder="Custom Clearance" disabled required />
-                    </div>												                        									
+                        <input type="text" class="form-element" placeholder="0123456789" disabled />
+                    </div>
+
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Trailer Number</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="KED 5353" disabled />
+                    </div>
+
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Driver Identification Card Number</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="1234567891011" disabled />
+                    </div>										
                 </div>
-    			<!-- Shipment Arrangement Details End Here-->								             									           
-                    <!-- note end content end -->
+                <!-- Loading Vehicle Details End Here-->
+				
+				<!-- Loading Venue Details Start Here-->
+				<div class="form-divider"></div>
+                <div class="form-label-divider">
+                    <span class="label-span">Loading Venue</span>
+                </div>
+                <div class="form-divider"></div>
+                <div class="form-row-group with-icons-no-padding">									
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Loading Address</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="A31" disabled />
+                    </div>
+
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Loading City</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="SP" disabled />
+                    </div>
+
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Loading State</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="Kedah" disabled />
+                    </div>
+
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Contact Number</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="01123454332" disabled />
+                    </div>
+					
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Postcode</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="72450" disabled />
+                    </div>
+
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Country</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="Malaysia" disabled />
+                    </div>
+
+                    <div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Contact Person</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="Abu" disabled />
+                    </div>
+
+					<div class="form-row no-padding">
+                        <div class="form-element-title">
+                            <label style="color: #000">Remark</label>
+                        </div>
+                        <input type="text" class="form-element" placeholder="Things in good condition" disabled />
+                    </div>
+                </div>	
+                
+                 <!-- Consolidation Start Here-->
+                 <div class="form-divider"></div>
+                <div  style="background-color: #FFF">
+                        <h1  class="subheader" style="color: #000">Consolidation</h1>
+                </div>
+                <div class="form-divider"></div>
+                <div class="form-label-divider">
+                    <span class="label-span">Order Select</span>
+                </div>
+                <div class="form-divider"></div>
+                <div class="form-row-group with-icons-no-padding">
+                    <div style="color: #069" class="list-box-non">
+                        <button href="#" class="collapsible">
+                            <i class="fa fa-ship"></i>
+                            <em class="seperate"></em>
+                            <span class="list-item-title">Order No : Steam/5467/0001</span>
+                        </button>
+                        <div class="content">
+                            <div class="form-divider"></div>
+                            <div class="form-row-group with-icons-no-padding">
+                                <div class="form-row no-padding">
+                                    <div class="form-element-title">
+                                        <label style="color: #000">ETA</label>
+                                    </div>
+                                    <input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
+                                </div>
+                                <div class="form-row no-padding">
+                                    <div class="form-element-title">
+                                        <label style="color: #000">Shipment Number</label>
+                                    </div>
+                                    <input type="text" class="form-element" placeholder="MFG3456" disabled />
+                                </div>
+                                <div class="form-row no-padding">
+                                    <div class="form-element-title">
+                                        <label style="color: #000">Marking Number</label>
+                                    </div>
+                                    <input type="text" class="form-element" placeholder="STEAM/12345/0001/00003" disabled />
+                                </div>
+                                <div class="form-row no-padding">
+                                    <div class="form-element-title">
+                                        <label style="color: #000">Address</label>
+                                    </div>
+                                    <input type="text" class="form-element" placeholder="a31,058898 China,Guangzhou, China" disabled />
+                                </div>
+
+                            </div>
+                            <div class="form-divider"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-row-group with-icons-no-padding">
+                        <div style="color: #069" class="list-box-non">
+                            <button href="#" class="collapsible">
+                                <i class="fa fa-ship"></i>
+                                <em class="seperate"></em>
+                                <span class="list-item-title">Order No : Steam/5467/1111</span>
+                            </button>
+                            <div class="content">
+                                <div class="form-divider"></div>
+                                <div class="form-row-group with-icons-no-padding">
+                                    <div class="form-row no-padding">
+                                        <div class="form-element-title">
+                                            <label style="color: #000">ETA</label>
+                                        </div>
+                                        <input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
+                                    </div>
+                                    <div class="form-row no-padding">
+                                        <div class="form-element-title">
+                                            <label style="color: #000">Shipment Number</label>
+                                        </div>
+                                        <input type="text" class="form-element" placeholder="MFG3456" disabled />
+                                    </div>
+                                    <div class="form-row no-padding">
+                                        <div class="form-element-title">
+                                            <label style="color: #000">Marking Number</label>
+                                        </div>
+                                        <input type="text" class="form-element" placeholder="STEAM/12345/0001/00003" disabled />
+                                    </div>
+                                    <div class="form-row no-padding">
+                                        <div class="form-element-title">
+                                            <label style="color: #000">Address</label>
+                                        </div>
+                                        <input type="text" class="form-element" placeholder="a31,058898 China,Guangzhou, China" disabled />
+                                    </div>
+    
+                                </div>
+                                <div class="form-divider"></div>
+                            </div>
+                        </div>
+                    </div>	
+                 <!-- Consolidation End Here-->								        
+                    <!-- note end content end -->                       
                         <div class="form-divider"></div>
                         <div class="form-row txt-center">                           
                             <a href="arrangements-shipment_arrangements_review-custom.html"><span  class="button green">Custom Examination</span></a>
-							<a href="arrangements-shipment_arrangements_review2.html"><span  class="button green">Details</span></a>
                         </div>
 						<div class="form-divider"></div>
                     </form>
                 </section>
-
             </main>
             <!-- Page content end -->
         </div>
     </div>
+    <script type="text/javascript">
+        /* =========================================
+        [Collapsible for Custom Order Select] Start Here
+        ==========================================*/
+    
+        var coll = document.getElementsByClassName("collapsible");
+        var i;
+    
+        for (i = 0; i < coll.length; i++) {
+        coll[i].addEventListener("click", function() 
+        {
+            this.classList.toggle("active");
+            var content = this.nextElementSibling;
+            if (content.style.display === "block") {
+                content.style.display = "none";
+            } else {
+                content.style.display = "block";
+            }
+        });
+        }
+    </script>
 
     <script src="js/jquery-3.2.1.min.js"></script>
     <script src="js/global.script.js"></script>
diff --git a/arrangements-shipment_arrangements_review2.html b/arrangements-shipment_arrangements_review2.html
deleted file mode 100644
index 9bda3da..0000000
--- a/arrangements-shipment_arrangements_review2.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AzureUI - VIEW SHIPMENT ARRANGEMENT2-DETAILS</title>
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="css/global.style.css">
-</head>
-
-<body>
-
-    <div class="wrapper">
-        <div class="wrapper-inline">
-            <!-- Header area start -->
-            <header style="background-color: #FFF">
-                <a class="go-back-link" href="javascript:history.back();" a><i class="fa fa-arrow-left"></i></a>
-                <h1 id="HT" class="page-title" style="color: #000">Shipment Arrangement</h1>
-            </header>
-            <!-- Header area end -->
-            <!-- Page content start -->
-            <main class="fix-top-menu">
-                <section class="container">
-                    <form>
-                        <div class="form-divider"></div>
-                        <div class="form-label-divider">
-                            <span class="label-span">Shipment Arrangement Details</span>
-                        </div>
-                        <div class="form-divider"></div>
-                <div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading Date</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="2018-03-28" disabled required />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Shipment Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="KED 1726" disabled />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Departure Port</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Port Klang" disabled />
-                    </div>
-
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Container No</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="MFG3456" disabled />
-                    </div>					
-					
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Type of Container</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Dry Storage Container 30ft" disabled />
-                    </div>
-                                        					
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">ETD</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="29/03/2018" disabled />
-                    </div>
-					
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">ETA</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="3/04/2018"/>
-					</div>
-                </div>
-    			<!-- Shipment Arrangement Details End Here-->
-				
-				<!-- Loading Vehicle Details Start Here-->
-				<div class="form-divider"></div>
-                <div class="form-label-divider">
-                    <span class="label-span">Vehicle and Driver</span>
-                </div>
-                <div class="form-divider"></div>
-                <div class="form-row-group with-icons-no-padding">									
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Driver Name</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="John" disabled />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Driver Contact Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="0123456789" disabled />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Trailer Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="KED 5353" disabled />
-                    </div>
-
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Driver Identification Card Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="1234567891011" disabled />
-                    </div>										
-                </div>
-                <!-- Loading Vehicle Details End Here-->
-				
-				<!-- Loading Venue Details Start Here-->
-				<div class="form-divider"></div>
-                <div class="form-label-divider">
-                    <span class="label-span">Loading Venue</span>
-                </div>
-                <div class="form-divider"></div>
-                <div class="form-row-group with-icons-no-padding">									
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading Address</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="A31" disabled />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading City</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="SP" disabled />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Loading State</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Kedah" disabled />
-                    </div>
-
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Contact Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="01123454332" disabled />
-                    </div>
-					
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Postcode</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="72450" disabled />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Country</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Malaysia" disabled />
-                    </div>
-
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Contact Person</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Abu" disabled />
-                    </div>
-
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Remark</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Things in good condition" disabled />
-                    </div>
-                </div>										        
-                    <!-- note end content end -->                       
-						<div class="form-divider"></div>
-                    </form>
-                </section>
-            </main>
-            <!-- Page content end -->
-        </div>
-    </div>
-
-    <script src="js/jquery-3.2.1.min.js"></script>
-    <script src="js/global.script.js"></script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/custom_declaration.html b/custom_declaration.html
deleted file mode 100644
index b03d4af..0000000
--- a/custom_declaration.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AzureUI - CUSTOM DECLARATION</title>
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="css/global.style.css">
-</head>
-
-<body>
-
-    <div class="nav-menu">
-
-        <nav class="menu">
-            <!-- profile logo start -->
-            <div class="nav-header">
-                <a href="home.html"><img src="images/CIEF.png" width="160"></a>
-            </div>
-            <!-- profile logo end -->
-            <!-- Menu navigation start -->
-            <div class="nav-container">
-                <ul class="main-menu">
-                    <li>
-                        <a href="#"><i class="fa fa-home"></i> Home</a>
-                    </li>
-                    <li>
-                        <a href="#"><i class="fa fa-bell"></i> Notice</a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);"><i class="fa fa-briefcase"></i> Arrangement <span class="fa fa-angle-down"></span></a>
-                        <ul>
-                            <li><a href="arrangements-warehouse_receive_note1.html" data-loader="show"><i class="fa fa-industry"></i> Warehouse Receive Note</a></li>
-                            <li><a href="arrangements-shipment_arrangements1.html" data-loader="show"><i class="fa fa-ship"></i> Shipment Arrangement</a></li>
-                            <li><a href="arrangements-delivery_arrangements1.html" data-loader="show"><i class="fa fa-truck"></i> Delivery Arrangement</a></li>
-                        </ul>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);"><i class="fa fa-shopping-cart"></i> Orders <span class="fa fa-angle-down"></span></a>
-                        <ul>
-                            <li><a href="shipping-order.html" data-loader="show"><i class="fa fa-truck"></i> Shipping Order</a></li>
-                        </ul>
-                    </li>
-                    <li>
-                        <a href="custom_declaration.html"><i class="fa fa-suitcase"></i> Custom Declaration</a>
-                    </li>
-                    <li>
-                        <a href="#"><i class="fa fa-comments"></i> Messenger</a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);"><i class="fa fa-shopping-cart"></i> Track Order</a>
-                    </li>
-                    <li>
-                        <a href="example-element.html"><i class="fa fa-code"></i>Example Element</a>
-                    </li>
-                </ul>
-            </div>
-            <!-- Menu navigation end -->
-
-        </nav>
-
-    </div>
-
-    <div class="wrapper">
-        <div class="wrapper-inline">
-            <!-- Header area start -->
-            <header style="background-color: #FFF">
-                <a class="go-back-link" href="javascript:history.back();"><i class="fa fa-arrow-left"></i></a>
-                <h1 id="HT" class="page-title" style="color: #000">Custom Declaration Arrangement Status</h1>
-                <div class="navi-menu-button">
-                    <em></em>
-                    <em></em>
-                    <em></em>
-                </div>
-            </header>
-            <!-- Header area end -->
-
-            <!-- Page content start -->
-            <main class="fix-top-menu">
-                <form>
-                    <div class="form-divider"></div>
-                    <div class="list-box-non">
-                        <a href="javascript:void(0);" class="list-item" data-popup="formPopup">
-                            <i class="fa fa-plus"></i>
-                            <em class="seperate"></em>
-                            <span class="list-item-title">Add New</span>
-                        </a>
-
-                        <!-- Content List Spawner Start Here -->
-                        <div class="form-divider"></div>
-
-                        <!-- Content List Spawner End Here -->
-
-                    </div>
-                </form>
-            </main>
-            <!-- Page content end -->
-        </div>
-    </div>
-
-    <!--POPUP HTML CONTENT START -->
-    <div class="popup-overlay" id="formPopup">
-        <!-- if you dont want overlay add class .no-overlay -->
-        <div class="popup-container">
-            <div class="popup-header">
-                <h3 class="popup-title">Shipping Order</h3>
-                <span class="popup-close" data-dismiss="true"><i class="fa fa-times"></i></span>
-            </div>
-	<!-- Shipping Order Start Here-->
-            <div class="popup-content">
-                <div class="form-divider"></div>
-                <div class="form-label-divider">
-                    <span class="label-span">Order Selection</span>
-                </div>
-                <div class="form-divider"></div>            				                 																				    					
-							<div class="form-row-group with-icons-no-padding">
-							<div class="form-row no-padding">
-								<div class="form-element-title">
-									<label style="color: #000">Shipment No</label>
-								</div>
-									<select class="form-element">
-										<option value="">Please Select</option>
-										<option value="1">STEAM/00001/00002/00003</option>
-										<option value="2">STEAM/00001/00002/00004</option>
-										<option value="3">STEAM/00001/00002/00005</option>							
-									</select>
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Reference Number</label>
-									</div>
-										<input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Exporter Name</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Mr John" required />
-								</div>													
-							</div>					
-								<div class="form-divider"></div>
-							
-					<div class="form-label-divider">
-						<span class="label-span">Custom Details</span>
-					</div>
-
-                <div class="form-divider"></div>            				                 																		
-							<div class="form-row-group with-icons-no-padding">															
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">HS Code</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Please Enter the Code"  required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Product Name</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Sony Bravia TV" disabled required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Description</label>
-									</div>
-										<input type="text" class="form-element" placeholder="42" disabled  required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Quatity</label>
-									</div>
-										<input type="text" class="form-element" placeholder="22" disabled required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">UOM</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Pallet" disabled required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Price</label>
-									</div>
-										<input type="text" class="form-element" placeholder="RM 20,0000" disabled required />
-								</div>																
-							</div>						
-				            <div class="form-divider"></div>   	
-							
-                            <div class="popup-footer">
-                                <div class="form-divider"></div>
-                                <a href="custom_declaration1.html"><span class="button red" data-dismiss="false">Submit</span></a>
-                            </div>												
-			</div> 
-          <!-- Shipping Order Start Here-->			
-        </div>
-    </div>	
-    <!--POPUP HTML CONTENT END -->
-
-    <script src="js/jquery-3.2.1.min.js"></script>
-    <script src="js/global.script.js"></script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/custom_declaration1.html b/custom_declaration1.html
deleted file mode 100644
index 0375236..0000000
--- a/custom_declaration1.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AzureUI - CUSTOM DECLARATION</title>
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="css/global.style.css">
-</head>
-
-<body>
-
-    <div class="nav-menu">
-
-        <nav class="menu">
-            <!-- profile logo start -->
-            <div class="nav-header">
-                <a href="home.html"><img src="images/CIEF.png" width="160"></a>
-            </div>
-            <!-- profile logo end -->
-            <!-- Menu navigation start -->
-            <div class="nav-container">
-                <ul class="main-menu">
-                    <li>
-                        <a href="#"><i class="fa fa-home"></i> Home</a>
-                    </li>
-                    <li>
-                        <a href="#"><i class="fa fa-bell"></i> Notice</a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);"><i class="fa fa-briefcase"></i> Arrangement <span class="fa fa-angle-down"></span></a>
-                        <ul>
-                            <li><a href="arrangements-warehouse_receive_note1.html" data-loader="show"><i class="fa fa-industry"></i> Warehouse Receive Note</a></li>
-                            <li><a href="arrangements-shipment_arrangements1.html" data-loader="show"><i class="fa fa-ship"></i> Shipment Arrangement</a></li>
-                            <li><a href="arrangements-delivery_arrangements1.html" data-loader="show"><i class="fa fa-truck"></i> Delivery Arrangement</a></li>
-                        </ul>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);"><i class="fa fa-shopping-cart"></i> Orders <span class="fa fa-angle-down"></span></a>
-                        <ul>
-                            <li><a href="shipping-order.html" data-loader="show"><i class="fa fa-truck"></i> Shipping Order</a></li>
-                        </ul>
-                    </li>
-                    <li>
-                        <a href="custom_declaration.html"><i class="fa fa-suitcase"></i> Custom Declaration</a>
-                    </li>
-                    <li>
-                        <a href="#"><i class="fa fa-comments"></i> Messenger</a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0);"><i class="fa fa-shopping-cart"></i> Track Order</a>
-                    </li>
-                    <li>
-                        <a href="example-element.html"><i class="fa fa-code"></i>Example Element</a>
-                    </li>
-                </ul>
-            </div>
-            <!-- Menu navigation end -->
-
-        </nav>
-
-    </div>
-
-    <div class="wrapper">
-        <div class="wrapper-inline">
-            <!-- Header area start -->
-            <header style="background-color: #FFF">
-                <a class="go-back-link" href="javascript:history.back();"><i class="fa fa-arrow-left"></i></a>
-                <h1 id="HT" class="page-title" style="color: #000">Custom Declaration Arrangement Status</h1>
-                <div class="navi-menu-button">
-                    <em></em>
-                    <em></em>
-                    <em></em>
-                </div>
-            </header>
-            <!-- Header area end -->
-
-            <!-- Page content start -->
-            <main class="fix-top-menu">
-                <form>
-                    <div class="form-divider"></div>
-                    <div class="list-box-non">
-                        <a href="javascript:void(0);" class="list-item" data-popup="formPopup">
-                            <i class="fa fa-plus"></i>
-                            <em class="seperate"></em>
-                            <span class="list-item-title">Add New</span>
-                        </a>
-                     
-                       <div class="form-divider"></div>
-						<!-- Content List Spawner Start Here -->
-                        <div class="list-box-emp">
-                            <a href="custom_declaration_review1.html" class="list-item">
-                                <i class="fa fa-plus"></i>
-                                <em class="seperate"></em>
-                                <span class="list-item-title"> Status 1</span>
-                            </a>
-                        </div>
-                        <div class="list-box-emp">
-                            <a href="custom_declaration_review1.html" class="list-item">
-                                <i class="fa fa-plus"></i>
-                                <em class="seperate"></em>
-                                <span class="list-item-title"> Status 2</span>
-                            </a>
-                        </div>
-
-                        <!-- Content List Spawner End Here -->
-                        <div class="form-divider"></div>
-
-                        <!-- Content List Spawner End Here -->
-
-                    </div>
-                </form>
-            </main>
-            <!-- Page content end -->
-        </div>
-    </div>
-
-    <!--POPUP HTML CONTENT START -->
-    <div class="popup-overlay" id="formPopup">
-        <!-- if you dont want overlay add class .no-overlay -->
-        <div class="popup-container">
-            <div class="popup-header">
-                <h3 class="popup-title">Shipping Order</h3>
-                <span class="popup-close" data-dismiss="true"><i class="fa fa-times"></i></span>
-            </div>
-	        <!-- Shipping Order Start Here-->
-            <div class="popup-content">
-                <div class="form-divider"></div>
-                <div class="form-label-divider">
-                    <span class="label-span">Order Selection</span>
-                </div>
-                <div class="form-divider"></div>            				                 																				    					
-							<div class="form-row-group with-icons-no-padding">
-							<div class="form-row no-padding">
-								<div class="form-element-title">
-									<label style="color: #000">Shipment No</label>
-								</div>
-									<select class="form-element">
-										<option value="">Please Select</option>
-										<option value="1">STEAM/00001/00002/00003</option>
-										<option value="2">STEAM/00001/00002/00004</option>
-										<option value="3">STEAM/00001/00002/00005</option>							
-									</select>
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Reference Number</label>
-									</div>
-										<input type="text" class="form-element" placeholder="dd/mm/yyyy" required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Exporter Name</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Mr John" required />
-								</div>													
-							</div>					
-								<div class="form-divider"></div>
-							
-					<div class="form-label-divider">
-						<span class="label-span">Custom Details</span>
-					</div>
-
-                <div class="form-divider"></div>            				                 																		
-							<div class="form-row-group with-icons-no-padding">															
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">HS Code</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Please Enter the Code"  required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Product Name</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Sony Bravia TV" disabled required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Description</label>
-									</div>
-										<input type="text" class="form-element" placeholder="42" disabled  required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Quatity</label>
-									</div>
-										<input type="text" class="form-element" placeholder="22" disabled required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">UOM</label>
-									</div>
-										<input type="text" class="form-element" placeholder="Pallet" disabled required />
-								</div>
-								<div class="form-row no-padding">
-									<div class="form-element-title">
-										<label style="color: #000">Price</label>
-									</div>
-										<input type="text" class="form-element" placeholder="RM 20,0000" disabled required />
-								</div>															
-							</div>		
-				            <div class="form-divider"></div>   								
-                            <div class="popup-footer">
-                                <div class="form-divider"></div>
-                                <a href="custom_declaration1.html"><span class="button red" data-dismiss="false">Submit</span></a>
-                            </div>												
-			</div>  
-          <!-- Shipping Order Start Here-->			
-        </div>
-    </div>	
-    <!--POPUP HTML CONTENT END -->
-
-    <script src="js/jquery-3.2.1.min.js"></script>
-    <script src="js/global.script.js"></script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/custom_declaration_review1.html b/custom_declaration_review1.html
deleted file mode 100644
index 09a7b90..0000000
--- a/custom_declaration_review1.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AzureUI - VIEW CUSTOM DECLARATION-DETAILS1</title>
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="css/global.style.css">
-</head>
-
-<body>
-
-    <div class="wrapper">
-        <div class="wrapper-inline">
-            <!-- Header area start -->
-            <header style="background-color: #FFF">
-                <a class="go-back-link" href="javascript:history.back();" a><i class="fa fa-arrow-left"></i></a>
-                <h1 id="HT" class="page-title" style="color: #000">Custom Declaration</h1>
-            </header>
-            <!-- Header area end -->
-            <!-- Page content start -->
-            <main class="fix-top-menu">
-                <section class="container">
-                    <form>
-                        <div class="form-divider"></div>
-                        <div class="form-label-divider">
-                            <span class="label-span">Custom Declaration Arrangement Status</span>
-                        </div>
-                        <div class="form-divider"></div>
-                 <div class="form-row-group with-icons-no-padding">
-				    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Reference Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="123456GHJK" disabled />						
-                    </div>	
-					
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Date</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="2018-03-28" disabled required />
-                    </div>
-             
-                    <div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Marking Number</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="STEAM/12345/0001/00003	" disabled />
-                    </div>
-
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Supplier Name</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="MR John" disabled />
-                    </div>					
-					
-					<div class="form-row no-padding">
-                        <div class="form-element-title">
-                            <label style="color: #000">Exporter Name</label>
-                        </div>
-                        <input type="text" class="form-element" placeholder="Huawei" disabled />
-                    </div>
-                    										
-                </div>
-				<div class="form-divider"></div>
-    			<!-- Shipment Arrangement Details End Here-->
-						<div class="form-divider"></div>
-                        <div class="form-row txt-center">                           
-							<a href="custom_declaration_review2.html"><span  class="button green">Details</span></a>
-                        </div>
-						<div class="form-divider"></div>
-                    </form>
-                </section>
-            </main>
-            <!-- Page content end -->
-        </div>
-    </div>
-
-    <script src="js/jquery-3.2.1.min.js"></script>
-    <script src="js/global.script.js"></script>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/custom_declaration_review2.html b/custom_declaration_review2.html
deleted file mode 100644
index 4ae371c..0000000
--- a/custom_declaration_review2.html
+++ /dev/null
@@ -1,447 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>AzureUI - VIEW CUSTOM DECLARATION-DETAILS2</title>
-    <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="css/global.style.css">
-</head>
-
-<body>
-
-    <div class="wrapper">
-        <div class="wrapper-inline">
-            <!-- Header area start -->
-            <header style="background-color: #FFF">
-                <a class="go-back-link" href="javascript:history.back();" a><i class="fa fa-arrow-left"></i></a>
-                <h1 id="HT" class="page-title" style="color: #000">Order Details</h1>
-            </header>
-            <!-- Header area end -->
-            <!-- Page content start -->
-            <main class="fix-top-menu">
-                <section class="container">        
-                        <div class="form-divider"></div>
-                        <div class="form-label-divider">
-                            <span class="label-span">Order : 00003</span>
-                        </div>
-                        <div class="form-divider"></div>
-								<!-- Tab links -->
-								<div class="tab">
-									<button class="tablinks" onclick="openDelivery(event, 'Shipping Order')">Shipping Order</button>
-									<button class="tablinks" onclick="openDelivery(event, 'Arrangements')" id="defaultOpen">Arrangements</button>							
-								</div>
-								<!-- Tab content -->
-			<div id="Shipping Order" style="color: #000" class="tabcontent">
-				<form>
-                        <div class="form-divider"></div>
-						<!-- Order Details start -->
-                        <div class="form-label-divider">
-                            <span class="label-span">Order Details</span>
-                        </div>
-
-                        <div class="form-divider"></div>
-
-                        <div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Order Number</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="00003" disabled />
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Marking </label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="STEAM/12345/0001" disabled/>
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Supplier Name</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Mamee" disabled />
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Supplier Contact Person</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Puck" disabled />
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Supplier Contact Person Number</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="0123456789" disabled/>
-                            </div>														                          							
-                        </div>
-                    <!-- Order Details end -->
-					<!-- Warehouse Details start -->
-                      <div class="form-divider"></div>
-							<div class="form-label-divider">
-								<span class="label-span">Warehouse Details</span>
-							</div>  
-						 <div class="form-divider"></div>
-						<div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Name</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Gudang Udang" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Address</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="123" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">City</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Klang" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Postcode</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="123456" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">State</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Selangor" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Country</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Malaysia" disabled />
-                            </div>
-							
-						</div>
-							<!-- Warehouse Details end -->
-							<!-- Delivery Details start -->
-						<div class="form-divider"></div>
-							<div class="form-label-divider">
-								<span class="label-span">Delivery Details</span>
-							</div>  
-						 <div class="form-divider"></div>
-						<div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Delivery Type</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="2018-03-08" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Name</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="TV" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Address</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="123" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Postcode</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="056789" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">State</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Kedah" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Country</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Malaysia" disabled />
-                            </div>
-							
-						</div>
-						<!-- Delivery Details end -->
-						<!-- Packaging List start -->
-						<div class="form-divider"></div>
-							<div class="form-label-divider">
-								<span class="label-span">Packaging List</span>
-							</div>  
-						 <div class="form-divider"></div>
-						<div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Number</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="1" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Description</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="42" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Model</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Bravia" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Quantity</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="22" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">UOM</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Kedah" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">CBM</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Height : 22.00" disabled />
-								<input type="text" class="form-element" placeholder="Width : 22.00" disabled />
-								<input type="text" class="form-element" placeholder="Depth : 22.00" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Weight</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Gross : 22.00" disabled />
-								<input type="text" class="form-element" placeholder="Nett : 22.00" disabled />						
-                            </div>
-							<div class="form-row no-padding">
-								<div class="form-element-title">
-								<label style="color: #000">Photo</label>
-							</div>
-							<div class="form-divider"></div>
-							<div class="form-row txt-center">
-                            <div class="profile-image">
-                                <div class="profile-image-item">
-                                    <img id="CompanyProfile" src="avatar.png" width="210" height="110" />
-                                </div>
-                                <div class="form-divider-2"></div>
-                                <input id="fileInput" type="file" style="display:none;" />                             
-                            </div>
-							</div>
-							<div class="form-divider"></div>
-							</div>
-						</div>
-               </form>
-			</div>
-
-		<div id="Arrangements" style="color: #000" class="tabcontent">
-			<form>
-                        <div class="form-divider"></div>
-						<!-- Warehouse Arrangement end -->
-                        <div class="form-label-divider">
-                            <span class="label-span">Warehouse Arrangements</span>
-                        </div>
-
-                        <div class="form-divider"></div>
-
-                        <div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Number</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="1" disabled />
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Product Description</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Drugs" disabled/>
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Total Ctn (Nominal)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="22" disabled />
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Measurement (Nominal)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="22.00" disabled />
-                            </div>
-
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Weight (Nominal)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="22.00" disabled/>
-                            </div>
-							
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Total Ctn (Actual)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="22" disabled />
-                            </div>
-							
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">CBM (Actual)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="22" disabled />
-                            </div>
-							
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Weight (Actual)</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="10648.00" disabled />
-                            </div>
-							
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Status</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Matched" disabled />
-                            </div> 
-							<div class="form-row no-padding">
-								<div class="form-element-title">
-								<label style="color: #000">Photo</label>
-							</div>
-							<div class="form-divider"></div>
-							<div class="form-row txt-center">
-                            <div class="profile-image">
-                                <div class="profile-image-item">
-                                    <img id="CompanyProfile" src="avatar.png" width="210" height="110" />
-                                </div>
-                                <div class="form-divider-2"></div>
-                                <input id="fileInput" type="file" style="display:none;" />                             
-                            </div>
-							</div>
-							<div class="form-divider"></div>
-							</div>                           							
-                        </div>
-                    <!-- Warehouse Arrangement end -->
-					<!-- Shipment Arrangement start -->
-                      <div class="form-divider"></div>
-							<div class="form-label-divider">
-								<span class="label-span">Shipment Arrangement</span>
-							</div>  
-						 <div class="form-divider"></div>
-						<div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">ETD</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="2018-03-05" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">ETA</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="2018-03-05" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Release Date</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="2018-03-05" disabled />
-                            </div>
-							
-						</div>
-							<!-- Shipment Arrangement end -->
-							<!-- Delivery Arrangement start -->
-						<div class="form-divider"></div>
-							<div class="form-label-divider">
-								<span class="label-span">Delivery Arrangement</span>
-							</div>  
-						 <div class="form-divider"></div>
-						<div class="form-row-group with-icons-no-padding">
-                            <div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Delivery Type</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="2018-03-08" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Delivery Date</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="2018-03-05" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Driver Name</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="Abu" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Driver Contact</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="0145567484" disabled />
-                            </div>
-							<div class="form-row no-padding">
-                                <div class="form-element-title">
-                                    <label style="color: #000">Vehicle No</label>
-                                </div>
-                                <input type="text" class="form-element" placeholder="MFG4567" disabled />
-                            </div>
-							
-						</div>
-						<!-- Delivery Arrangement end -->
-            </form>
-		</div>             
-			<div class="form-divider"></div>
-    			<!-- Shipment Arrangement Details End Here-->						              
-                </section>
-            </main>
-            <!-- Page content end -->
-        </div>
-    </div>
-	<script type="text/javascript">
-	/* =========================================
-	[Tab for Delivery and Custom Arrangement] Start Here
-	==========================================*/
-
-	function openDelivery(evt, tabName) {
-	
-    var i, tabcontent, tablinks;
-	// Get all elements with class="tabcontent" and hide them
-    tabcontent = document.getElementsByClassName("tabcontent");
-    for (i = 0; i < tabcontent.length; i++) {
-        tabcontent[i].style.display = "none";
-    }
-	// Get all elements with class="tablinks" and remove the class "active"
-    tablinks = document.getElementsByClassName("tablinks");
-    for (i = 0; i < tablinks.length; i++) {
-        tablinks[i].className = tablinks[i].className.replace(" active", "");
-    }
-	 // Show the current tab, and add an "active" class to the button that opened the tab
-    document.getElementById(tabName).style.display = "block";
-    evt.currentTarget.className += " active";		
-	}
-	// Get the element with id="defaultOpen" and click on it. This to make the page open the default page
-	document.getElementById("defaultOpen").click();
-    </script>
-
-    <script src="js/jquery-3.2.1.min.js"></script>
-    <script src="js/global.script.js"></script>
-
-
-</body>
-
-</html>
\ No newline at end of file