Updated views and templates for poll