Events: remaining fixes

app/controllers/events_controller.rb

@@ -35,14 +35,14 @@ class EventsController < ApplicationController
   def show
     authorize @event
 
-    @contests = @event.contests.includes([ :contestants, :puzzles ])
+    @contests = @event.contests.includes([ :contestants, puzzles: [ :image_attachment ] ])
     @title = @event.name
   end
 
   def edit
     authorize @event
 
-    @title = I18n.t("events.edit.title")
+    @title = @event.name
     @nonav = true
   end
 
@@ -52,7 +52,7 @@ class EventsController < ApplicationController
     if @event.update(event_params)
       redirect_to event_path(@event), notice: t("events.edit.notice")
     else
-      @title = I18n.t("events.edit.title")
+      @title = @event.name
       @nonav = true
       render :edit, status: :unprocessable_entity
     end