Refactor votes controller and layout changes