-<%= render_partial 'progress', 'candidates' %>
-<h1>Edit/Add Candidates</h1>
+<div id="title-header">
+ <span class="header">Edit Candidates</span>
+ <span class="subheader"></span>
+</div>
+
+<div class="clear-div"></div>
+
+<div class="normal-header">
+ <span class="header">Enter New Candidate</span>
+ <span class="subheader"></span>
+</div>
<%= error_messages_for :candidate %>
-<% unless @election.candidates.empty? %>
- <p>The following are valid options or candidates in this election:</p>
-1;3A
+<% form_tag( { :action => :add_candidate, :id => @election.id },
+ :multipart => true ) do %>
+<%= render :partial => 'candidate_form' %>
+<p><%= submit_tag "Add Candidate" %></p>
+<% end %>
+
+<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' %>
<p>There are no candidates registered for this election.</p>
<% end %>
-<p>Please enter new candidates below.</p>
+<div class="normal-header">
+ <span class="header">Continue</span>
+ <span class="subheader"></span>
+</div>
-<% form_tag( { :action => :add_candidate, :id => @election.id },
- :multipart => true ) do %>
-<%= render :partial => 'candidate_form' %>
-<%= submit_tag "Add Candidate" %>
-<% end %>
+<p>When you are done entering candidates, please click the button below
+to proceed to the next step.</p>
-<%= button_to "Done!", :action => 'new_voters', :id => @election %>
+<%= button_to "Proceed to Next Step", :action => 'new_voters', :id => @election %>