Changes to voting screen
Changes to voting logic