diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb
index 5c2263aa0..abc4197ed 100644
--- a/app/controllers/canvas_controller.rb
+++ b/app/controllers/canvas_controller.rb
@@ -1,8 +1,8 @@
 class CanvasController < ApplicationController
   before_action :load_vars
 
-  # before_action :check_view_canvas, only: [:edit, :full_zoom, :medium_zoom, :small_zoom]
-  # before_action :check_edit_canvas, only: [:edit, :update]
+  before_action :check_view_canvas, only: [:edit, :full_zoom, :medium_zoom, :small_zoom]
+  before_action :check_edit_canvas, only: [:edit, :update]
 
   def edit
     render partial: 'canvas/edit',
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 1ca6f62e6..5bab96d56 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -3,6 +3,9 @@ class ExperimentsController < ApplicationController
   before_action :set_experiment, except: [:new, :create]
   before_action :set_project, only: [:new, :create]
 
+  # except parameter could be used but it is not working.
+  layout :choose_layout
+  
   def new
     @experiment = Experiment.new
   end
@@ -68,4 +71,8 @@ class ExperimentsController < ApplicationController
   def experiment_params
     params.require(:experiment).permit(:name, :description, :archived)
   end
+
+  def choose_layout
+    action_name.in?(['index', 'archive']) ? 'main' : 'fluid'
+  end
 end
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index 5d510b825..ba1328069 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -1,4 +1,4 @@
-<% content_for :sidebar do %>
+<%= content_for :sidebar do %>
   <div id="slide-panel" class="visible">
 
     <div class="sidebar-header">