change location

app/views/conferences/_schedule_splashpage.html.haml

@@ -28,9 +28,6 @@
           = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
             Full Schedule
 
-
-  %h3.text-center
-    Join us!
   %br
   - if @conference.program.events.highlights.any?
     .row

app/views/conferences/_venue.html.haml

@@ -23,11 +23,13 @@
               = markdown(@conference.venue.description)
       .col-md-6
         %h2
-          = "#{@conference.venue.city} / #{@conference.venue.country_name}"
+          = "#{@conference.venue.name}"
+        %h3
+          = "#{@conference.venue.city}"
         %address
           = @conference.venue.street
           %br
-          = "#{@conference.venue.postalcode}, #{@conference.venue.city}"
+          = "#{@conference.venue.city}, CA #{@conference.venue.postalcode}"
           %br
           = @conference.venue.country_name
           - if @conference.venue.website