adjusted poll controller and views