-<% %>
+<div id="title-header">
+ <span class="header">Vote</span>
+ <span class="subheader"><%= @voter.election.name %></span>
+</div>
-<p><strong>Election:</strong> <%= @voter.election.name %></p>
-<p><strong>Voter:</strong> <%= @voter.email %></p>
<p><strong>Description:</strong></p>
-<blockquote><%= @voter.election.description %></blockquote>
+<p><%= @voter.election.description %></p>
-<%= render_partial 'vote' %>
+<% if @voter.election.authenticated? %>
+<div class="normal-header">
+ <span class="header">Current Voter</span>
+ <span class="subheader"></span>
+</div>
+<% end %>
+<p><strong><%= @voter.email %></strong></p>
+
+<div class="normal-header">
+ <span class="header">Instructions</span>
+ <span class="subheader"></span>
+</div>
+
+<p>Drag and drop the items on <strong>list in the left column</strong>
+until they are in order from most preferred at the top to least
+preferred at the bottom. When you are done, press the 'Submit Vote'
+button at the bottom of the left column to record your
+vote.</p>
+
+<div class="normal-header">
+ <span class="header">Candidate List</span>
+ <span class="subheader"></span>
+</div>
+
+<% @voter.election.candidates.each do |candidate| %>
+ <% @current_candidate = candidate %>
+ <div id="cand<%= @current_candidate.id %>">
+ <h3><%= h @current_candidate.name %></h3>
+ <%= render :partial => 'election/candidate_box_info' %>
+ </div>
+ <% end %>
+</ul>