fixed voting page layout so radios and labels are next to each other
fixed merge conflicts