diff --git a/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp
index 9cc5959d..bdaaa7c9 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/admin-main.jsp
@@ -65,7 +65,6 @@
 
   	<div class="content-backdrop fade"></div>
 </div>
-<script src="<c:url value="/resources/sneat/libs/jstree/jstree.js?${ver}"/>"></script>
 
 <script>
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp
index d91c74be..3326aa85 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp
@@ -75,12 +75,13 @@
 </div>
 
 <!-- Core JS -->
-<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/js/config.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/libs/popper/popper.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/js/bootstrap.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/libs/jquery/jquery.js?${ver}"/>"></script>
+
+<script src="<c:url value="/resources/sneat/js/config.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/libs/perfect-scrollbar/perfect-scrollbar.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/js/menu.js?${ver}"/>"></script>
 
 <!-- base -->
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
index 598ae08c..f4daaa60 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
@@ -36,12 +36,13 @@
 <div id="paintWebTarget"></div>
    
 <!-- Core JS -->
-<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/js/config.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/libs/popper/popper.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/js/bootstrap.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/libs/jquery/jquery.js?${ver}"/>"></script>
+
+<script src="<c:url value="/resources/sneat/js/config.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/libs/perfect-scrollbar/perfect-scrollbar.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/js/menu.js?${ver}"/>"></script>
 
 <!-- base -->
diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp
index 71c53832..3d0396a1 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp
@@ -208,13 +208,14 @@
 </datalist>
 
 <!-- Core JS -->
-<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/libs/popper/popper.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/js/bootstrap.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/libs/jquery/jquery.js?${ver}"/>" ></script>
+
 <script src="<c:url value="/resources/sneat/js/config.js?${ver}"/>"></script>
-<script src="/resources/sneat/libs/popper/popper.js"></script>
-<script src="/resources/sneat/js/bootstrap.js"></script>
-<script src="/resources/sneat/libs/jquery/jquery.js" ></script>
-<script src="/resources/sneat/libs/perfect-scrollbar/perfect-scrollbar.js"></script>
-<script src="/resources/sneat/js/menu.js"></script>
+<script src="<c:url value="/resources/sneat/libs/perfect-scrollbar/perfect-scrollbar.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/js/menu.js?${ver}"/>"></script>
 
 <!-- base -->
 <script src="/resources/js/base/base.js"></script>
diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
index 13ad287d..1e3b5143 100644
--- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
@@ -5,12 +5,13 @@
 </div>
 
 <!-- Core JS -->
-<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
-<script src="<c:url value='/resources/sneat/js/config.js?${ver}'/>"></script>
 <script src="<c:url value="/resources/sneat/libs/popper/popper.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/js/bootstrap.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/libs/jquery/jquery.js?${ver}"/>"></script>
+
+<script src="<c:url value='/resources/sneat/js/config.js?${ver}'/>"></script>
 <script src="<c:url value="/resources/sneat/libs/perfect-scrollbar/perfect-scrollbar.js?${ver}"/>"></script>
+<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
 <script src="<c:url value="/resources/sneat/js/menu.js?${ver}"/>"></script>
 <!-- Core JS for base -->
 <script src="<c:url value="/resources/sneat/libs/jstree/jstree.js?${ver}"/>"></script>
diff --git a/src/main/webapp/resources/html/pdf.html b/src/main/webapp/resources/html/pdf.html
index 552f2981..135c6299 100644
--- a/src/main/webapp/resources/html/pdf.html
+++ b/src/main/webapp/resources/html/pdf.html
@@ -28,12 +28,13 @@
 </div>
 
 <!-- Core JS -->
-<script src="/resources/sneat/js/helpers.js"></script>
-<script src="/resources/sneat/js/config.js"></script>
 <script src="/resources/sneat/libs/popper/popper.js"></script>
 <script src="/resources/sneat/js/bootstrap.js"></script>
 <script src="/resources/sneat/libs/jquery/jquery.js" ></script>
+
+<script src="/resources/sneat/js/config.js"></script>
 <script src="/resources/sneat/libs/perfect-scrollbar/perfect-scrollbar.js"></script>
+<script src="/resources/sneat/js/helpers.js"></script>
 <script src="/resources/sneat/js/menu.js"></script>
 
 <!-- base -->
diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js
index 32be90d6..1ef9a236 100644
--- a/src/main/webapp/resources/js/base/base.js
+++ b/src/main/webapp/resources/js/base/base.js
@@ -141,6 +141,7 @@ var dialog = {
 
 		if (conf.onOK) {
 			let footer = dlg.find(".modal-footer");
+			footer.removeClass("hidden");
 			footer.show();
 			footer.find("button").unbind("click").click(function() {
 				if (conf.getData) {