Fix broken code and try to merge buttons
Merge branch 'dev-vote' of https://github.com/Team-Combat-Wombat/wpi-suite-tcw into dev-vote