More cleanup for poll views. Still a lot to do but it's possible to use it now although it still behaves odd.