Reformat VotePanel code
Refactor the layout
Fix conflict