diff --git a/Gemfile b/Gemfile
index 51afecde..86a7d2ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'coffee-rails'
 gem 'coffee-rails-source-maps'
 gem 'uglifier'
 gem 'jquery-rails' # needed for general jQuery stuff
-gem 'jquery-ui-rails' # needed specifically for drag-and-drop ability
+gem 'jquery-ui-rails', git: 'https://github.com/kylesferrazza/jquery-ui-rails' # needed specifically for drag-and-drop ability
 gem 'jquery-tablesorter' # needed to allow re-sortable tables
 gem 'cocoon' # used for dynamically generating nested forms
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 41e874ab..f76a830d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/kylesferrazza/jquery-ui-rails
+  revision: cde4160b2148e96ddf03ea16f40aeadcc96759d6
+  specs:
+    jquery-ui-rails (6.1.0)
+      railties (>= 3.2.16)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -139,8 +146,6 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-tablesorter (1.27.1)
       railties (>= 3.2)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
     json (2.2.0)
     kramdown (2.1.0)
     kramdown-parser-gfm (1.1.0)
@@ -324,7 +329,7 @@ DEPENDENCIES
   i18n
   jquery-rails
   jquery-tablesorter
-  jquery-ui-rails
+  jquery-ui-rails!
   kramdown
   kramdown-parser-gfm
   launchy
@@ -354,4 +359,4 @@ DEPENDENCIES
   yaml_db
 
 BUNDLED WITH
-   2.0.1
+   2.1.4
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a306279c..92fedb4e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,7 +10,7 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
+//= require jquery3
 //= require jquery-ui/widgets/draggable
 //= require jquery-ui/widgets/resizable
 //= require jquery-ui/widgets/sortable
@@ -47,7 +47,7 @@
 
 
 function enableShowUsernames(elts) {
-  $(elts).click(function(){ 
+  $(elts).on("click", function(){ 
     $(this).toggleClass("active");
     $("#" + $(this).data("target")).toggleClass("showusernames");
   });
@@ -179,7 +179,7 @@ function activate_file_picker($e) {
     $e.find(".remove-custom-file").prop('disabled', false).removeClass("btn-default").addClass("btn-warning");
     $e.find("input.remove-custom-file").val('');
   });
-  $e.find(".remove-custom-file").click(function() {
+  $e.find(".remove-custom-file").on("click", function() {
     $e.find("input.custom-file").replaceWith(
       $e.find("input.custom-file").clone(true));
     $(this).prop('disabled', true).addClass("btn-default").removeClass("btn-warning");
@@ -291,7 +291,7 @@ function activateSpinner(obj, options) {
     input.prop("disabled", false);
     validate();
   });
-  input.bind("paste", function(e) { e.preventDefault(); });
+  input.on("paste", function(e) { e.preventDefault(); });
 
   $(upArrow).on('mousedown', function() {
     if (input.prop("disabled")) return;
@@ -323,7 +323,7 @@ function makeSpinner(options) {
   var input = $("<input>")
       .addClass("form-control numeric")
       .val(options.val || 0)
-      .bind("paste", function(e) { e.preventDefault(); });
+      .on("paste", function(e) { e.preventDefault(); });
   if (options.klass !== undefined)
     input.addClass(options.klass);
   if (options.max !== undefined)   input.data("max", options.max);
diff --git a/app/assets/javascripts/assignments.js b/app/assets/javascripts/assignments.js
index 044ad413..96dacf81 100644
--- a/app/assets/javascripts/assignments.js
+++ b/app/assets/javascripts/assignments.js
@@ -219,7 +219,7 @@
       }
     });
 
-    $("form").submit(function(e) {
+    $("form").on("submit", function(e) {
       var graderTypeInputs =
           $("li.grader").filter(function(index) {
             return $(this).find("input[id^='assignment_graders_'][id$='_destroy'][value='1']").length == 0;
diff --git a/app/assets/javascripts/courses.js b/app/assets/javascripts/courses.js
index 39de934a..aea66fb6 100644
--- a/app/assets/javascripts/courses.js
+++ b/app/assets/javascripts/courses.js
@@ -44,7 +44,7 @@
     function init() {
         enableReflectiveCalls();
         $("span.findUser").each(function(i) { enableLookupUser($(this)); });
-        $(".add-section-button").click(add_section);
+        $(".add-section-button").on("click", add_section);
         $("input.numeric").on("keypress", validateNumericInput);
 
         $('#sections').on('cocoon:after-insert', on_add_section);
diff --git a/app/assets/javascripts/grades.js b/app/assets/javascripts/grades.js
index bac65759..70b3feac 100644
--- a/app/assets/javascripts/grades.js
+++ b/app/assets/javascripts/grades.js
@@ -1,6 +1,6 @@
 (function() {
   function initFiles() {
-    $(".symlink-jump").click(function(e) {
+    $(".symlink-jump").on("click", function(e) {
       e.preventDefault();
       e.stopPropagation();
       selectTreeviewFileByHref($(this).data("root"), $(this).attr("href"));
diff --git a/app/assets/javascripts/jquery.matchHeight.js b/app/assets/javascripts/jquery.matchHeight.js
index ab24d45c..f41fa65d 100644
--- a/app/assets/javascripts/jquery.matchHeight.js
+++ b/app/assets/javascripts/jquery.matchHeight.js
@@ -373,12 +373,12 @@
     $(matchHeight._applyDataApi);
 
     // update heights on load and resize events
-    $(window).bind('load', function(event) {
+    $(window).on('load', function(event) {
         matchHeight._update(false, event);
     });
 
     // throttled update heights on resize events
-    $(window).bind('resize orientationchange', function(event) {
+    $(window).on('resize orientationchange', function(event) {
         matchHeight._update(true, event);
     });
 
diff --git a/app/assets/javascripts/submissions.js b/app/assets/javascripts/submissions.js
index 494d1671..f47359ea 100644
--- a/app/assets/javascripts/submissions.js
+++ b/app/assets/javascripts/submissions.js
@@ -1,6 +1,6 @@
 (function() {
   function initFiles() {
-    $(".symlink-jump").click(function(e) {
+    $(".symlink-jump").on("click", function(e) {
       e.preventDefault();
       e.stopPropagation();
       selectTreeviewFileByHref($(this).data("root"), $(this).attr("href"));
diff --git a/app/views/assignments/_codereview_form.html.erb b/app/views/assignments/_codereview_form.html.erb
index 07d1afb3..2c6b9ed7 100644
--- a/app/views/assignments/_codereview_form.html.erb
+++ b/app/views/assignments/_codereview_form.html.erb
@@ -140,7 +140,7 @@
     }
   })
   $("#type-codereview").find("input[name$='[review_count]']").prop("disabled", <%= asgn&.graders&.first&.review_target != "peer" %>);
-  $("form").submit(function() {
+  $("form").on("submit", function() {
     enableSpinner($("#type-codereview").find("input[name$='[review_count]']"));
   });
 </script>
diff --git a/app/views/assignments/_form.html.erb b/app/views/assignments/_form.html.erb
index 9aeeaa60..1db3bf85 100644
--- a/app/views/assignments/_form.html.erb
+++ b/app/views/assignments/_form.html.erb
@@ -21,6 +21,6 @@
     </div>
   </div>
   <script>
-    $(function() { $("a[href='#type-<%= @assignment.type.downcase %>']").click(); });
+    $(function() { $("a[href='#type-<%= @assignment.type.downcase %>']").trigger("click"); });
   </script>
 </div>
diff --git a/app/views/assignments/_index.js.erb b/app/views/assignments/_index.js.erb
index 89ef44f6..efd88f85 100644
--- a/app/views/assignments/_index.js.erb
+++ b/app/views/assignments/_index.js.erb
@@ -46,7 +46,7 @@ $(function() {
   var assnNames = $("#assignments-table tbody td:first-child").map(function() { return $(this).text(); }).get();
   var routeToSub = "<%= course_assignment_submission_path(course_id: @course.id, assignment_id: '(aid)', id: '(sid)') %>";
   GoogleCharts.load('corechart', function() {
-    $("#students-table tbody tr").click(function(e) {
+    $("#students-table tbody tr").on("click", function(e) {
       var $p = $(this).find("p");
       if ($(e.target).closest("p")[0] != $p[0]) { $p.toggleClass("hidden"); }
       var grades = $p.data("grades");
diff --git a/app/views/assignments/edit_weights.html.erb b/app/views/assignments/edit_weights.html.erb
index 1896d765..040659a7 100644
--- a/app/views/assignments/edit_weights.html.erb
+++ b/app/views/assignments/edit_weights.html.erb
@@ -79,7 +79,7 @@ $(function() {
   }
   weights.blur(refresh);
   refresh();
-  $("form").submit(ensureValidNumericInputOnSubmit);
+  $("form").on("submit", ensureValidNumericInputOnSubmit);
 });
 </script>
 
diff --git a/app/views/grades/_edit_exam_grades.js.erb b/app/views/grades/_edit_exam_grades.js.erb
index 4b23f44d..9b9134d0 100644
--- a/app/views/grades/_edit_exam_grades.js.erb
+++ b/app/views/grades/_edit_exam_grades.js.erb
@@ -103,7 +103,7 @@ function getGrades($table) {
   });
 
   // Handle the modal dialogs
-  $("#grades-table button.trigger").click(function() {
+  $("#grades-table button.trigger").on("click", function() {
     var $target = $("#enter_grades");
     var $row = $(this).closest("tr");
     var name = $(this).data("name");
@@ -123,7 +123,7 @@ function getGrades($table) {
     $("button.trigger").prop("disabled", false);
     $("#" + $(this).data("row") + " button.trigger").focus();
   });
-  $("button.save").click(function() {
+  $("button.save").on("click", function() {
     var $modal = $(this).closest("div.modal");
     var $row = $("#" + $modal.data("row"));
     var countBlanks = 0;
@@ -164,7 +164,7 @@ function getGrades($table) {
       }
     });
   });
-  $("button.cancel").click(function() {
+  $("button.cancel").on("click", function() {
     $(this).closest("div.modal").modal("hide");
   });
   $('.spinner').each(function() {
diff --git a/app/views/grades/_enter_comments.js.erb b/app/views/grades/_enter_comments.js.erb
index 26153418..d1db074e 100644
--- a/app/views/grades/_enter_comments.js.erb
+++ b/app/views/grades/_enter_comments.js.erb
@@ -33,7 +33,7 @@ $(function() {
     }
     window.updateScore = updateScore;
 
-    $("form").submit(function(e) {
+    $("form").on("submit", function(e) {
       if (autosavePromise) {
         e.preventDefault();
         alert("Please wait for autosave to complete");
diff --git a/app/views/grades/edit_CodereviewGrader.html.erb b/app/views/grades/edit_CodereviewGrader.html.erb
index 7f79980a..fca80d33 100644
--- a/app/views/grades/edit_CodereviewGrader.html.erb
+++ b/app/views/grades/edit_CodereviewGrader.html.erb
@@ -107,12 +107,12 @@
 <div class="col-sm-6 text-center">
 <%= f.submit "Submit grade", id: "completed", class: "btn btn-success" %>
 <script>
-  $(".navbar-header a").click(function(e) { 
+  $(".navbar-header a").on("click", function(e) { 
     window.scrollTo(0, $($(this).attr("href"))[0].offsetTop); 
     e.stopPropagation();
     e.preventDefault();
   });
-  $("form").submit(ensureValidNumericInputOnSubmit);
+  $("form").on("submit", ensureValidNumericInputOnSubmit);
 </script>
 </div>
 <% end %><%# form-for %>
diff --git a/app/views/grades/edit_ManualGrader.html.erb b/app/views/grades/edit_ManualGrader.html.erb
index 9dc22601..8bc7f273 100644
--- a/app/views/grades/edit_ManualGrader.html.erb
+++ b/app/views/grades/edit_ManualGrader.html.erb
@@ -77,7 +77,7 @@
         }
       }
     );
-    $("form").submit(ensureValidNumericInputOnSubmit);
+    $("form").on("submit", ensureValidNumericInputOnSubmit);
   });
 </script>
 
diff --git a/app/views/grades/edit_QuestionsGrader.html.erb b/app/views/grades/edit_QuestionsGrader.html.erb
index e441ff01..ff7bed93 100644
--- a/app/views/grades/edit_QuestionsGrader.html.erb
+++ b/app/views/grades/edit_QuestionsGrader.html.erb
@@ -87,7 +87,7 @@
 <span class="col-sm-12 text-center">
 <%= f.submit "Submit grade", id: "completed", class: "btn btn-success" %>
 </span>
-<script>$("form").submit(ensureValidNumericInputOnSubmit);</script>
+<script>$("form").on("submit", ensureValidNumericInputOnSubmit);</script>
 </div>
 <% end %>
 <% end %>
diff --git a/app/views/grades/edit_exam_grades.html.erb b/app/views/grades/edit_exam_grades.html.erb
index ac5faf2b..5d8af957 100644
--- a/app/views/grades/edit_exam_grades.html.erb
+++ b/app/views/grades/edit_exam_grades.html.erb
@@ -54,7 +54,7 @@
 </div>
 <script>
   $(".file-picker").each(function(index) { activate_file_picker($(this)); });
-  $("#bulk-entry form").submit(function() {
+  $("#bulk-entry form").on("submit", function() {
     if ($("input[type='file']")[0].files.length == 0) {
       alert("No grades file selected");
       return false;
diff --git a/app/views/grades/edit_tap_comment_grades.html.erb b/app/views/grades/edit_tap_comment_grades.html.erb
index 4b73c22a..1982421d 100644
--- a/app/views/grades/edit_tap_comment_grades.html.erb
+++ b/app/views/grades/edit_tap_comment_grades.html.erb
@@ -39,7 +39,7 @@
 </div>
 <script>
   $(".file-picker").each(function(index) { activate_file_picker($(this)); });
-  $("#bulk-entry form").submit(function() {
+  $("#bulk-entry form").on("submit", function() {
     if ($("input[type='file']")[0].files.length == 0) {
       alert("No grades file selected");
       return false;
diff --git a/app/views/individual_extensions/_edit.js.erb b/app/views/individual_extensions/_edit.js.erb
index 1c060d7a..7888bd5e 100644
--- a/app/views/individual_extensions/_edit.js.erb
+++ b/app/views/individual_extensions/_edit.js.erb
@@ -16,7 +16,7 @@ $(function() {
       $("#sucess_" + $form.find("input[name='id']").val()).addClass("hidden");
     });
   });
-  $(".submit").click(function(e) {
+  $(".submit").on("click", function(e) {
     e.preventDefault();
     var $submit = $(this);
     var $row = $submit.closest("tr");
@@ -46,7 +46,7 @@ $(function() {
         .tooltip('fixTitle');
     });
   });
-  $(".revoke").click(function(e) {
+  $(".revoke").on("click", function(e) {
     e.preventDefault();
     var $revoke = $(this);
     var $row = $revoke.closest("tr");
diff --git a/app/views/registrations/bulk_edit.html.erb b/app/views/registrations/bulk_edit.html.erb
index d054b64d..76344778 100644
--- a/app/views/registrations/bulk_edit.html.erb
+++ b/app/views/registrations/bulk_edit.html.erb
@@ -65,7 +65,7 @@
 </table>
 <% end %>
 <script>
-  $("form").submit(function() {
+  $("form").on("submit", function() {
     var $form = $(this);
     var $success = $("#" + $form.attr("id").replace('reg', 'success'));
     var $failure = $("#" + $form.attr("id").replace('reg', 'failure'));
diff --git a/app/views/submissions/_codereview_details.html.erb b/app/views/submissions/_codereview_details.html.erb
index d5553838..4c4c6c93 100644
--- a/app/views/submissions/_codereview_details.html.erb
+++ b/app/views/submissions/_codereview_details.html.erb
@@ -80,7 +80,7 @@
 <% end %><%# @submission_info.each %>
 
 <script>
-  $(".navbar-header a").click(function(e) { 
+  $(".navbar-header a").on("click", function(e) { 
     window.scrollTo(0, $($(this).attr("href"))[0].offsetTop); 
     e.stopPropagation();
     e.preventDefault();
diff --git a/app/views/submissions/_comment_edit_widgets.js.erb b/app/views/submissions/_comment_edit_widgets.js.erb
index ac833c10..08a5eb29 100644
--- a/app/views/submissions/_comment_edit_widgets.js.erb
+++ b/app/views/submissions/_comment_edit_widgets.js.erb
@@ -266,7 +266,7 @@ $(function() {
         this.areaComment = $("<div>").lineCommentView(this.options.commentEditor);
       var $expand = $("<span>").addClass("btn btn-alert pull-right").css({padding: "3px"})
           .append($("<span>").addClass("glyphicon glyphicon-edit"))
-          .click((e) => {
+          .on("click", (e) => {
             page = $expand.closest(".page")[0];
             this.element.toggleClass("expanded");
             this.positionEditWidget();
@@ -274,7 +274,7 @@ $(function() {
             return false;
           });
       this.element.append($expand)
-        .click((e) => e.stopPropagation())
+        .on("click", (e) => e.stopPropagation())
         .mousedown((e) => e.stopPropagation());
     },
     _stopResizing: function(e, ui) {
diff --git a/app/views/submissions/_new_questions.js.erb b/app/views/submissions/_new_questions.js.erb
index 2953f87d..b8309b62 100644
--- a/app/views/submissions/_new_questions.js.erb
+++ b/app/views/submissions/_new_questions.js.erb
@@ -1,5 +1,5 @@
 $(function() {
-  $('button.btn.answer').click(function() {
+  $('button.btn.answer').on("click", function() {
     $('button.btn.answer[data-id="'+$(this).data('id')+'"]').removeClass('active');
     $(this).addClass('active');
     $('input#'+$(this).data('id')).val($(this).text());
@@ -103,7 +103,7 @@ $(function() {
       $(this).next("input").prop('disabled', true).removeClass("unanswered").removeClass("badAnswer");
   });
   
-  $("form").submit(function(e) {
+  $("form").on("submit", function(e) {
     try {
       var unansweredInputs = [];
       function findUnanswered(cur) {
diff --git a/app/views/submissions/_render_pdfs.js.erb b/app/views/submissions/_render_pdfs.js.erb
index 09bdc57f..8fa72ba6 100644
--- a/app/views/submissions/_render_pdfs.js.erb
+++ b/app/views/submissions/_render_pdfs.js.erb
@@ -167,7 +167,7 @@ $(function() {
       ////////////////////////////////////////
       //////////////////// Zooming
       ////////////////////////////////////////
-      $div.find("#zoomOut").click(function(e) {
+      $div.find("#zoomOut").on("click", function(e) {
         var $scale = $div.find("#scaleSelect");
         var $options = $scale.find("option");
         var newIndex = Math.max($scale[0].selectedIndex - 1, 0);
@@ -175,7 +175,7 @@ $(function() {
         e.stopImmediatePropagation();
         return false;
       });
-      $div.find("#zoomIn").click(function(e) {
+      $div.find("#zoomIn").on("click", function(e) {
         var $scale = $div.find("#scaleSelect");
         var $options = $scale.find("option");
         var newIndex = Math.min($scale[0].selectedIndex + 1, $options.length - 1);
@@ -196,11 +196,11 @@ $(function() {
       //////////////////// Downloading
       ////////////////////////////////////////
       var clickingDownload = false;
-      $div.find("#new_window").click(function(e) {
+      $div.find("#new_window").on("click", function(e) {
         window.open(encodePath($div.data("source")), "_blank");
         e.stopPropagation();
       });
-      $div.find("#download").click(function(e) {
+      $div.find("#download").on("click", function(e) {
         // console.log("Clicking on button");
         var dm = new pdfjsViewer.DownloadManager({});
         dm.downloadUrl(encodePath($div.data("source")), $div.data("alt"));
diff --git a/app/views/submissions/_render_questions.js.erb b/app/views/submissions/_render_questions.js.erb
index 566de015..b870d6ed 100644
--- a/app/views/submissions/_render_questions.js.erb
+++ b/app/views/submissions/_render_questions.js.erb
@@ -23,7 +23,7 @@ $(function() {
         prevLine[href] = line;
       }
     }
-    $('[data-show-file]').click(function(d) {
+    $('[data-show-file]').on("click", function(d) {
       var args = $(this).data('showFile');
       showFile(args[0], args[1]);
     });
diff --git a/app/views/submissions/new_codereview.html.erb b/app/views/submissions/new_codereview.html.erb
index a1dbf659..013d3706 100644
--- a/app/views/submissions/new_codereview.html.erb
+++ b/app/views/submissions/new_codereview.html.erb
@@ -166,7 +166,7 @@
 <% end %><%# form-for %>
 <script>
   <%= render partial: "new_questions.js", locals: {count: @count.to_i} %>
-  $(".navbar-header a").click(function(e) { 
+  $(".navbar-header a").on("click", function(e) { 
     window.scrollTo(0, $($(this).attr("href"))[0].offsetTop); 
     e.stopPropagation();
     e.preventDefault();
@@ -179,7 +179,7 @@
     warning.find("p").removeClass("hidden");
     warning.find("h3").removeClass("hidden");
   }, Math.max(deadline - now, 0));
-  $("form").submit(function(e) {
+  $("form").on("submit", function(e) {
     return ensureValidNumericInputOnSubmit(e, "input.numeric:not([disabled])");
   });
 </script>
diff --git a/app/views/submissions/new_files.html.erb b/app/views/submissions/new_files.html.erb
index d0d17570..b1b6fcbb 100644
--- a/app/views/submissions/new_files.html.erb
+++ b/app/views/submissions/new_files.html.erb
@@ -94,7 +94,7 @@
       $("#archive-warning").addClass("hidden");
     }
   });
-  $("form").submit(function(e) {
+  $("form").on("submit", function(e) {
     var num = ensureValidNumericInputOnSubmit(e, "span.spinner > input");
     var files = ensureFilesPresentOnSubmit(e);
     return num && files;
diff --git a/app/views/submissions/new_questions.html.erb b/app/views/submissions/new_questions.html.erb
index 209d6adc..5719e2dd 100644
--- a/app/views/submissions/new_questions.html.erb
+++ b/app/views/submissions/new_questions.html.erb
@@ -107,7 +107,7 @@
     warning.find("p").removeClass("hidden");
     warning.find("h3").removeClass("hidden");
   }, Math.max(deadline - now, 0));
-  $("form").submit(function(e) {
+  $("form").on("submit", function(e) {
     return ensureValidNumericInputOnSubmit(e, "input.numeric:not([disabled])");
   });
 </script>
diff --git a/app/views/teamsets/_investigate.js.erb b/app/views/teamsets/_investigate.js.erb
index b6d6fe5d..2c18e0a6 100644
--- a/app/views/teamsets/_investigate.js.erb
+++ b/app/views/teamsets/_investigate.js.erb
@@ -174,7 +174,7 @@ $(function() {
   // Pre-load page to specific teamsets or students
   var hash = window.location.hash.replace(/#/g, '').split(":");
   if (hash.length == 3) {
-    $("li a[href='#" + hash[0] + "']").click();
+    $("li a[href='#" + hash[0] + "']").trigger("click");
     for (var i = 1; i < 3; i++) {
       hash[i] = (hash[i] || "").split("=");
       if (hash[i].length == 2) {
diff --git a/app/views/users/_form.js.erb b/app/views/users/_form.js.erb
index 3f6835f5..51e351e2 100644
--- a/app/views/users/_form.js.erb
+++ b/app/views/users/_form.js.erb
@@ -5,7 +5,7 @@ $(function() {
       $("#user_nickname").val($("#user_first_name").val());
   });
 });
-$("form").submit(ensureValidNumericInputOnSubmit);
+$("form").on("submit", ensureValidNumericInputOnSubmit);
 $("input#user_profile").change(function(e) {
   try {
     var img = document.getElementById("profile_preview");