-<%= render :partial => 'candidates_form' %>
-<%= button_to "Done!", :action => 'show', :id => @election %>
+
+<div class="normal-header">
+ <span class="header">Current Candidates</span>
+ <span class="subheader"></span>
+</div>
+
+
+<% unless @election.candidates.empty? %>
+ <% @election.candidates.each do |candidate| %>
+ <% @current_candidate = candidate %>
+ <%= render :partial => 'candidate_line_edit' %>
+ <% end %>
+
+<% else %>
+ <p>There are no candidates registered for this election.</p>
+<% end %>
+
+<div class="normal-header">
+ <span class="header">Continue</span>
+ <span class="subheader"></span>
+</div>
+
+<p>When you are done entering candidates, please click the button below
+to proceed to the next step.</p>
+
+<%= button_to "Proceed to Next Step", :action => 'new_voters', :id => @election %>
+
+<% else %>
+
+<p>You can not edit the list of candidates once the election has begun.
+please return to the <%= link_to "election overview page", :action =>
+'show', :id => @election.id %>.</p>
+
+<% end %>