diff --git a/app/assets/javascripts/answers.js.coffee b/app/assets/javascripts/answers.js.coffee
new file mode 100644
index 000000000..183e1c628
--- /dev/null
+++ b/app/assets/javascripts/answers.js.coffee
@@ -0,0 +1,20 @@
+App.Answers =
+
+  initializeAnswers: (answers) ->
+    $(answers).on 'cocoon:after-insert', (e, new_answer) ->
+      given_order = App.Answers.maxGivenOrder(answers) + 1
+      $(new_answer).find("[name$='[given_order]']").val(given_order)
+
+  maxGivenOrder: (answers) ->
+    max_order = 0
+    $(answers).find("[name$='[given_order]']").each (index, answer) ->
+      value = parseFloat($(answer).val())
+      max_order = if value > max_given_order then value else max_given_order
+    return max_given_order
+
+  nestedAnswers: ->
+    $('.js-answers').each (index, answers) ->
+      App.Answers.initializeAnswers(answers)
+
+  initialize: ->
+    App.Answers.nestedAnswers()
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index dd02ee6ee..82b40edc9 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -59,6 +59,8 @@
 //= require markdown-it
 //= require markdown_editor
 //= require cocoon
+//= require answers
+//= require questions
 //= require legislation_admin
 //= require legislation
 //= require legislation_allegations
@@ -87,6 +89,8 @@
 //= require send_admin_notification_alert
 
 var initialize_modules = function() {
+  App.Answers.initialize();
+  App.Questions.initialize();
   App.Comments.initialize();
   App.Users.initialize();
   App.Votes.initialize();
diff --git a/app/assets/javascripts/questions.js.coffee b/app/assets/javascripts/questions.js.coffee
new file mode 100644
index 000000000..72023a841
--- /dev/null
+++ b/app/assets/javascripts/questions.js.coffee
@@ -0,0 +1,8 @@
+App.Questions =
+
+  nestedQuestions: ->
+    $('.js-questions').on 'cocoon:after-insert', (e, new_question) ->
+      App.Answers.initializeAnswers($(new_question).find('.js-answers'))
+
+  initialize: ->
+    App.Questions.nestedQuestions()
diff --git a/app/controllers/admin/poll/questions/answers_controller.rb b/app/controllers/admin/poll/questions/answers_controller.rb
index 225665b94..1d549ba3f 100644
--- a/app/controllers/admin/poll/questions/answers_controller.rb
+++ b/app/controllers/admin/poll/questions/answers_controller.rb
@@ -50,7 +50,8 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController
 
     def answer_params
       documents_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
-      attributes = [:title, :description, :question_id, documents_attributes: documents_attributes]
+      attributes = [:title, :description, :given_order, :question_id,
+        documents_attributes: documents_attributes]
       params.require(:poll_question_answer).permit(*attributes, *translation_params(Poll::Question::Answer))
     end
 
diff --git a/app/controllers/dashboard/polls_controller.rb b/app/controllers/dashboard/polls_controller.rb
index 9f38c3459..40057230f 100644
--- a/app/controllers/dashboard/polls_controller.rb
+++ b/app/controllers/dashboard/polls_controller.rb
@@ -1,4 +1,4 @@
-class Dashboard::PollsController < Dashboard::BaseController 
+class Dashboard::PollsController < Dashboard::BaseController
   helper_method :poll
 
   def index
@@ -62,7 +62,8 @@ class Dashboard::PollsController < Dashboard::BaseController
   end
 
   def question_answers_attributes
-    [:id, :_destroy, :title, :description, :question_id, documents_attributes: documents_attributes]
+    [:id, :_destroy, :title, :description, :given_order, :question_id,
+     documents_attributes: documents_attributes]
   end
 
   def documents_attributes
diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb
index 56655e457..48abdd9b8 100644
--- a/app/models/poll/question/answer.rb
+++ b/app/models/poll/question/answer.rb
@@ -17,8 +17,6 @@ class Poll::Question::Answer < ActiveRecord::Base
   validates :title, presence: true
   validates :given_order, presence: true, uniqueness: { scope: :question_id }
 
-  before_validation :set_order, on: :create
-
   def description
     self[:description].try :html_safe
   end
@@ -29,10 +27,6 @@ class Poll::Question::Answer < ActiveRecord::Base
     end
   end
 
-  def set_order
-    self.given_order = self.class.last_position(question_id) + 1
-  end
-
   def self.last_position(question_id)
     where(question_id: question_id).maximum('given_order') || 0
   end
diff --git a/app/views/admin/poll/questions/answers/_form.html.erb b/app/views/admin/poll/questions/answers/_form.html.erb
index 1ca05d9ab..912e6bd42 100644
--- a/app/views/admin/poll/questions/answers/_form.html.erb
+++ b/app/views/admin/poll/questions/answers/_form.html.erb
@@ -4,6 +4,9 @@
 
   <%= render 'shared/errors', resource: @answer %>
 
+  <%= f.hidden_field :given_order,
+        value: @answer.persisted? ? @answer.given_order : @answer.class.last_position(@answer.question_id || @question.id) + 1 %>
+
   <%= f.hidden_field :question_id, value: @answer.question_id || @question.id %>
 
   <%= f.translatable_text_field :title %>
diff --git a/app/views/dashboard/polls/_form.html.erb b/app/views/dashboard/polls/_form.html.erb
index 0b856dd71..fbdaf9265 100644
--- a/app/views/dashboard/polls/_form.html.erb
+++ b/app/views/dashboard/polls/_form.html.erb
@@ -25,12 +25,12 @@
     </div>
   </div>
 
-  <div id="questions">
+  <div class="js-questions">
     <%= f.fields_for :questions do |question| %>
       <%= render 'question_fields', f: question %>
     <% end %>
 
-    <div id="links" class="row expanded">
+    <div class="links row expanded">
       <div class="small-12 column">
         <%= link_to_add_association t("dashboard.polls.form.add_question"),
                                     f, :questions, class: "button" %>
diff --git a/app/views/dashboard/polls/_question_answer_fields.html.erb b/app/views/dashboard/polls/_question_answer_fields.html.erb
index dd7e4e15a..4f3dfae57 100644
--- a/app/views/dashboard/polls/_question_answer_fields.html.erb
+++ b/app/views/dashboard/polls/_question_answer_fields.html.erb
@@ -1,5 +1,6 @@
-<div class="small-12 medium-6 column">
+<div class="nested-fields nested-answers small-12 medium-6 column">
   <div class="answer-fields">
+    <%= f.hidden_field :given_order %>
     <div class="row expanded">
       <div class="small-12 medium-9 column">
         <%= f.text_field :title %>
diff --git a/app/views/dashboard/polls/_question_fields.html.erb b/app/views/dashboard/polls/_question_fields.html.erb
index 50d752185..d24fa511f 100644
--- a/app/views/dashboard/polls/_question_fields.html.erb
+++ b/app/views/dashboard/polls/_question_fields.html.erb
@@ -1,4 +1,4 @@
-<div class="question-fields">
+<div class="question-fields nested-fields">
   <%= f.hidden_field :author_id, value: f.object.author_id || current_user.id %>
   <%= f.hidden_field :proposal_id, value: f.object.proposal_id || proposal.id %>
   <div class="row expanded">
@@ -12,12 +12,12 @@
     </div>
   </div>
 
-  <div id="answers">
+  <div class="js-answers">
     <%= f.fields_for :question_answers do |answer| %>
       <%= render 'question_answer_fields', f: answer %>
     <% end %>
 
-    <div id="links" class="row expanded">
+    <div class="answer-links links row expanded">
       <div class="small-12 column">
         <%= link_to_add_association t("dashboard.polls.question_fields.add_answer"),
                                     f, :question_answers, class: "button hollow" %>
diff --git a/db/dev_seeds/polls.rb b/db/dev_seeds/polls.rb
index a7884d570..1026cb805 100644
--- a/db/dev_seeds/polls.rb
+++ b/db/dev_seeds/polls.rb
@@ -56,11 +56,12 @@ section "Creating Poll Questions & Answers" do
         end
       end
       question.save!
-      Faker::Lorem.words((2..4).to_a.sample).each do |title|
+      Faker::Lorem.words((2..4).to_a.sample).each_with_index do |title, index|
         description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
         answer = Poll::Question::Answer.new(question: question,
                                             title: title.capitalize,
-                                            description: description)
+                                            description: description,
+                                            given_order: index + 1)
         I18n.available_locales.map do |locale|
           Globalize.with_locale(locale) do
             answer.title = "#{title} (#{locale})"
@@ -200,20 +201,7 @@ section "Creating Poll Questions from Proposals" do
   3.times do
     proposal = Proposal.all.sample
     poll = Poll.current.first
-    question = Poll::Question.create(poll: poll)
-    Faker::Lorem.words((2..4).to_a.sample).each do |title|
-      description = "<p>#{Faker::ChuckNorris.fact}</p>"
-      answer = Poll::Question::Answer.new(question: question,
-                                          title: title.capitalize,
-                                          description: description)
-      I18n.available_locales.map do |locale|
-        Globalize.with_locale(locale) do
-          answer.title = "#{title} (#{locale})"
-          answer.description = "#{description} (#{locale})"
-        end
-      end
-      answer.save!
-    end
+    question = Poll::Question.new(poll: poll)
     question.copy_attributes_from_proposal(proposal)
     title = question.title
     I18n.available_locales.map do |locale|
@@ -222,6 +210,20 @@ section "Creating Poll Questions from Proposals" do
       end
     end
     question.save!
+    Faker::Lorem.words((2..4).to_a.sample).each_with_index do |title, index|
+      description = "<p>#{Faker::ChuckNorris.fact}</p>"
+      answer = Poll::Question::Answer.new(question: question,
+                                          title: title.capitalize,
+                                          description: description,
+                                          given_order: index + 1)
+      I18n.available_locales.map do |locale|
+        Globalize.with_locale(locale) do
+          answer.title = "#{title} (#{locale})"
+          answer.description = "#{description} (#{locale})"
+        end
+      end
+      answer.save!
+    end
   end
 end
 
@@ -229,20 +231,7 @@ section "Creating Successful Proposals" do
   10.times do
     proposal = Proposal.all.sample
     poll = Poll.current.first
-    question = Poll::Question.create(poll: poll)
-    Faker::Lorem.words((2..4).to_a.sample).each do |title|
-      description = "<p>#{Faker::ChuckNorris.fact}</p>"
-      answer = Poll::Question::Answer.new(question: question,
-                                          title: title.capitalize,
-                                          description: description)
-      I18n.available_locales.map do |locale|
-        Globalize.with_locale(locale) do
-          answer.title = "#{title} (#{locale})"
-          answer.description = "#{description} (#{locale})"
-        end
-      end
-      answer.save!
-    end
+    question = Poll::Question.new(poll: poll)
     question.copy_attributes_from_proposal(proposal)
     title = question.title
     I18n.available_locales.map do |locale|
@@ -251,5 +240,19 @@ section "Creating Successful Proposals" do
       end
     end
     question.save!
+    Faker::Lorem.words((2..4).to_a.sample).each_with_index do |title, index|
+      description = "<p>#{Faker::ChuckNorris.fact}</p>"
+      answer = Poll::Question::Answer.new(question: question,
+                                          title: title.capitalize,
+                                          description: description,
+                                          given_order: index + 1)
+      I18n.available_locales.map do |locale|
+        Globalize.with_locale(locale) do
+          answer.title = "#{title} (#{locale})"
+          answer.description = "#{description} (#{locale})"
+        end
+      end
+      answer.save!
+    end
   end
 end
diff --git a/spec/factories/polls.rb b/spec/factories/polls.rb
index 648a84afa..88e3b51aa 100644
--- a/spec/factories/polls.rb
+++ b/spec/factories/polls.rb
@@ -47,6 +47,7 @@ FactoryBot.define do
     association :question, factory: :poll_question
     sequence(:title) { |n| "Answer title #{n}" }
     sequence(:description) { |n| "Answer description #{n}" }
+    sequence(:given_order) { |n| n }
   end
 
   factory :poll_answer_video, class: 'Poll::Question::Answer::Video' do
diff --git a/spec/features/admin/poll/questions/answers/answers_spec.rb b/spec/features/admin/poll/questions/answers/answers_spec.rb
index dbcf8cf5c..36185743c 100644
--- a/spec/features/admin/poll/questions/answers/answers_spec.rb
+++ b/spec/features/admin/poll/questions/answers/answers_spec.rb
@@ -65,7 +65,7 @@ feature 'Answers' do
     expect(page).to have_content(new_title)
     expect(page).not_to have_content(old_title)
 
-    expect(page.body.index(new_title)).to be < page.body.index(answer2.title)
+    expect(answer2.title).to appear_before(new_title)
   end
 
 end
diff --git a/spec/features/dashboard/polls_spec.rb b/spec/features/dashboard/polls_spec.rb
index 2eafa6652..add203101 100644
--- a/spec/features/dashboard/polls_spec.rb
+++ b/spec/features/dashboard/polls_spec.rb
@@ -52,7 +52,7 @@ feature 'Polls' do
 
   scenario 'Edit poll is allowed for upcoming polls' do
     poll = create(:poll, :incoming, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -68,7 +68,7 @@ feature 'Polls' do
 
   scenario 'Edit poll redirects back when invalid data', js: true do
     poll = create(:poll, :incoming, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -86,7 +86,7 @@ feature 'Polls' do
 
   scenario 'Edit poll is not allowed for current polls' do
     poll = create(:poll, :current, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -96,7 +96,7 @@ feature 'Polls' do
 
   scenario 'Edit poll is not allowed for expired polls' do
     poll = create(:poll, :expired, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -104,9 +104,58 @@ feature 'Polls' do
     end
   end
 
+  scenario "Edit poll should allow to remove questions", :js do
+    poll = create(:poll, :incoming, related: proposal)
+    create(:poll_question, poll: poll)
+    create(:poll_question, poll: poll)
+    visit proposal_dashboard_polls_path(proposal)
+    within "div#poll_#{poll.id}" do
+      click_link "Edit survey"
+    end
+
+    within ".js-questions" do
+      expect(page).to have_css ".nested-fields", count: 2
+      within first(".nested-fields") do
+        find("a.delete").click
+      end
+      expect(page).to have_css ".nested-fields", count: 1
+    end
+
+    click_button "Update poll"
+    visit edit_proposal_dashboard_poll_path(proposal, poll)
+
+    expect(page).to have_css ".nested-fields", count: 1
+  end
+
+  scenario "Edit poll should allow to remove answers", :js do
+    poll = create(:poll, :incoming, related: proposal)
+    question = create(:poll_question, poll: poll)
+    create(:poll_question_answer, question: question)
+    create(:poll_question_answer, question: question)
+    visit proposal_dashboard_polls_path(proposal)
+    within "div#poll_#{poll.id}" do
+      click_link "Edit survey"
+    end
+
+    within ".js-questions .js-answers" do
+      expect(page).to have_css ".nested-fields", count: 2
+      within first(".nested-fields") do
+        find("a.delete").click
+      end
+      expect(page).to have_css ".nested-fields", count: 1
+    end
+
+    click_button "Update poll"
+    visit edit_proposal_dashboard_poll_path(proposal, poll)
+
+    within ".js-questions .js-answers" do
+      expect(page).to have_css ".nested-fields", count: 1
+    end
+  end
+
   scenario 'View results not available for upcoming polls' do
     poll = create(:poll, :incoming, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -116,7 +165,7 @@ feature 'Polls' do
 
   scenario 'View results available for current polls' do
     poll = create(:poll, :current, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -126,7 +175,7 @@ feature 'Polls' do
 
   scenario 'View results available for expired polls' do
     poll = create(:poll, :expired, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -136,7 +185,7 @@ feature 'Polls' do
 
   scenario 'View results redirects to results in public zone', js: true do
     poll = create(:poll, :expired, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
@@ -150,7 +199,7 @@ feature 'Polls' do
 
   scenario 'Poll card' do
      poll = create(:poll, :expired, related: proposal)
-    
+
     visit proposal_dashboard_polls_path(proposal)
 
     within "div#poll_#{poll.id}" do
diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb
index 376629314..e46bef692 100644
--- a/spec/features/officing/results_spec.rb
+++ b/spec/features/officing/results_spec.rb
@@ -8,11 +8,11 @@ feature 'Officing Results', :with_frozen_time do
     @poll = @officer_assignment.booth_assignment.poll
     @poll.update(ends_at: 1.day.ago)
     @question_1 = create(:poll_question, poll: @poll)
-    create(:poll_question_answer, title: 'Yes', question: @question_1)
-    create(:poll_question_answer, title: 'No', question: @question_1)
+    create(:poll_question_answer, title: "Yes", question: @question_1, given_order: 1)
+    create(:poll_question_answer, title: "No", question: @question_1, given_order: 2)
     @question_2 = create(:poll_question, poll: @poll)
-    create(:poll_question_answer, title: 'Today', question: @question_2)
-    create(:poll_question_answer, title: 'Tomorrow', question: @question_2)
+    create(:poll_question_answer, title: "Today", question: @question_2, given_order: 1)
+    create(:poll_question_answer, title: "Tomorrow", question: @question_2, given_order: 2)
 
     login_as(@poll_officer.user)
   end
diff --git a/spec/features/polls/answers_spec.rb b/spec/features/polls/answers_spec.rb
index 6daffc0eb..8e5bb785e 100644
--- a/spec/features/polls/answers_spec.rb
+++ b/spec/features/polls/answers_spec.rb
@@ -16,7 +16,7 @@ feature 'Answers' do
     visit admin_question_path(question)
 
     expect(page).to have_css(".poll_question_answer", count: 2)
-    expect(page.body.index(answer1.title)).to be < page.body.index(answer2.title)
+    expect(answer2.title).to appear_before(answer1.title)
 
     within("#poll_question_answer_#{answer1.id}") do
       expect(page).to have_content answer1.title
diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb
index 64d92eb14..69fbd68e5 100644
--- a/spec/features/polls/polls_spec.rb
+++ b/spec/features/polls/polls_spec.rb
@@ -28,7 +28,7 @@ feature 'Polls' do
 
     scenario "Proposal polls won't be listed" do
       proposal = create(:proposal)
-      _poll = create(:poll, related: proposal) 
+      _poll = create(:poll, related: proposal)
 
       visit polls_path
       expect(page).to have_content('There are no open votings')
@@ -164,7 +164,7 @@ feature 'Polls' do
       visit poll_path(poll)
 
       within("div#poll_question_#{question.id}") do
-        expect(page.body.index(answer1.title)).to be < page.body.index(answer2.title)
+        expect(answer2.title).to appear_before(answer1.title)
       end
     end
 
@@ -176,7 +176,7 @@ feature 'Polls' do
       visit poll_path(poll)
 
       within('div.poll-more-info-answers') do
-        expect(page.body.index(answer1.title)).to be < page.body.index(answer2.title)
+        expect(answer2.title).to appear_before(answer1.title)
       end
     end