diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index bb0b3dc3..8e7a50de 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -13,3 +13,27 @@
 //
 // You should have received a copy of the GNU Lesser General Public License along
 // with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+
+// Handle changing of settings tabs.
+$(document).on('turbolinks:load', function(){
+  var controller = $("body").data('controller');
+  var action = $("body").data('action');
+
+
+  // Only run on the main page.
+  if (controller == "main" && action == "index"){
+    var cycleImages = function(){
+      var images = $('.img-cycle img');
+      var now = images.filter(':visible');
+      var next = now.next().length ? now.next() : images.first();
+      var speed = 1500;
+
+      now.fadeOut(speed);
+      next.fadeIn(speed);
+    }
+
+    $(function() {
+      setInterval(cycleImages, 5000);
+    });
+  }
+});
diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
index 492075c3..7f49391d 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@@ -55,7 +55,10 @@ $(document).on('turbolinks:load', function(){
   // Display and update all fields related to creating a room in the createRoomModal
   $("#create-room").click(function(){
     $("#create-room-name").val("")
-    $("#createRoomModal form").attr("action", "/")
+
+    var relative_url_root = window.location.pathname.split("/")[1];
+
+    $("#createRoomModal form").attr("action", "/" + relative_url_root)
     updateDropdown($(".dropdown-item[value='default']"))
     $("#room_mute_on_join").prop("checked", false)
 
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
index 0a74edaa..2e8a388d 100755
--- a/app/views/main/index.html.erb
+++ b/app/views/main/index.html.erb
@@ -31,20 +31,3 @@
 </div>
 
 <%= render "shared/features" %>
-
-
-<script>
-var cycleImages = function(){
-  var images = $('.img-cycle img');
-  var now = images.filter(':visible');
-  var next = now.next().length ? now.next() : images.first();
-  var speed = 1500;
-
-  now.fadeOut(speed);
-  next.fadeIn(speed);
-}
-
-$(function() {
-  setInterval(cycleImages, 5000);
-});
-</script>
diff --git a/app/views/shared/modals/_create_room_modal.html.erb b/app/views/shared/modals/_create_room_modal.html.erb
index b5a7330f..052dcf3e 100644
--- a/app/views/shared/modals/_create_room_modal.html.erb
+++ b/app/views/shared/modals/_create_room_modal.html.erb
@@ -57,7 +57,7 @@
               </label>
             <% end %>
 
-            <label id="auto-join-label" class="create-only custom-switch mt-3 mb-3 w-100 text-left d-inline-block">
+            <label id="auto-join-label" class="create-only custom-switch pl-0 mt-3 mb-3 w-100 text-left d-inline-block">
               <span class="custom-switch-description"><%= t("modal.create_room.auto_join") %></span>
               <%= f.check_box :auto_join, class: "custom-switch-input", checked: false %>
               <span class="custom-switch-indicator float-right"></span>
@@ -76,15 +76,3 @@
     </div>
   </div>
 </div>
-
-<script>
-// Handle validation messages client-side because
-// form is served in modal, and they are minimal.
-var roomCreateValidations = function(){
-  if($('#room-name').val().length == 0){
-    $('#room-name').addClass("is-invalid");
-  }
-}
-
-$('#create-room-submit').on('click', roomCreateValidations);
-</script>