Major improvements to candidate view and others