diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 13008c8..efd8913 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -26,6 +26,9 @@
 	# GET /projects/1
 	# GET /projects/1.json
 	def show
+    
+puts "PARAMS: #{params.inspect}"
+    
 		@project = Project.find(params[:id])
 		@show_form = false
 		if params[:show_form] == "yes" then
@@ -69,6 +72,9 @@
 	# GET /projects/1/edit
      # Should this be removed?
 	def edit
+    
+puts "PARAMS: #{params.inspect}"
+    
 		@project = Project.find(params[:id])
 		if !user_signed_in? then
                respond_to do |format|
@@ -114,9 +120,6 @@
     	if user_signed_in? then
 			@project = Project.new(params[:project])
       
-puts "TEMPLATE 1: #{@project.dmptemplate.inspect}"
-puts "FUNDER 1: #{@project.funder_id}"
-      
 			if @project.dmptemplate.nil? && params[:project][:funder_id] != "" then # this shouldn't be necessary - see setter for funder_id in project.rb
 				funder = Organisation.find(params[:project][:funder_id])
 				if funder.dmptemplates.count == 1 then
@@ -131,9 +134,6 @@
 			end
 			@project.principal_investigator = current_user.name(false)
       
-puts "TEMPLATE 3: #{@project.dmptemplate.inspect}"
-puts "PROJECT: #{@project.inspect}"
-      
 			@project.title = I18n.t('helpers.project.my_project_name')+' ('+@project.dmptemplate.title+')'
 			@project.assign_creator(current_user.id)
 			respond_to do |format|
diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb
index 8bd68c1..36dd019 100644
--- a/app/models/exported_plan.rb
+++ b/app/models/exported_plan.rb
@@ -5,8 +5,8 @@
   #associations between tables
   belongs_to :plan
   belongs_to :user
-
-  VALID_FORMATS = %i( csv html json pdf text xml docx)
+  
+  VALID_FORMATS = ['csv', 'html', 'json', 'pdf', 'text', 'xml', 'docx']
 
   validates :format, inclusion: { in: VALID_FORMATS, message: I18n.t('helpers.plan.export.not_valid_format') }
 
diff --git a/app/models/settings/dmptemplate.rb b/app/models/settings/dmptemplate.rb
index 04bc481..65cff2a 100644
--- a/app/models/settings/dmptemplate.rb
+++ b/app/models/settings/dmptemplate.rb
@@ -11,10 +11,8 @@
     VALID_FONT_SIZE_RANGE = (8..14)
     VALID_MARGIN_RANGE = (5..25)
 
-    VALID_ADMIN_FIELDS = %i(
-      project_name project_identifier grant_title principal_investigator
-      project_data_contact project_description funder institution
-    )
+    VALID_ADMIN_FIELDS = ['project_name', 'project_identifier', 'grant_title', 'principal_investigator',
+                          'project_data_contact', 'project_description', 'funder', 'institution']
 
     DEFAULT_SETTINGS = {
       formatting: {
diff --git a/app/models/settings/plan_list.rb b/app/models/settings/plan_list.rb
index dc2fbe0..c7fce42 100644
--- a/app/models/settings/plan_list.rb
+++ b/app/models/settings/plan_list.rb
@@ -4,7 +4,7 @@
     #attr_accessible :var, :target, :target_type, :target_id
     
     # TODO: can these be taken from somewhere else rather than hard-coded here?
-    DEFAULT_COLUMNS = %i( name owner shared last_edited )
+    DEFAULT_COLUMNS = ['name', 'owner', 'shared', 'last_edited']
     ALL_COLUMNS = DEFAULT_COLUMNS + %i( template_owner identifier grant_number principal_investigator data_contact description )
 
     validate do
diff --git a/app/models/user.rb b/app/models/user.rb
index 54db9bd..d2d8846 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,6 +29,7 @@
         columns = %i(
           grant_number identifier description principal_investigator data_contact
         )
+        columns = ['grant_number', 'identifier', 'description', 'principal_investigator', 'data_contact']
 
         columns.each {|col| conditions = conditions.or(t[col].matches(q)) }
 
diff --git a/app/views/projects/_project_list_item.html.erb b/app/views/projects/_project_list_item.html.erb
index 8543b69..bf7af40 100644
--- a/app/views/projects/_project_list_item.html.erb
+++ b/app/views/projects/_project_list_item.html.erb
@@ -7,10 +7,10 @@
       <%= link_to t(".edit", :default => t("helpers.links.edit")), project_path(project), :class => "dmp_table_link"%>
 
       <% if project.administerable_by(current_user.id) then %>
-        <%= link_to t("helpers.project.share.tab_share"), project_path([project, "share"]), :class => "dmp_table_link"%>
+        <%= link_to t("helpers.project.share.tab_share"), share_project_path(project), :class => "dmp_table_link"%>
       <% end %>
 
-      <%= link_to t("helpers.project.tab_export"), project_path([project, "export"]), :class => "dmp_table_link"%>
+      <%= link_to t("helpers.project.tab_export"), export_project_path(project), :class => "dmp_table_link"%>
 
       <% if project.administerable_by(current_user.id) then %>
         <%= link_to t(".destroy", :default => t("helpers.links.destroy")), project_path(project), :class => "dmp_table_link",