diff --git a/app/controllers/guidances_controller.rb b/app/controllers/guidances_controller.rb
index a05db00..236cf02 100644
--- a/app/controllers/guidances_controller.rb
+++ b/app/controllers/guidances_controller.rb
@@ -37,33 +37,33 @@
 			@phases = nil
 			@dmptemplates.each do |template|
 				if @phases.nil? then
-					@phases = template.phases.find(:all,:order => 'number ASC')
+					@phases = template.phases.all.order('number')
 				else
-					@phases = @phases + template.phases.find(:all,:order => 'number ASC')
+					@phases = @phases + template.phases.all.order('number')
 				end
 			end
 			@versions = nil
 			@phases.each do |phase|
 				if @versions.nil? then
-					@versions = phase.versions.find(:all,:order => 'title ASC')
+					@versions = phase.versions.all.order('title')
 				else
-					@versions = @versions + phase.versions.find(:all,:order => 'title ASC')
+					@versions = @versions + phase.versions.all.order('title')
 				end
 			end
 			@sections = nil
 			@versions.each do |version|
 				if @sections.nil? then
-					@sections = version.sections.find(:all,:order => 'number ASC')
+					@sections = version.sections.all.order('number')
 				else
-					@sections = @sections + version.sections.find(:all,:order => 'number ASC')
+					@sections = @sections + version.sections.all.order('number')
 				end
 			end
 			@questions = nil
 			@sections.each do |section|
 				if @questions.nil? then
-					@questions = section.questions.find(:all,:order => 'number ASC')
+					@questions = section.questions.all.order('number')
 				else
-					@questions = @questions + section.questions.find(:all,:order => 'number ASC')
+					@questions = @questions + section.questions.all.order('number')
 				end
 			end
 	    respond_to do |format|
@@ -116,33 +116,33 @@
 			@phases = nil
 			@dmptemplates.each do |template|
 				if @phases.nil? then
-					@phases = template.phases.find(:all,:order => 'number ASC')
+					@phases = template.phases.all.order('number')
 				else
-					@phases = @phases + template.phases.find(:all,:order => 'number ASC')
+					@phases = @phases + template.phases.all.order('number')
 				end
 			end
 			@versions = nil
 			@phases.each do |phase|
 				if @versions.nil? then
-					@versions = phase.versions.find(:all,:order => 'title ASC')
+					@versions = phase.versions.all.order('title')
 				else
-					@versions = @versions + phase.versions.find(:all,:order => 'title ASC')
+					@versions = @versions + phase.versions.all.order('title')
 				end
 			end
 			@sections = nil
 			@versions.each do |version|
 				if @sections.nil? then
-					@sections = version.sections.find(:all,:order => 'number ASC')
+					@sections = version.sections.all.order('number')
 				else
-					@sections = @sections + version.sections.find(:all,:order => 'number ASC')
+					@sections = @sections + version.sections.all.order('number')
 				end
 			end
 			@questions = nil
 			@sections.each do |section|
 				if @questions.nil? then
-					@questions = section.questions.find(:all,:order => 'number ASC')
+					@questions = section.questions.all.order('number')
 				else
-					@questions = @questions + section.questions.find(:all,:order => 'number ASC')
+					@questions = @questions + section.questions.all.order('number')
 				end
 			end
     else
diff --git a/app/models/version.rb b/app/models/version.rb
index 94e87ff..029418d 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -9,7 +9,7 @@
   
   #Link the data
   accepts_nested_attributes_for :phase
-  accepts_nested_attributes_for :sections,  :allow_destroy => true 
+  #accepts_nested_attributes_for :sections,  :allow_destroy => true 
   
   attr_accessible :description, :number, :published, :title, :phase_id, :as => [:default, :admin]
   
diff --git a/app/views/dmptemplates/_add_guidance.html.erb b/app/views/dmptemplates/_add_guidance.html.erb
index 0ba052d..936ffa1 100644
--- a/app/views/dmptemplates/_add_guidance.html.erb
+++ b/app/views/dmptemplates/_add_guidance.html.erb
@@ -27,7 +27,7 @@
                         <div class="guindance_by_theme" style="display:none;">
                             <div class="div_left_icon_g">
                                 <%= f.collection_select(:theme_ids,
-                                Theme.find(:all, :order => "title ASC"),
+                                Theme.all.order("title"),
                                 :id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
                             </div>
                             <div class="div_right_icon_g">
diff --git a/app/views/dmptemplates/_add_question.html.erb b/app/views/dmptemplates/_add_question.html.erb
index 7f320c1..8f33bd6 100644
--- a/app/views/dmptemplates/_add_question.html.erb
+++ b/app/views/dmptemplates/_add_question.html.erb
@@ -38,7 +38,7 @@
 					<div id="new-ques-format" class="ques_format">
 						<div class="div_left_icon">
 							<%= f.select :question_format_id, 
-								options_from_collection_for_select(QuestionFormat.find(:all, :order => "title ASC"),:id, :title, QuestionFormat.find_by_title(t("helpers.text_area")).id), 
+								options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, QuestionFormat.find_by_title(t("helpers.text_area")).id), 
 								{},	:id => "new-select-format-#{section.id}"%>
 						</div>
 						<div class="div_right_icon">
@@ -153,7 +153,7 @@
 				<td class="first_template"><%= t("org_admin.questions.themes_label")%></td>
 				<td><div class="div_left_icon">
 						<%= f.collection_select(:theme_ids,
-							Theme.find(:all, :order => "title ASC"),
+							Theme.all.order("title"),
 							:id, :title, {:prompt => false, :include_blank => t('helpers.none')}, {:multiple => true})%>
 					</div>
 					<div class="div_right_icon">
diff --git a/app/views/dmptemplates/_edit_question.html.erb b/app/views/dmptemplates/_edit_question.html.erb
index c02d104..9181a39 100644
--- a/app/views/dmptemplates/_edit_question.html.erb
+++ b/app/views/dmptemplates/_edit_question.html.erb
@@ -33,7 +33,7 @@
 						<div class="div_left_icon">
 							<%= f.hidden_field :id,{ :class => "quest_id" } %>
 							<%= f.select :question_format_id, 
-								options_from_collection_for_select(QuestionFormat.find(:all, :order => "title ASC"),:id, :title, question.question_format_id), 
+								options_from_collection_for_select(QuestionFormat.all.order("title"), :id, :title, question.question_format_id), 
 								{},	:id => "#{question.id}-select-format"%>
 						</div>
 						<div class="div_right_icon">
@@ -154,7 +154,7 @@
 				<td class="first_template"><%= t("org_admin.questions.themes_label")%></td>
 				<td><div class="div_left_icon">
 						<%= f.collection_select(:theme_ids,
-							Theme.find(:all, :order => "title ASC"),
+							Theme.all.order("title"),
 							:id, :title, {:prompt => false, :include_blank => "None"}, {:multiple => true})%>
 					</div>
 					<div class="div_right_icon">
diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb
index 0a98ac4..bb64cb6 100644
--- a/app/views/guidances/admin_edit.html.erb
+++ b/app/views/guidances/admin_edit.html.erb
@@ -55,7 +55,7 @@
 							<div class="guindance_by_theme" style="display:none;"> 
 								<div class="div_left_icon_g">
 									<%= f.collection_select(:theme_ids,
-									Theme.find(:all, :order => 'title ASC'),
+									Theme.all.order('title'),
 									:id, :title, {:prompt => false, :include_blank => 'None'}, {:multiple => true})%>
 								</div>
 								<div class="div_right_icon_g">
@@ -71,7 +71,7 @@
 										<% phase_id = @guidance.question.section.version.phase_id %>
 										<% version_id = @guidance.question.section.version_id %>
 										<% section_id = @guidance.question.section_id %>
-										<%= collection_select(:phase, :dmptemplate_id,  Dmptemplate.find(:all, :order => 'title ASC'), :id, :title, {:prompt   => "Select a template", :selected =>  dmp_template_id}, {:id => 'templates_select'}) %>
+										<%= collection_select(:phase, :dmptemplate_id,  Dmptemplate.all.order('title'), :id, :title, {:prompt   => "Select a template", :selected =>  dmp_template_id}, {:id => 'templates_select'}) %>
 										<br/>
 										<%= collection_select(:version, :phase_id, Phase.where("dmptemplate_id = ?", dmp_template_id).order('title ASC'), :id, :title, {:prompt => "Select a phase", :selected =>  phase_id}, {:id => 'phases_select'}) %>
 										<br/>
diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb
index 8629641..8e27227 100644
--- a/app/views/guidances/admin_new.html.erb
+++ b/app/views/guidances/admin_new.html.erb
@@ -42,7 +42,7 @@
 							<div class="guindance_by_theme" style="display:none;"> 
 								<div class="div_left_icon_g">
 									<%= f.collection_select(:theme_ids,
-									Theme.find(:all, :order => 'title ASC'),
+									Theme.all.order('title'),
 									:id, :title, {:prompt => false, :include_blank => 'None'}, {:multiple => true})%>
 								</div>
 								<div class="div_right_icon_g">