refactoring
merge with matt
added colors to indicate users current vote