diff --git a/app/assets/javascripts/editor.js b/app/assets/javascripts/editor.js
index 72cbdd4..5ba62e5 100644
--- a/app/assets/javascripts/editor.js
+++ b/app/assets/javascripts/editor.js
@@ -12,6 +12,7 @@
             modules: {
                 toolbar: [
                     [{ 'header': [1, 2, false] }],
+                    ['link', 'image'],
                     ['bold', 'italic', 'underline', 'strike'],
                     [{ 'script': 'sub'}, { 'script': 'super' }],
                     [{ 'list': 'ordered'}, { 'list': 'bullet' }, 'blockquote']
diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index d38248c..5ff7ea0 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -1205,7 +1205,7 @@ fieldset {
         }
     }
 
-    ul {
+    .locale-select, .text-editors {
         list-style: none;
         padding: 0;
         margin: 0;
@@ -1253,7 +1253,7 @@ fieldset {
         position: relative;
         background-color: $white;
 
-        li {
+        li[data-locale] {
             display: none;
 
             &.selected {
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 58c5c92..29ae927 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -8,6 +8,10 @@ class ApplicationController < BaseController
   @@test_host
   @@test_location
 
+  def default_url_options
+    { host: "#{request.protocol}#{request.host_with_port}" }
+  end
+
   def capture_page_info
     # capture request info in case an error occurs
     if request.method == "GET" && (params[:controller] != 'application' || params[:action] != 'contact')
@@ -225,7 +229,7 @@ class ApplicationController < BaseController
 
       @conference.organizations.each do |org|
         org.users.each do |user|
-          email_list << user.named_email
+          # email_list << user.named_email
         end
       end
     end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index c10c435..4bc609a 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -88,14 +88,14 @@ BikeBike::Application.configure do
 
 	config.action_mailer.delivery_method = :smtp
 	config.action_mailer.smtp_settings = {
-		:address => 'mail.bikebike.org',
-		:domain => 'preview.bikebike.org',
+		:address => 'smtp.gmail.com',
+		:domain => 'bikebike.org',
 		:port => 587,
 		:authentication => :plain,
 		:enable_starttls_auto => true,
 		:openssl_verify_mode  => 'none',
-		:user_name => 'info@preview.bikebike.org',
-		:password => 'test'
+		:user_name => '',
+		:password => ''
 	}
 	config.action_mailer.raise_delivery_errors = true
 	config.action_mailer.perform_deliveries = true