Voter view refactor

Please have a look and let me know if this looks good, thanks.