diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 3d1970656..9171407eb 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -16,7 +16,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class FilesController < ApplicationController
-  layout 'base_projects'#by young
+  if @project
+    layout 'base_projects' #by young
+  else
+    layout  'base_courses'
+  end
   menu_item :files
 
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
@@ -300,25 +304,25 @@ class FilesController < ApplicationController
      @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]
      @containers += @project.versions.includes(:attachments).reorder(sort).all
 
-     show_attachments @containers
-     @attachtype = params[:type].to_i
-     @contenttype = params[:contentType].to_s
-     render :layout => 'base_projects'
+
+     #render :layout => 'base_projects'
    elsif @course
       @isproject = false
       @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
-      show_attachments @containers
-      @attachtype = params[:type].to_i
-      @contenttype = params[:contentType].to_s
-      render :layout => 'base_courses'
+      # show_attachments @containers
+      # @attachtype = params[:type].to_i
+      # @contenttype = params[:contentType].to_s
+
     end
 
+    show_attachments @containers
+    @attachtype = params[:type].to_i
+    @contenttype = params[:contentType].to_s
 
-
-    # respond_to do |format|
-    #   format.js
-    #   format.html
-    # end
+    respond_to do |format|
+      format.js
+      format.html
+    end
 
   end
 end