diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 610988b57ee424deba2db9cdd8ff23405aebcb8d..f290340fb2e187e4e976c7d9cab660aeb6a7d185 100644
Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ
diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js
index 9a067826ea042dcff3a21ae2f6dc56da785353ac..9b1199a816126d936363f145deb495d84bd46069 100644
Binary files a/public/js/build/vendor.js and b/public/js/build/vendor.js differ
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 0b4328a385756701988cdc972fcc826ee501a668..67788e0530bd49141cf81ba75c7b174a054ee3c7 100644
Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index bd1a214ed0e90152a4f72ba872dc78edf2d01eb4..c7364b775b6aa3630b826f1531ba8e00fef6de36 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=2f665cf40d7348b3f94c",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=5267e92a8df9ba833e01",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
-    "/css/dist/all.css": "/css/dist/all.css?id=6e3b75006f2b19d69f37",
+    "/css/dist/all.css": "/css/dist/all.css?id=199fdf677ce0dce6cef8",
     "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
     "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=eb4404a7b646ea42e025",
@@ -32,7 +32,7 @@
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
     "/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
-    "/js/build/vendor.js": "/js/build/vendor.js?id=aff75d5aad5e7b429723",
+    "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=58d95c93430f2ae33392",
-    "/js/dist/all.js": "/js/dist/all.js?id=3750aa27a59a41990ba4"
+    "/js/dist/all.js": "/js/dist/all.js?id=b4627a6533d841cd8fdf"
 }
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index a8e3c940f2832841390f10e46ff9e0115d4bb4ba..d0a42f6c74b52f2e0325be5bbe3db41cfb07d944 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -126,7 +126,7 @@
 
 @stop
 
-@section('moar_scripts')
+@push('js')
   @can('update', $custom_fieldset)
 
   <script nonce="{{ csrf_token() }}">
@@ -161,10 +161,11 @@
           });
       };
 
+  // this uses the jquery UI sortable method, NOT the query-dragtable library
   $("#sort tbody").sortable({
       helper: fixHelperModified,
       stop: updateIndex
   }).disableSelection();
 </script>
   @endcan
-@stop
+@endpush
diff --git a/webpack.mix.js b/webpack.mix.js
index f456c20e2b21b806edbdbca65e5de37d68109d96..20d9e746ec22cc56796ab5b26cff4d13f44f24cf 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -17,7 +17,7 @@ mix
             './node_modules/bootstrap/dist/css/bootstrap.css',
             './node_modules/font-awesome/css/font-awesome.css',
             './public/css/build/AdminLTE.css',
-            './node_modules/jquery-ui-dist/jquery-ui.css',
+            './node_modules/jquery-ui-bundle/jquery-ui.css',
             './node_modules/admin-lte/plugins/iCheck/minimal/blue.css',
             './node_modules/icheck/skins/minimal/minimal.css',
             './node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css',
@@ -111,6 +111,7 @@ mix
         [
             './node_modules/admin-lte/dist/js/adminlte.min.js',
             './node_modules/tether/dist/js/tether.js',
+            './node_modules/jquery-ui-bundle/jquery-ui.js',
             './node_modules/jquery-slimscroll/jquery.slimscroll.js',
             './node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
             './node_modules/blueimp-file-upload/js/jquery.fileupload.js',