Improve Election view