diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 2e4947e..1a02b4a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -138,6 +138,21 @@
 		
 	});
 
+	// Add another option to the question's options
+	$(".add-option").click(function(e){
+		e.preventDefault();
+	
+		var tbl = $(this).parent().find("table.options_table > tbody"),
+			  last = tbl.find("tr:last"),
+    		clone = last.clone();
+		
+				clone.find(".number_field").val(parseInt(last.find(".number_field").val()) + 1);
+				clone.find(".small_text_field").val("");
+				clone.find("input[type='checkbox']").prop("checked", false);
+		
+		last.after(clone);
+	});
+
 
 	/*$('#continue-to-new').click(function(e){
 		var destination = $(this).attr("href");
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index 3842cf6..c36b28c 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -1879,3 +1879,7 @@
 
 .settings-accordion span.plus-laranja:before,
 .settings-accordion span.minus-laranja:before { line-height: inherit; }
+
+tr.new_option_before {
+	display: none;
+}
\ No newline at end of file
diff --git a/app/controllers/dmptemplates_controller.rb b/app/controllers/dmptemplates_controller.rb
index 989ecba..7e72cd1 100644
--- a/app/controllers/dmptemplates_controller.rb
+++ b/app/controllers/dmptemplates_controller.rb
@@ -500,7 +500,4 @@
 	 	end
 	end
 
-
-
-
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7063bb7..2f3bae1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -14,17 +14,4 @@
 	def javascript(*files)
 	  content_for(:head) { javascript_include_tag(*files) }
 	end
-	
-    
-	def link_to_add_object(name, f, association, css_class, i)
-    new_object = f.object.class.reflect_on_association(association).klass.new
-
-    fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
-      j = i + 1
-      new_object.number = j
-      render(association.to_s.singularize + "_fields", :f => builder)
-    end
-
-    "<a class=\"#{css_class}\" href=\"#\" onclick=\"add_object(this, '#{association}', '#{escape_javascript(fields)}'); return false;\">#{name}</a>"
-  end
 end
diff --git a/app/views/dmptemplates/_add_question.html.erb b/app/views/dmptemplates/_add_question.html.erb
index 8f33bd6..578a8aa 100644
--- a/app/views/dmptemplates/_add_question.html.erb
+++ b/app/views/dmptemplates/_add_question.html.erb
@@ -59,25 +59,25 @@
 								</tr>
 							</thead>
 							<tbody class="options_tbody">
+								<% i = 0 %>
+								
 								<% 2.times {@new_question.options.build } %>
-                                <% i = 0 %>
-                                <% @new_question.options.each do |options_q|%>
-                                    <%= f.fields_for :options, options_q do |op|%>
-                                        <% i = i + 1%>
-                                        <% options_q.number = i %>
-                                        <%= render "option_fields", :f => op %>
-									<%end%>
+                  <% @new_question.options.each do |options_q|%>
+                      <%= f.fields_for :options, options_q do |op|%>
+                          <% i = i + 1%>
+                          <% options_q.number = i %>
+                          <%= render "option_fields", :f => op %>
+											<%end%>
 									
-								<%end%>	
-								<tr class="new_option_before">
-									<td></td>
-								</tr>	
+									<%end%>	
 								
 							</tbody>
 							
 						</table>
-						<%= link_to_add_object t("org_admin.add_option_label"), f, :options , "", i %>	
-                        
+
+						<a href="#" class="add-option"><%= t("org_admin.add_option_label") %></a>
+												
+												
                         <div class="clearfix"></div>
                         <!--display for selecting comment box when multiple choice is being used-->
                         <%= f.check_box :option_comment_display, :as => :check_boxes%><%= f.label t("org_admin.questions.option_comment_display_checkbox"), :class => "checkbox inline"%>
diff --git a/app/views/dmptemplates/_edit_question.html.erb b/app/views/dmptemplates/_edit_question.html.erb
index 9181a39..e96aa67 100644
--- a/app/views/dmptemplates/_edit_question.html.erb
+++ b/app/views/dmptemplates/_edit_question.html.erb
@@ -68,12 +68,14 @@
 									
 								<%end%>	
 								<tr class="new_option_before">
-									<td></td>
+									<td>
+									</td>
 								</tr>	
 								
 							</tbody>
 						</table>
-						<%= link_to_add_object t("org_admin.add_option_label"), f, :options , "new_option_button", i %>
+
+						<a class="add-option" href="#"><%= t("org_admin.add_option_label") %></a>
                         
                         <div class="clearfix"></div>
                         <!--display for selecting comment box when multiple choice is being used-->