Adding voting popup and refactor.