voting system update; some template changes