diff --git a/web/app/assets/stylesheets/client/shareSessionDialog.css.scss b/web/app/assets/stylesheets/client/shareDialog.css.scss
similarity index 100%
rename from web/app/assets/stylesheets/client/shareSessionDialog.css.scss
rename to web/app/assets/stylesheets/client/shareDialog.css.scss
diff --git a/web/app/views/clients/_shareSessionDialog.html.erb b/web/app/views/clients/_shareDialog.html.erb
similarity index 100%
rename from web/app/views/clients/_shareSessionDialog.html.erb
rename to web/app/views/clients/_shareDialog.html.erb
diff --git a/web/config/application.rb b/web/config/application.rb
index bc41c2612..c913c0a9e 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -111,7 +111,7 @@ include JamRuby
       config.websocket_gateway_connect_time_expire = 6000
     end
     config.websocket_gateway_internal_debug = false
-    config.websocket_gateway_port = 6767
+    config.websocket_gateway_port = 6767 + ENV['JAM_INSTANCE'].to_i
     # Runs the websocket gateway within the web app
     config.websocket_gateway_uri = "ws://localhost:#{config.websocket_gateway_port}/websocket"
 
diff --git a/web/config/boot.rb b/web/config/boot.rb
index 4489e5868..e582639f1 100644
--- a/web/config/boot.rb
+++ b/web/config/boot.rb
@@ -4,3 +4,14 @@ require 'rubygems'
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/commands/server'
+
+module Rails
+  class Server
+    alias :default_options_alias :default_options
+    def default_options
+      default_options_alias.merge!(:Port => 3000 + ENV['JAM_INSTANCE'].to_i)
+    end
+  end
+end
\ No newline at end of file