More updates to voting logic & a few style changes