diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
index 075b0497979c78ef8072f76031361b353b34231d..88b192f95855e49002f5913fcee0a01af7ed496b 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order_driver.jsp
@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
-<div class="container">
+<div ng-app= "" class="container">
     <div class="wrapper row">
         <div>
             <div class="page-title row txt-center height-fit float-container">
@@ -13,21 +13,20 @@
             </div>
         </div>
         <div class="order-form">
-            <form action="#" onsubmit="#" method="get">
-                <div class="txt-center">
-                    <h2 class="inline-block">Finding Order....</h2>
-                </div>
-                <div class="txt-center">
-                    <button type="submit" class="form-input find-button">FIND ORDER</button>
-                </div>
-            </form>
+            <div class="txt-center">
+                <h2 ng-show="show" class="inline-block">Finding Order....</h2>
+            </div>
+            <div class="txt-center">
+                <button class="form-input find-button" ng-hide="closeFind" ng-click="show=true; showClose=true; closeFind=true">FIND ORDER</button>
+                <button class="close-button" ng-show="showClose" ng-click="show=false; closeFind=false; showClose=false">CLOSE</button>
+            </div>
         </div>
     </div>
 </div>
 
 <%@include file="/component/footer.html" %>
 
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
 <script>
-    src = "https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"
     window.onload = toggleActive("nav-order");
 </script>
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/css/app.css b/TugasBesar2_2017/WebApp/src/main/webapp/css/app.css
index 48ce06d5688aef1b5944ed3f89bca0b98151db34..095bd6c74caa51bb03d7ddff91034ea04dad16bc 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/css/app.css
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/css/app.css
@@ -201,6 +201,14 @@ body {
     font-size: 1.25em;
 }
 
+.close-button {
+    width: 200px;
+    height: 40px;
+    border: 1px solid #c00;
+    background: #c00;
+    font-size: 1.25em;
+}
+
 .submit-button:hover {
     background: #75ff33;
     font-size: 1.25em;