updating poll btns
update btns
Merge conflicts